diff --git a/src/AppConfig.js b/src/AppConfig.js index b1bdf964..8e89543b 100644 --- a/src/AppConfig.js +++ b/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( diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index ca1d1754..6bc7f2a4 100644 --- a/src/common/UrlTool.js +++ b/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); diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss index 7878f20b..b6c8e221 100644 --- a/src/forge/Head/header.scss +++ b/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; } } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 9e4695bf..deca680c 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -551,7 +551,7 @@ class Detail extends Component { return (
-
+
diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index a7a2ab44..69732aa6 100644 --- a/src/forge/Main/list.scss +++ b/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; diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 19babaab..6b9611f2 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -886,7 +886,7 @@ class order extends Component { {search_count === 0 ? ( ) : ( -
+
{issues && issues.length > 0 && issues.map((item, key) => { return ( diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx index 21666b5f..69baf73a 100644 --- a/src/military/expert/expertList/index.jsx +++ b/src/military/expert/expertList/index.jsx @@ -393,7 +393,7 @@ function RegisterList({ showNotification }) { > -

{ window.open(httpUrl + '/busiAttachments/download/883') }}>专家注册表模板.xlsx

+

{ window.open(httpUrl + '/busiAttachments/download/134') }}>专家注册表模板.xlsx

提示：只能在导入模版上增减数据，才能导入成功！

) diff --git a/src/military/expert/reviewResult/index.jsx b/src/military/expert/reviewResult/index.jsx index 80f76c68..501ee07a 100644 --- a/src/military/expert/reviewResult/index.jsx +++ b/src/military/expert/reviewResult/index.jsx @@ -42,7 +42,7 @@ function ReviewResult({ history, match, mygetHelmetapi}) { } }, { - title: '平均得分', + title: '最终得分', dataIndex: 'finalGrades', key: 'phone', }, diff --git a/src/modules/tpm/NewFooter.js b/src/modules/tpm/NewFooter.js index 331ff57c..ccd9ebf1 100644 --- a/src/modules/tpm/NewFooter.js +++ b/src/modules/tpm/NewFooter.js @@ -24,11 +24,12 @@ class NewFooter extends Component { render() { const {forge_footer} = this.state; return ( -
- { - forge_footer && this.showhtml(forge_footer) - } -
+ //
+ // { + // forge_footer && this.showhtml(forge_footer) + // } + //
+ this.showhtml(forge_footer) ); } } diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index 226b1ada..47b7fb23 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -823,7 +823,7 @@ class NewHeader extends Component {