yee преди 8 години
родител
ревизия
683a675cda

+ 5 - 5
js/component/account/services/annualReport.jsx

@@ -329,13 +329,13 @@ const AnnualReportDesc = React.createClass({
                 year: this.props.data ? this.props.data.year : (new Date().getFullYear() - 1)
             }
         }).done((data) => {
-            if (!data.data) {
+            let thisdata = data.data;
+            if (!thisData) {
                 if (data.error && data.error.length) {
                     message.warning(data.error[0].message);
-                }
-                return;
+                };
+                thisData = {};
             };
-            let thisdata = data.data;
             this.state.detailData = {
                 id: thisdata.id,
                 uid: thisdata.uid,
@@ -428,7 +428,7 @@ const AnnualReportDesc = React.createClass({
                         <AnnualReportDescFrom
                             data={this.props.data}
                             detailData={this.state.detailData}
-                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
+                            spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>

+ 1 - 1
js/component/account/services/cognizance.jsx

@@ -478,7 +478,7 @@ const CognizanceAdd = React.createClass({
                         </div>
                         <div className="half-item">
                             <span>选择联系人: </span>
-                            <Select placeholder="请选择年份" style={{ width: 200 }}
+                            <Select placeholder="请选择联系人" style={{ width: 200 }}
                                 onSelect={(e, n) => { this.state.contacts = e }}>
                                 {this.props.contactsOption}
                             </Select>

+ 20 - 9
js/component/account/services/techProduct.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon, Upload, Form, Button, Radio, Input, Spin, Table, message, Select, Modal, DatePicker, Cascader, Transfer, InputNumber } from 'antd';
 import { techFieldList, technicalSourceList } from '../../dataDic.js';
-import { getTechField, getTechnicalSource, beforeUploadFile } from '../../tools.js';
+import { getTechField, getTechnicalSource, beforeUploadFile, downloadFile } from '../../tools.js';
 import './techProduct.less';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
@@ -26,8 +26,9 @@ const TechProductDescFrom = Form.create()(React.createClass({
         this.state.targetKeys = this.props.data.intellectualPropertyNumber;
     },
     componentWillReceiveProps(nextProps) {
-        if (nextProps.data) {
-            this.state.targetKeys = nextProps.data.intellectualPropertyNumber;
+        if (!this.props.visible && nextProps.visible && nextProps.data) {
+            this.state.targetKeys = nextProps.data.intellectualPropertyNumber || [];
+            this.props.form.resetFields();
         };
     },
     handleSubmit(e) {
@@ -88,7 +89,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
         };
         const _me = this;
         return (
-            <Form onSubmit={this.handleSubmit} className="activityCost-form">
+            <Form onSubmit={this.handleSubmit} id="techProduct-form">
                 <div className="clearfix">
                     <FormItem className="half-item"
                         {...formItemLayout}
@@ -212,11 +213,11 @@ const TechProductDescFrom = Form.create()(React.createClass({
                             <Input type='textarea' rows={6} onChange={(e) => { if (e.target.value.length > 400) { return; } }} />
                             )}
                     </FormItem>
-                    <p style={{ lineHeight: "32px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
                     <FormItem className="half-item"
                         labelCol={{ span: 0 }}
                         wrapperCol={{ span: 22 }}
                     >
+                        <p style={{ lineHeight: "32px" }}>知识产权获得情况及其对产品(服务)在技术上发挥的支持作用(限400字)*</p>
                         {getFieldDecorator('conditionEffect', {
                             rules: [{ required: true, message: '此项为必填项!' }],
                             initialValue: theData.conditionEffect
@@ -229,8 +230,9 @@ const TechProductDescFrom = Form.create()(React.createClass({
                     <Upload
                         name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': this.props.year + 'proof' }}
+                        data={{ 'sign': 'tech_product' }}
                         beforeUpload={beforeUploadFile}
+                        showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
                                 console.log(info.file, info.fileList);
@@ -248,8 +250,9 @@ const TechProductDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传台账 </Button>
+                        <Button><Icon type="upload" /> 上传高新技术产品台帐 </Button>
                     </Upload>
+                    <p style={{ marginTop: '10px' }}>{theData.accountUrl ? <a onClick={downloadFile.bind(null, theData.accountUrl, theData.accountDownloadFileName)}>{theData.accountDownloadFileName}</a> : <span>未上传!</span>}</p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
@@ -301,8 +304,13 @@ const TechProductDesc = React.createClass({
                         width='1000px'
                         footer=''
                     >
-                        <TechProductDescFrom data={this.props.data} mockData={this.props.mockData}
-                            spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
+                        <TechProductDescFrom
+                            data={this.props.data}
+                            mockData={this.props.mockData}
+                            spinState={this.spinChange}
+                            closeModal={this.handleCancel}
+                            visible={this.state.visible}
+                            clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -383,6 +391,9 @@ const TechProduct = React.createClass({
                     conditionEffect: thisdata.conditionEffect,
                     year: thisdata.year,
                     createTime: thisdata.createTime,
+
+                    accountDownloadFileName: thisdata.accountDownloadFileName,
+                    accountUrl: thisdata.accountUrl
                 });
             };
             this.state.pagination.current = data.data.pageNo;

+ 6 - 0
js/component/account/services/techProduct.less

@@ -20,6 +20,12 @@
     }
 }
 
+#techProduct-form {
+    .half-item {
+        height: auto
+    }
+}
+
 .upload-box {
     display: inline-block;
     margin-top: 10px;

+ 7 - 8
js/component/account/set/group.jsx

@@ -24,11 +24,11 @@ const BaseFrom = Form.create()(React.createClass({
                     this.setState({
                         fixedTel: data.data.fixedTel,
                         firstContacts: data.data.firstContacts,
-                        firstMobile:data.data.firstMobile,
+                        firstMobile: data.data.firstMobile,
                         secondContacts: data.data.secondContacts,
-                        secondMobile:data.data.secondMobile,
+                        secondMobile: data.data.secondMobile,
                         thirdContacts: data.data.thirdContacts,
-                        thirdMobile:data.data.thirdMobile,
+                        thirdMobile: data.data.thirdMobile,
                         qq: data.data.qq,
                         address: data.data.postalAddress,
                         postcode: data.data.postcode,
@@ -56,7 +56,6 @@ const BaseFrom = Form.create()(React.createClass({
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
             if (!err) {
-                debugger
                 this.props.spinState(true);
                 $.ajax({
                     method: "POST",
@@ -65,11 +64,11 @@ const BaseFrom = Form.create()(React.createClass({
                     url: globalConfig.context + "/api/user/orgIdentity",
                     data: {
                         "firstContacts": values.firstContacts,
-                        "firstMobile":values.firstMobile,
+                        "firstMobile": values.firstMobile,
                         "secondContacts": values.secondContacts,
-                        "secondMobile":values.secondMobile,
+                        "secondMobile": values.secondMobile,
                         "thirdContacts": values.thirdContacts,
-                        "thirdMobile":values.thirdMobile,
+                        "thirdMobile": values.thirdMobile,
                         "email": values.email,
                         "fixedTel": values.telephone,
                         "qq": values.qq,
@@ -111,7 +110,7 @@ const BaseFrom = Form.create()(React.createClass({
     },
     checkPhone(rule, value, callback) {
         const form = this.props.form;
-        if (!(/^1[34578]\d{9}$/.test(value))) {
+        if (value.length !== 0 && !(/^1[34578]\d{9}$/.test(value))) {
             callback('请输入正确的手机号码!');
         } else {
             callback();

+ 4 - 0
js/component/login/adminLogin.less

@@ -2,12 +2,16 @@ body {
     background: #fff url(../../../image/bg.jpg) no-repeat;
     background-size: cover;
 }
+
 .login-box {
     width: 400px;
     height: 320px;
     padding: 50px 50px 0 50px;
     background: #fff;
     margin: 40px auto;
+    position: relative;
+    left: 200px;
+    top: 90px;
     input {
         height: 36px;
         border-radius: 0px;

+ 1 - 1
js/component/login/login.less

@@ -5,7 +5,7 @@
     margin: 0 auto;
     position: relative;
     background-image: url(../../../image/bg.jpg);
-    background-size: 100%;
+    background-size: cover;
     .login-header {
         background: #fff;
         box-shadow: 0 2px 6px 0px #ccc;

+ 15 - 9
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Icon, Upload, Form, Button, Radio, Input, Spin, Table, message, Select, Modal, DatePicker, Cascader, Transfer, InputNumber } from 'antd';
 import { techFieldList, technicalSourceList } from '../../../../dataDic.js';
-import { getTechField, getTechnicalSource, beforeUploadFile } from '../../../../tools.js';
+import { getTechField, getTechnicalSource, beforeUploadFile, downloadFile } from '../../../../tools.js';
 import moment from 'moment';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -25,10 +25,10 @@ const TechProductDescFrom = Form.create()(React.createClass({
         this.state.targetKeys = this.props.data.intellectualPropertyNumber || [];
     },
     componentWillReceiveProps(nextProps) {
-        if (this.props.resetForm) {
+        if (!this.props.visible && nextProps.visible && nextProps.data && this.props.resetForm) {
             this.state.targetKeys = nextProps.data.intellectualPropertyNumber || [];
             this.props.form.resetFields();
-        }
+        };
     },
     handleSubmit(e) {
         e.preventDefault();
@@ -89,7 +89,7 @@ const TechProductDescFrom = Form.create()(React.createClass({
         };
         const _me = this;
         return (
-            <Form onSubmit={this.handleSubmit} className="activityCost-form">
+            <Form onSubmit={this.handleSubmit} id="techProduct-form">
                 <div className="clearfix">
                     <FormItem className="half-item"
                         {...formItemLayout}
@@ -228,10 +228,11 @@ const TechProductDescFrom = Form.create()(React.createClass({
                 </div>
                 <div style={{ width: '50%' }}>
                     <Upload
-                        name="account"
+                        name="ratepay"
                         action={globalConfig.context + "/techservice/cognizance/upload"}
-                        data={{ 'sign': this.props.year + 'proof' }}
+                        data={{ 'sign': 'tech_product' }}
                         beforeUpload={beforeUploadFile}
+                        showUploadList={false}
                         onChange={(info) => {
                             if (info.file.status !== 'uploading') {
                                 console.log(info.file, info.fileList);
@@ -249,8 +250,9 @@ const TechProductDescFrom = Form.create()(React.createClass({
                             }
                         }}
                     >
-                        <Button><Icon type="upload" /> 上传台账 </Button>
+                        <Button><Icon type="upload" /> 上传高新技术产品台帐 </Button>
                     </Upload>
+                    <p style={{ marginTop: '10px' }}>{theData.accountUrl ? <a onClick={downloadFile.bind(null, theData.accountUrl, theData.accountDownloadFileName)}>{theData.accountDownloadFileName}</a> : <span>未上传!</span>}</p>
                 </div>
                 <FormItem style={{ marginTop: '20px' }}>
                     <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
@@ -282,7 +284,7 @@ const TechProductDesc = React.createClass({
             visible: false,
             resetForm: true
         });
-        this.props.closeDesc(false,true);
+        this.props.closeDesc(false, true);
     },
     handleCancel(e) {
         this.setState({
@@ -310,7 +312,7 @@ const TechProductDesc = React.createClass({
                             uid={this.props.uid}
                             resetForm={this.state.resetForm}
                             mockData={this.props.mockData}
-                            spinState={this.spinChange} closeModal={this.handleCancel}  clickOk={this.handleOk} />
+                            spinState={this.spinChange} closeModal={this.handleCancel} clickOk={this.handleOk} />
                     </Modal>
                 </Spin>
             </div>
@@ -393,6 +395,10 @@ const TechProduct = React.createClass({
                     conditionEffect: thisdata.conditionEffect,
                     year: thisdata.year,
                     createTime: thisdata.createTime,
+
+                    accountDownloadFileName: thisdata.accountDownloadFileName,
+                    accountUrl: thisdata.accountUrl
+
                 });
             };
             this.state.pagination.current = data.data.pageNo;

+ 6 - 0
js/component/manageCenter/servicesManage/highTech/fosterDesc/techProduct.less

@@ -21,6 +21,12 @@
     }
 }
 
+#techProduct-form {
+    .half-item {
+        height: auto
+    }
+}
+
 .upload-box {
     display: inline-block;
     margin-top: 10px;

+ 1 - 1
js/component/manageCenter/topTab.jsx

@@ -27,7 +27,7 @@ const TopTab = React.createClass({
         return (
             <div className="account-top" >
                 <div className="acc-top-user">
-                    <span className="acc-top-user-name">欢迎您, {userData.nickname || userData.number || this.state.username} <a onClick={this.logOut}>[ 退出 ]</a></span>
+                    <span className="acc-top-user-name">欢迎您, {adminData.nickname || adminData.number || this.state.username} <a onClick={this.logOut}>[ 退出 ]</a></span>
                     <span className="acc-top-user-toindex"><a href={globalConfig.context + "/admin/index.html"}>返回首页</a></span>
                 </div>
                 <div className="acc-index">

+ 35 - 33
js/component/manageCenter/userManage/orgCertify.jsx

@@ -27,51 +27,52 @@ const OrgCertify = Form.create()(React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/orgDetail",
             data: {
-                uid: this.props.uid
+                uid: this.state.uid
             },
             success: function (data) {
-                if (!data.data) {
+                let thisData = data.data;
+                if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                     };
-                    return;
+                    thisData = {};
                 };
                 addressInit('licenceProvince', 'licenceCity', 'licenceArea',
-                    data.data.licenceProvince, data.data.licenceCity, data.data.licenceArea);
+                    thisData.licenceProvince, thisData.licenceCity, thisData.licenceArea);
                 addressInit('locationProvince', 'locationCity', 'locationArea',
-                    data.data.locationProvince, data.data.locationCity, data.data.locationArea);
+                    thisData.locationProvince, thisData.locationCity, thisData.locationArea);
                 this.setState({
-                    id: data.data.id,
-                    contacts: data.data.contacts,
-                    contactMobile: data.data.contactMobile,
-                    fixedTel: data.data.fixedTel,
-                    qq: data.data.qq,
-                    postalAddress: data.data.postalAddress,
-                    postcode: data.data.postcode,
-                    aftUsername: data.data.aftUsername,
-                    unitName: data.data.unitName,
-                    identityType: String(data.data.identityType), //组织性质
-                    registeredCapital: data.data.registeredCapital, //注册资金
+                    id: thisData.id,
+                    contacts: thisData.contacts,
+                    contactMobile: thisData.contactMobile,
+                    fixedTel: thisData.fixedTel,
+                    qq: thisData.qq,
+                    postalAddress: thisData.postalAddress,
+                    postcode: thisData.postcode,
+                    aftUsername: thisData.aftUsername,
+                    unitName: thisData.unitName,
+                    identityType: thisData.identityType, //组织性质
+                    registeredCapital: thisData.registeredCapital, //注册资金
 
-                    legalPerson: data.data.legalPerson,
-                    legalPersonIdCard: data.data.legalPersonIdCard,
+                    legalPerson: thisData.legalPerson,
+                    legalPersonIdCard: thisData.legalPersonIdCard,
 
-                    licenceNumber: data.data.licenceNumber,
-                    licenceScanningUrl: data.data.licenceScanningUrl,
-                    orgCode: data.data.orgCode,
-                    orgCodeUrl: data.data.orgCodeUrl,
+                    licenceNumber: thisData.licenceNumber,
+                    licenceScanningUrl: thisData.licenceScanningUrl,
+                    orgCode: thisData.orgCode,
+                    orgCodeUrl: thisData.orgCodeUrl,
 
-                    bankAccount: data.data.bankAccount,
-                    banks: data.data.banks,
-                    bankBranch: data.data.bankBranch,
-                    bankCardNumber: data.data.bankCardNumber,
+                    bankAccount: thisData.bankAccount,
+                    banks: thisData.banks,
+                    bankBranch: thisData.bankBranch,
+                    bankCardNumber: thisData.bankCardNumber,
 
-                    validationAmount: data.data.validationAmount, //打款金额
-                    paymentDate: data.data.paymentDate,
-                    paymentDateFormattedDate: data.data.paymentDateFormattedDate,
-                    lastYearTaxReportUrl: data.data.lastYearTaxReportUrl,
-                    auditStatus: String(data.data.auditStatus),
-                    process: data.data.process
+                    validationAmount: thisData.validationAmount, //打款金额
+                    paymentDate: thisData.paymentDate,
+                    paymentDateFormattedDate: thisData.paymentDateFormattedDate,
+                    lastYearTaxReportUrl: thisData.lastYearTaxReportUrl,
+                    auditStatus: thisData.auditStatus,
+                    process: thisData.process
                 });
             }.bind(this),
         }).always(function () {
@@ -153,11 +154,12 @@ const OrgCertify = Form.create()(React.createClass({
     componentDidMount() {
         addressInit('licenceProvince', 'licenceCity', 'licenceArea');
         addressInit('locationProvince', 'locationCity', 'locationArea');
+        this.state.uid = this.props.uid;
         this.loadData();
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
-            this.props.form.resetFields();
+            this.state.uid = nextProps.uid;
             this.loadData();
         };
     },

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

@@ -47,7 +47,7 @@ const OrgAdd = React.createClass({
                 this.setState({
                     visible: false,
                 });
-                this.props.closeDesc(false,true);
+                this.props.closeDesc(false, true);
             } else {
                 message.warning(data.error[0].message);
             };
@@ -247,7 +247,7 @@ const OrgList = React.createClass({
             <div className="user-content" >
                 <div className="content-title">
                     <span>组织用户管理</span>
-                    <OrgAdd />
+                    <OrgAdd closeDesc={this.closeDesc} />
                 </div>
                 <div className="user-search">
                     <Input placeholder="阿凡提号" value={this.state.searchAftId}

+ 36 - 33
js/component/manageCenter/userManage/userDesc.jsx

@@ -25,40 +25,41 @@ const UserForm = Form.create()(React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/userDetail",
             data: {
-                uid: this.props.uid
+                uid: this.state.uid
             },
             success: function (data) {
-                if (!data.data) {
+                let thisData = data.data;
+                if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                     };
-                    return;
+                    thisData = {};
                 };
                 let d = new Date()
-                if (data.data.dateOfBirthMonth && data.data.dateOfBirthYear) {
-                    d.setMonth(data.data.dateOfBirthMonth - 1);
-                    d.setYear(parseInt(data.data.dateOfBirthYear));
+                if (thisData && thisData.dateOfBirthMonth && thisData.dateOfBirthYear) {
+                    d.setMonth(thisData.dateOfBirthMonth - 1);
+                    d.setYear(parseInt(thisData.dateOfBirthYear));
                 };
                 addressInit('cmbProvince', 'cmbCity', 'cmbArea',
-                    data.data.province, data.data.city, data.data.area);
+                    thisData.province, thisData.city, thisData.area);
                 this.setState({
-                    username: data.data.username,
-                    sex: data.data.sex,
-                    id: data.data.id,
+                    username: thisData.username,
+                    sex: thisData.sex,
+                    id: thisData.id,
                     birth: d,
-                    idNumber: data.data.idNumber,
-                    positiveIdUrl: data.data.positiveIdUrl,
-                    oppositeIdUrl: data.data.oppositeIdUrl,
-                    aftUsername: data.data.aftUsername,
-                    contactMobile: data.data.contactMobile,
-                    bankName: data.data.bankName,
-                    bankAccount: data.data.bankAccount,
-                    bankCardNumber: data.data.bankCardNumber,
-                    amountMoney: data.data.amountMoney,
-                    auditStatus: String(data.data.auditStatus),
-                    process: data.data.process,
-                    paymentDateFormattedDate: data.data.paymentDateFormattedDate,
-                    paymentDate: data.data.paymentDate
+                    idNumber: thisData.idNumber,
+                    positiveIdUrl: thisData.positiveIdUrl,
+                    oppositeIdUrl: thisData.oppositeIdUrl,
+                    aftUsername: thisData.aftUsername,
+                    contactMobile: thisData.contactMobile,
+                    bankName: thisData.bankName,
+                    bankAccount: thisData.bankAccount,
+                    bankCardNumber: thisData.bankCardNumber,
+                    amountMoney: thisData.amountMoney,
+                    auditStatus: thisData.auditStatus,
+                    process: thisData.process,
+                    paymentDateFormattedDate: thisData.paymentDateFormattedDate,
+                    paymentDate: thisData.paymentDate
                 });
             }.bind(this),
         }).always(function () {
@@ -120,10 +121,12 @@ const UserForm = Form.create()(React.createClass({
     },
     componentDidMount() {
         addressInit('cmbProvince', 'cmbCity', 'cmbArea');
+        this.state.uid = this.props.uid;
         this.loadData();
     },
     componentWillReceiveProps(nextProps) {
         if (!this.props.visible && nextProps.visible) {
+            this.state.uid = nextProps.uid;
             this.loadData();
         };
     },
@@ -142,7 +145,7 @@ const UserForm = Form.create()(React.createClass({
                     label="用户名"
                 >
                     {getFieldDecorator('username', {
-                        initialValue: this.state.username || null
+                        initialValue: this.state.username
                     })(
                         <Input />
                         )}
@@ -152,7 +155,7 @@ const UserForm = Form.create()(React.createClass({
                     label="性别"
                 >
                     {getFieldDecorator('sex', {
-                        initialValue: this.state.sex || null
+                        initialValue: this.state.sex
                     })(
                         <Radio.Group>
                             <Radio value="男">男</Radio>
@@ -175,7 +178,7 @@ const UserForm = Form.create()(React.createClass({
                     label="身份证号"
                 >
                     {getFieldDecorator('idNumber', {
-                        initialValue: this.state.idNumber || null
+                        initialValue: this.state.idNumber
                     })(
                         <Input />
                         )}
@@ -205,7 +208,7 @@ const UserForm = Form.create()(React.createClass({
                     label="认证姓名"
                 >
                     {getFieldDecorator('aftUsername', {
-                        initialValue: this.state.aftUsername || null
+                        initialValue: this.state.aftUsername
                     })(
                         <Input />
                         )}
@@ -215,7 +218,7 @@ const UserForm = Form.create()(React.createClass({
                     label="联系电话"
                 >
                     {getFieldDecorator('contactMobile', {
-                        initialValue: this.state.contactMobile || null
+                        initialValue: this.state.contactMobile
                     })(
                         <Input />
                         )}
@@ -238,7 +241,7 @@ const UserForm = Form.create()(React.createClass({
                     label="开户银行"
                 >
                     {getFieldDecorator('bankAccount', {
-                        initialValue: this.state.bankAccount || null
+                        initialValue: this.state.bankAccount
                     })(
                         <Input />
                         )}
@@ -248,7 +251,7 @@ const UserForm = Form.create()(React.createClass({
                     label="银行卡号"
                 >
                     {getFieldDecorator('bankCardNumber', {
-                        initialValue: this.state.bankCardNumber || null
+                        initialValue: this.state.bankCardNumber
                     })(
                         <Input />
                         )}
@@ -258,7 +261,7 @@ const UserForm = Form.create()(React.createClass({
                     label="打款金额"
                 >
                     {getFieldDecorator('amountMoney', {
-                        initialValue: this.state.amountMoney || null
+                        initialValue: this.state.amountMoney
                     })(
                         <Input />
                         )}
@@ -278,7 +281,7 @@ const UserForm = Form.create()(React.createClass({
                     label="认证状态"
                 >
                     {getFieldDecorator('auditStatus', {
-                        initialValue: this.state.auditStatus || null
+                        initialValue: this.state.auditStatus
                     })(
                         <Select placeholder="选择认证状态" style={{ width: 200 }}
                             onChange={(e) => { this.state.auditStatus = e }}>
@@ -295,7 +298,7 @@ const UserForm = Form.create()(React.createClass({
                     label="认证步骤"
                 >
                     {getFieldDecorator('process', {
-                        initialValue: this.state.process || null
+                        initialValue: this.state.process
                     })(
                         <Input />
                         )}

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

@@ -31,6 +31,9 @@
             width: 100px;
         }
     }
+    .set-submit {
+        margin-right: 20px;
+    }
 }
 
 .admin-desc-content {

+ 1 - 1
js/component/sign/account.jsx

@@ -36,7 +36,6 @@ const LoginContent = Form.create()(React.createClass({
                         "mobile": values.phone,
                         "password": values.password,
                         "type": 0,
-                        "verificationCode": values.captcha,
                         "mobileCode": values.phonecaptcha
                     }
                 }).done(function (data) {
@@ -94,6 +93,7 @@ const LoginContent = Form.create()(React.createClass({
             url: globalConfig.context + "/open/getMCode",
             data: {
                 "mobile": form.getFieldValue('phone'),
+                "verificationCode": form.getFieldValue('captcha')
             },
             success: function (data) {
                 if (data.error.length == 0) {

+ 1 - 1
js/component/sign/groupAccount.jsx

@@ -35,7 +35,6 @@ const Group = Form.create()(React.createClass({
                         "type": 1,
                         "companyName": values.company,
                         "contacts": values.user,
-                        "verificationCode": values.captcha,
                         "mobileCode": values.phonecaptcha
                     }
                 }).done(function (data) {
@@ -66,6 +65,7 @@ const Group = Form.create()(React.createClass({
             url: globalConfig.context + "/open/getMCode",
             data: {
                 "mobile": form.getFieldValue('phone'),
+                "verificationCode": form.getFieldValue('captcha')
             },
             success: function (data) {
                 if (data.error.length == 0) {

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "scripts": {