Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/user/account/AccountBasicEdit.js

@@ -278,6 +278,7 @@ class AccountBasic extends Component {
       this.setState({
         departments: [],
         filterDepartments: [],
+        departmentsName: '',
         school_id: '',
         department_id: '',
       })
@@ -412,7 +413,7 @@ class AccountBasic extends Component {
         addChildOrgSuccess={this.addChildOrgSuccess}
         ></ApplyForAddChildOrgModal>
         
-        <div className="basicForm">
+        <div className="basicForm courseNormalForm">
           <style>{`
             .formItemInline {    
               display: flex;
@@ -448,9 +449,7 @@ class AccountBasic extends Component {
             .basicForm .cancelBtn {
               margin-left: 0px;
             }
-            .basicForm .ant-input-lg {
+
-              height: 32px;
-            }
             .basicForm .ant-form-item-label {
               width: 100px;
               padding-right: 10px;
@@ -576,6 +575,7 @@ class AccountBasic extends Component {
                 <Form.Item
                 label=""
                 className="formItemInline fl"
+                style={{ 'margin-top': '3px'}}
                 // style={{display:identity && identity=="student" ? "block":"none"}}
               >
                 {getFieldDecorator('student_No', {
@@ -680,6 +680,7 @@ class AccountBasic extends Component {
             <Form.Item
               label="院系/部门"
               className="formItemInline mb0"
+              style={{ 'margin-top': '10px'}}
             >
               {getFieldDecorator('org2', {
                 rules: [{
@@ -730,7 +731,7 @@ class AccountBasic extends Component {
             </Form.Item> */}
           </Form>
           </div>
-          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
+          <div style={{color: '#989898', marginLeft: '20px', marginBottom: '10px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
       </div>
     );
   }

public/react/src/modules/user/account/AccountCertification.js

@@ -15,20 +15,16 @@ class AccountCertification extends Component {
   }
 
   checkBasicInfo = (index) => {
-    if (index == 1) {
+    if ( this.props.basicInfo.base_info_completed == true) {
-      if ( this.props.basicInfo.base_info_completed == true) {
-        this.showRealNameCertificationModal(index)
-      } else {
-        this.props.confirm({
-          okText: `立即完善`,
-          content: `请先完善基本信息`,
-          onOk: () => {
-            this.props.history.push('/account/profile/edit')  
-          }
-        })
-      }
-    } else if (index == 2) {
       this.showRealNameCertificationModal(index)
+    } else {
+      this.props.confirm({
+        okText: `立即完善`,
+        content: `请先完善基本信息`,
+        onOk: () => {
+          this.props.history.push('/account/profile/edit')  
+        }
+      })
     }
     
   }

public/react/src/modules/user/account/AccountSecure.js

@@ -335,7 +335,7 @@ class AccountSecure extends Component {
                 </Button>
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onPhoneSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>
@@ -398,7 +398,7 @@ class AccountSecure extends Component {
                 { !secondsFlag ? "获取验证码":`重新发送${seconds}s`}</Button>
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onEmailSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>
@@ -471,7 +471,7 @@ class AccountSecure extends Component {
                 )}
               </Form.Item>
 
-              <div className="mb20" style={{ marginLeft: '118px' }}>
+              <div className="mb20" style={{ marginLeft: '204px' }}>
                 <Button type="primary" onClick={this.onPasswordSubmit}>确定</Button>
                 <Button type="primary grayBtn" style={{ marginLeft: '20px'}} onClick={this.hideUpdating}>取消</Button>
               </div>

public/react/src/modules/user/account/common.css

@@ -51,3 +51,33 @@ button.ant-btn.ant-btn-primary.grayBtn {
     .basicForm .ant-form-item-label label {
       color: #979797
     } */
+
+
+.courseNormalForm .ant-select-show-search {
+  height: 40px;
+}
+.courseNormalForm .ant-select-auto-complete.ant-select .ant-input {
+  height: 40px;
+}
+.courseNormalForm .ant-select-search__field__mirror {
+  height: 40px;
+}
+.courseNormalForm .ant-input-lg {
+  height: 40px;
+}
+.courseNormalForm .ant-select-selection--single {
+  height: 40px;
+}
+.courseNormalForm .ant-select-auto-complete.ant-select .ant-select-selection--single {
+  height: 40px
+}
+.courseNormalForm .ant-input-affix-wrapper {
+  height: 40px;
+}
+/* 职业 */
+.courseNormalForm .ant-select-selection-selected-value {
+  line-height: 38px
+}
+.courseNormalForm input {
+  height: 40px;
+}

public/react/src/modules/user/modal/ApplyForAddChildOrgModal.js

@@ -76,7 +76,7 @@ class ApplyForAddChildOrgModal extends Component{
         {...this.props }
         onOk={this.onOk}
         okText="保存"
-        className="applyForModal"
+        className="applyForModal courseNormalForm"
       >
         <style>{`
           .applyForModal .ant-form-item-label {
@@ -90,7 +90,7 @@ class ApplyForAddChildOrgModal extends Component{
             width: 390px;
           }
         `}</style>
-        <Form>
+        <Form className="">
           <Form.Item
             label="单位名称："
             className="mt15 formItemInline hideRequireTag"

public/react/src/modules/user/modal/ApplyForAddOrgModal.js

@@ -74,7 +74,7 @@ class ApplyForAddOrgModal extends Component{
         {...this.props }
         onOk={this.onOk}
         okText="保存"
-        className="applyForModal"
+        className="applyForModal courseNormalForm"
       >
         <style>{`
           .applyForModal .ant-form-item-label {
@@ -89,7 +89,7 @@ class ApplyForAddOrgModal extends Component{
           }
           .applyForModal .formItemInline .ant-form-item-control .ant-cascader-picker,.applyForModal .formItemInline .ant-cascader-picker-large .ant-input{
             width: 100%;
-            height:32px!important;
+            height:40px!important;
           }
           .applyForModal .formItemInline .ant-input-lg{
             font-size:14px!important;
@@ -102,7 +102,7 @@ class ApplyForAddOrgModal extends Component{
               width: 196px;
           }
         `}</style>
-        <Form onSubmit={this.onOk}>
+        <Form onSubmit={this.onOk} className="">
           <Form.Item
             label="单位全称："
             className="mt15 formItemInline explain"

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -147,7 +147,7 @@ class RealNameCertificationModal extends Component{
         {...this.props }
         onOk={this.onOk}
         okText="保存"
-        className="applyForModal certificationModal"
+        className="applyForModal certificationModal courseNormalForm"
         bottomRender={
           certification && certification == 1?
           <div className="bottomRender">
@@ -186,7 +186,7 @@ class RealNameCertificationModal extends Component{
         >
         <style>{`
           .applyForModal .ant-form-item{
-            margin-bottom:15px;
+            margin-bottom:18px;
           }
           .applyForModal .ant-form-item-label {
             width: 100px;