yee 7 years ago
parent
commit
744dfed26c

+ 22 - 7
js/component/account/set/changeMobile.jsx

@@ -10,7 +10,8 @@ const ChangePw = React.createClass({
             visible: false,
             getCodeButton: false,
             checkMobile: false,
-            vsCodeSrc: globalConfig.context + '/open/getVCode'
+            vsCodeSrc: globalConfig.context + '/open/getVCode',
+            mCodeText: '获取验证码'
         };
     },
     showModal() {
@@ -36,20 +37,20 @@ const ChangePw = React.createClass({
                     this.setState({
                         visible: false,
                     });
-                    message.success('修改成功!马上跳转到登录页面,请重新登录!');
+                    message.success('修改成功!3秒后跳转到登录页面,请重新登录!');
                     setInterval(function () {
                         $.ajax({
                             method: "get",
                             dataType: "json",
-                            url: globalConfig.context + "./login",
+                            url: globalConfig.context + "/login",
                         }).done(function (data) {
-                            window.location.href = "../login.html"
+                            window.location.href = globalConfig.context + "/user/login.html"
                         });
                         clearInterval(interval);
                     }, 3000);
                 } else {
                     message.warning(data.error[0].message);
-                }
+                };
             }.bind(this));
         };
     },
@@ -100,7 +101,21 @@ const ChangePw = React.createClass({
                             });
                             clearInterval(interval);
                         }, 60000);
-                    }
+                    };
+                    let i = 59;
+                    let countDown = setInterval(function () {
+                        _me.setState({
+                            mCodeText: '剩余' + i + '秒'
+                        });
+                        i--;
+                        if (i == 0) {
+                            clearInterval(countDown);
+                            _me.setState({
+                                mCodeText: '获取验证码'
+                            });
+                        };
+                    }, 1000);
+                    this.reloadVCode();
                 }.bind(this),
             });
         }
@@ -126,7 +141,7 @@ const ChangePw = React.createClass({
                         </span>
                     </div>
                     <div><span>手机验证码:</span><Input className="mixwidth" onChange={this.mcodeChange} />
-                        <Button onClick={this.getMCode} disabled={this.state.getCodeButton}>获取验证码</Button></div>
+                        <Button style={{width:'92px'}} onClick={this.getMCode} disabled={this.state.getCodeButton}>{this.state.mCodeText}</Button></div>
                 </Modal>
             </div>
         );

+ 2 - 1
js/component/certify/certify.less

@@ -53,6 +53,7 @@
             }
             .certify-content {
                 min-height: 300px;
+                margin-bottom: 100px;
                 .certify-step {
                     width: 880px;
                     height: 60px;
@@ -282,7 +283,7 @@
                 }
             }
             .footer {
-                position: absolute;
+                position: fixed;
                 width: 100%;
                 bottom: 0;
                 padding: 10px 0;

+ 2 - 1
js/component/groupCertify/certify.less

@@ -53,6 +53,7 @@
             }
             .certify-content {
                 min-height: 300px;
+                margin-bottom: 100px;
                 .certify-step {
                     width: 880px;
                     height: 60px;
@@ -279,7 +280,7 @@
                 }
             }
             .footer {
-                position: absolute;
+                position: fixed;
                 width: 100%;
                 bottom: 0;
                 padding: 10px 0;

+ 4 - 2
js/component/groupCertify/personal.jsx

@@ -97,6 +97,7 @@ const Content = Form.create()(React.createClass({
         return {
             loading: false,
             field: [],
+            fileList:[],
             vsCodeSrc: globalConfig.context + '/open/getVCode'
         };
     },
@@ -435,7 +436,7 @@ const Content = Form.create()(React.createClass({
                                 action={globalConfig.context + "/api/user/cognizance/uploadLastYearRatepay"}
                                 data={{ 'sign': 'ratepay' }}
                                 beforeUpload={beforeUploadFile}
-                                showUploadList={false}
+                                fileList={this.state.fileList}
                                 onChange={(info) => {
                                     if (info.file.status !== 'uploading') {
                                         console.log(info.file, info.fileList);
@@ -450,7 +451,8 @@ const Content = Form.create()(React.createClass({
                                         this.state.lastYearTaxReportUrl = info.file.response.data;
                                     } else if (info.file.status === 'error') {
                                         message.error(`${info.file.name} 文件上传失败。`);
-                                    }
+                                    };
+                                    this.setState({ fileList: info.fileList.slice(-1) });
                                 }}
                             >
                                 <Button><Icon type="upload" /> 上传上年度纳税申报表 </Button>

+ 4 - 4
js/component/manageCenter/achievement/achievementOrder.jsx

@@ -312,9 +312,9 @@ const AchievementOrderList = React.createClass({
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,	//接单时间
                         });
                     };
-                }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -538,7 +538,7 @@ const AchievementOrderList = React.createClass({
                         style={{ width: 200 }}
                         value={this.state.searchName}
                         onSearch={this.state.therottleSearch}
-                        placeholder="输入成果所有人"
+                        placeholder="输入订单所有人"
                         onChange={(e) => {
                             this.setState({ searchName: e });
                         }} />

+ 4 - 4
js/component/manageCenter/demand/demandOrder.jsx

@@ -322,9 +322,9 @@ const DemandOrderList = React.createClass({
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,	//接单时间
                         });
                     };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
                 }
-                this.state.pagination.current = data.data.pageNo;
-                this.state.pagination.total = data.data.totalCount;
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -586,9 +586,9 @@ const DemandOrderList = React.createClass({
                         value={this.state.searchName}
                         style={{ width: 200 }}
                         onSearch={this.state.therottleSearch}
-                        placeholder="输入雇主名称"
+                        placeholder="输入订单所有人名称"
                         onChange={(e) => {
-                            this.setState({searchName : e});
+                            this.setState({ searchName: e });
                         }} />
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>

+ 1 - 3
js/component/manageCenter/userManage/orgDesc.jsx

@@ -367,9 +367,7 @@ const OrgShow = Form.create()(React.createClass({
                             label="上年度纳税报表" >
                             <div className="idcard-img clearfix">
                                 {this.state.lastYearTaxReportUrl ? <div>
-                                    <div className="idcard-imgbox">
-                                        <a onClick={newDownloadFile.bind(null, this.state.lastYearTaxReportId, "last_year_ratepay", "/api/admin/patent/downloadRatepay")}>上年度纳税报表</a>
-                                    </div>
+                                    <a onClick={newDownloadFile.bind(null, this.state.lastYearTaxReportId, "last_year_ratepay", "/api/admin/patent/downloadRatepay")}>上年度纳税报表</a>
                                 </div> : <div>
                                         <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</p>
                                     </div>}

+ 1 - 1
js/component/manageCenter/userManage/orgList.jsx

@@ -186,7 +186,7 @@ const OrgList = React.createClass({
                     dataIndex: 'aftUsername',
                     key: 'aftUsername',
                 }, {
-                    title: '联系方式',
+                    title: '电子邮箱',
                     dataIndex: 'email',
                     key: 'email',
                 }, {

+ 11 - 0
js/component/manageCenter/userManage/userList.less

@@ -35,6 +35,17 @@
     .set-submit {
         margin-right: 20px;
     }
+    .idcard-imgbox {
+            height: 200px;
+            padding-top: 200px;
+            position: relative;
+        >img {
+            position: absolute;
+            top: 0;
+            left: 0;
+            height: 200px;
+        }
+    }
 }
 
 .admin-desc-content {