修复8000环境头像不显示、开源项目详情页内容被遮挡等

src/AppConfig.js

@@ -33,7 +33,6 @@ export function initAxiosInterceptors(props) {
   initOnlineOfflineListener();
 
   // var proxy = "http://192.168.1.40:3000";
-  // var proxy = "http://117.50.100.12:49999";
   var proxy = "http://111.8.36.180:8000";
   //响应前的设置
   axios.interceptors.request.use(

src/common/UrlTool.js

@@ -6,15 +6,13 @@ const { Search } = Input;
 const $ = window.$;
 const isDev = window.location.port == 3007;
 const isdev2= window.location.hostname ==='www.educoder.net'
-// export const TEST_HOST = "http://39.105.176.215:49999"
-export const TEST_HOST = "http://117.50.100.12:49999";
+export const TEST_HOST = "http://111.8.36.180:8000";
 export function getImageUrl(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
+    // const local = 'http://localhost:3000'
 	// const local = 'http://39.105.176.215:49999';
-	const local = 'http://117.50.100.12:49999';
-
+	const local = 'http://111.8.36.180:8000';
 	if (isDev) {
 		return `${local}/${path}`
 	}
@@ -39,10 +37,7 @@ export function numFormat(num, digits){
 }
 
 export function getImage(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-	// const local = 'http://localhost:3000'
-	const local = 'http://39.105.176.215:49999';
+	const local = 'http://111.8.36.180:8000';
 	if (path&&path.indexOf("http://") === -1) {
 		if (isDev) {
 			return `${local}/images/${path}`
@@ -54,10 +49,7 @@ export function getImage(path) {
 }
 
 export function getTestImage(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-	// const local = 'http://localhost:3000'
-	const local = 'http://117.50.100.12:49999';
+	const local = 'http://111.8.36.180:8000';
 	if (path && path.indexOf("http://") === -1) {
 		if (isDev) {
 			return `${local}${path}`
@@ -69,7 +61,7 @@ export function getTestImage(path) {
 }
 
 export function getLogoImageUrl(path) {
-	const local = 'http://117.50.100.12:49999';
+	const local = 'http://111.8.36.180:8000';
 
 	if (isDev) {
 		return `${local}/${path}`
@@ -78,9 +70,6 @@ export function getLogoImageUrl(path) {
 }
 
 export function getcdnImageUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-	// const local = 'http://localhost:3000'
 	const testlocal = 'https://testali-cdn.educoder.net'
 	const local = 'https://ali-cdn.educoder.net'
 	let firstStr = path.substr(0, 1);

src/forge/Head/header.scss

@@ -135,6 +135,7 @@
 
 // 右上角小铃铛单独样式
 .notice-popover{
+  z-index: 1000001;
   //popover小尖尖
   .ant-popover-arrow{
     display: none;
@@ -184,7 +185,7 @@
 .message-icon{
   position: relative;
   .ant-scroll-number{
-    right:12px;
+    // right:12px;
     padding: 0 0px;
   }
 }

src/forge/Main/Detail.js

@@ -551,7 +551,7 @@ class Detail extends Component {
     return (
       <div>
          <SpecialModal {...this.props} visible={visible} hideModal={this.sureModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
-        <div className="detailHeader-wrapper">
+        <div className="detailHeader-wrapper open-sourse">
           <div className="normal">
             <AlignTop style={{ padding: "18px 0px 10px", justifyContent: "space-between" }}>
               <div>

src/forge/Main/list.scss

@@ -232,6 +232,9 @@
   background-color:#FBFCFF;
   border-bottom:1px solid #e2e2e2;
 }
+.open-sourse + .ant-spin-nested-loading{
+  margin-bottom: 130px;
+}
 .headerMenu-wrapper{
   display: flex;
   flex-direction: row;

src/forge/Order/order.js

@@ -886,7 +886,7 @@ class order extends Component {
           {search_count === 0 ? (
             <NoneData _html="暂时还没有相关数据!" />
           ) : (
-              <div style={{ minHeight: "500px" }}>
+              <div style={{ minHeight: "400px" }}>
                 <Checkbox.Group name="issues" onChange={this.checkIssues} value={checkedValue} style={{ width: "100%" }}>
                   {issues && issues.length > 0 && issues.map((item, key) => {
                     return (

src/military/expert/expertList/index.jsx

@@ -393,7 +393,7 @@ function RegisterList({ showNotification }) {
         >
           <button className="but41_fill">导入</button>
         </Upload>
-        <p className="link" onClick={() => { window.open(httpUrl + '/busiAttachments/download/883') }}>专家注册表模板.xlsx</p>
+        <p className="link" onClick={() => { window.open(httpUrl + '/busiAttachments/download/134') }}>专家注册表模板.xlsx</p>
         <p className='hint'>提示：只能在导入模版上增减数据，才能导入成功！</p>
       </Modal>
     </div>)

src/military/expert/reviewResult/index.jsx

@@ -42,7 +42,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) {
       }
     },
     {
-      title: '平均得分',
+      title: '最终得分',
       dataIndex: 'finalGrades',
       key: 'phone',
     },

src/modules/tpm/NewFooter.js

@@ -24,11 +24,12 @@ class NewFooter extends Component {
   render() {
     const {forge_footer} = this.state;
     return (
-      <div className="newFooter edu-txt-center ">
-        {
-          forge_footer && this.showhtml(forge_footer)
-        }
-      </div>
+      // <div className="newFooter edu-txt-center ">
+      //   {
+      //     forge_footer && this.showhtml(forge_footer)
+      //   }
+      // </div>
+      this.showhtml(forge_footer)
     );
   }
 }

src/modules/tpm/NewHeader.js

@@ -823,7 +823,7 @@ class NewHeader extends Component {
             <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
               {/* <a href={`/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}> */}
                 <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                  src={getImageUrl(`images/` + user.image_url)} width="34">
+                  src={getImageUrl(user.image_url)} width="34">
                 </img>
               {/* </a> */}
               <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>