diff --git a/src/App.js b/src/App.js index 0cc4e9e9..db4b90c5 100644 --- a/src/App.js +++ b/src/App.js @@ -151,7 +151,7 @@ const Managements = Loadable({ // }) // 此处仅维护前端可能的一级路由,不用进行项目或者组织判断的字段。 -const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder","task","notice","managements","expert",]; +const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "login", "register", "resetPassword", "aboutus","educoder","task","notice","managements","expert","competition"]; class App extends Component { constructor(props) { diff --git a/src/AppConfig.js b/src/AppConfig.js index 8e89543b..bdf2e7d7 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -33,7 +33,9 @@ export function initAxiosInterceptors(props) { initOnlineOfflineListener(); // var proxy = "http://192.168.1.40:3000"; - var proxy = "http://111.8.36.180:8000"; + // var proxy = "http://111.8.36.180:8000"; + var proxy = "http://117.50.100.12:49999"; + //响应前的设置 axios.interceptors.request.use( config => { diff --git a/src/military/qz2022/apply/index.jsx b/src/military/qz2022/apply/index.jsx index 7acc521c..02050791 100644 --- a/src/military/qz2022/apply/index.jsx +++ b/src/military/qz2022/apply/index.jsx @@ -132,7 +132,9 @@ export default Form.create()((props) => {
{!(enrollStatus && enrollStatus.enroll_status) && '填写'}报名信息
{/* 报名表单 */} - {!(enrollStatus && enrollStatus.enroll_status) &&
+ { + !(enrollStatus && enrollStatus.enroll_status) && + {helper('参赛单位', 'org_name', [{ required: true, message: "请正确输入参赛单位" }, @@ -190,15 +192,17 @@ export default Form.create()((props) => { {pattern: /(\d{11})|^((\d{7,8})|(\d{4}|\d{3})-(\d{7,8})|(\d{4}|\d{3})-(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1})|(\d{7,8})-(\d{4}|\d{3}|\d{2}|\d{1}))$/, message: "请输入正确的手机号"}], {verify("phone")}}/> )} -
+

成员 :

{errorMessage}

{/* */} - {qzDetail && } + {qzDetail && + }
} {/* 已报名,报名信息 */} - {enrollStatus && enrollStatus.enroll_status &&
+ {enrollStatus && enrollStatus.enroll_status && +
参赛单位 : {enrollStatus && enrollStatus.enroll_info.org_name}
参赛团队负责人姓名 : {enrollStatus && enrollStatus.enroll_info.leader}
{qzDetail && qzDetail.is_local &&
职务 : {enrollStatus && enrollStatus.enroll_info.org_job}
} @@ -214,7 +218,7 @@ export default Form.create()((props) => { -
} diff --git a/src/military/qz2022/apply/index.scss b/src/military/qz2022/apply/index.scss index 515e6a27..3a85a462 100644 --- a/src/military/qz2022/apply/index.scss +++ b/src/military/qz2022/apply/index.scss @@ -101,6 +101,9 @@ border-bottom: none; } } + .edit_table{ + width: 100%; + } .apply_team{ color: red; .add_member{ @@ -109,11 +112,10 @@ border-radius:4px; } .member_info{ - padding-right: 240px; + padding-right: 160px; } .member_info .ant-table{ margin-top: 20px; - width: 73vw; .ant-form-item{ width: 76%; margin: 0 0 10px 0; diff --git a/src/military/qz2022/chat/index.jsx b/src/military/qz2022/chat/index.jsx index a6cbb148..7ec93154 100644 --- a/src/military/qz2022/chat/index.jsx +++ b/src/military/qz2022/chat/index.jsx @@ -24,7 +24,7 @@ function Chat({ isLoacl }) {
-
+
{ window.open(isLoacl ? 'http://www.osredm.jk/forums/theme/76' : 'https://fc.osredm.com/forums/theme/107') }}>
参赛咨询
diff --git a/src/military/qz2022/image/banner.png b/src/military/qz2022/image/banner.png index a1180b55..dc89bb8d 100644 Binary files a/src/military/qz2022/image/banner.png and b/src/military/qz2022/image/banner.png differ diff --git a/src/military/qz2022/introduce/index.scss b/src/military/qz2022/introduce/index.scss index c81d0be3..3c47553f 100644 --- a/src/military/qz2022/introduce/index.scss +++ b/src/military/qz2022/introduce/index.scss @@ -19,6 +19,7 @@ height: 80%; margin-right: 2.2%; min-width: 30%; + max-width: 62.5%; float: left; video { width: 100%;