Browse Source

实名认证完成,待测试

yee 8 years ago
parent
commit
9151f0d4c0

File diff suppressed because it is too large
+ 1 - 1
build/user/certify.css


File diff suppressed because it is too large
+ 1 - 1
build/user/certify.js


File diff suppressed because it is too large
+ 1 - 1
build/user/groupCertify.css


File diff suppressed because it is too large
+ 9 - 9
build/user/groupCertify.js


+ 3 - 2
js/component/certify/audit.jsx

@@ -44,7 +44,8 @@ const Content = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        bankCardNumber : data.data.bankCardNumber
+                        bankCardNumber : data.data.bankCardNumber,
+                        auditStatus: data.data.auditStatus
                     });
                 } else {
                     message.warning(data.error[0].message);
@@ -74,7 +75,7 @@ const Content = Form.create()(React.createClass({
                         </span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        <Button className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
+                        <Button disabled={this.state.auditStatus == "3" ? false : true } className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
                     </FormItem>
                 </Form >
             </Spin >

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

@@ -167,8 +167,7 @@
                         .idcard-img {
                             >div {
                                 float: left;
-                                padding: 20px;
-                                border: 1px solid #c9c9c9;
+                                background: #c9c9c9;
                                 margin-right: 20px;
                                 >.idcard-imgbox {
                                     width: 142px;
@@ -252,7 +251,7 @@
                                 line-height: 24px;
                             }
                             button {
-                                margin-top:10px; 
+                                margin-top: 10px;
                             }
                         }
                     }

+ 2 - 2
js/component/certify/confirm.jsx

@@ -106,13 +106,13 @@ const Content = Form.create()(React.createClass({
                         <div className="idcard-img clearfix">
                             <div>
                                 <div className="idcard-imgbox">
-                                    <img src={globalConfig.context + '/open/writeImage?path=' + this.state.positiveIdUrl } alt="" 
+                                    <img src={globalConfig.context + '/open/writeImage?path=' + this.state.positiveIdUrl } alt="点击查看大图" 
                                     onClick={(e)=>{window.open(e.target.src)}}/>
                                 </div>
                             </div>
                             <div>
                                 <div className="idcard-imgbox">
-                                    <img src={globalConfig.context + '/open/writeImage?path=' + this.state.oppositeIdUrl} alt="" 
+                                    <img src={globalConfig.context + '/open/writeImage?path=' + this.state.oppositeIdUrl} alt="点击查看大图" 
                                     onClick={(e)=>{window.open(e.target.src)}}/>
                                 </div>
                             </div>

+ 31 - 20
js/component/certify/money.jsx

@@ -17,8 +17,9 @@ const Content = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        bankAccount: bankAccount,
-                        bankCardNumber: bankCardNumber
+                        bankAccount: data.data.bankAccount,
+                        bankCardNumber: data.data.bankCardNumber,
+                        auditStatus: data.data.auditStatus
                     });
                 } else {
                     message.warning(data.error[0].message);
@@ -48,21 +49,31 @@ const Content = Form.create()(React.createClass({
                     crossDomain: false,
                     url: globalConfig.context + "/api/user/userNextPro",
                     data: {
-                        amountMoney:values.amountMoney,
-                        process:5
-                    }
-                }).done(function (data) {
-                    if (!data.error.length) {
-                        message.success('保存成功!');
-                        this.props.change(6);
-                    } else {
-                        if ( data.amountError.length ) {
-                            message.warning(data.amountError[0].message);
-                        } else if ( data.error.length) {
-                            message.warning(data.error[0].message);
-                        }; 
-                    }
-                }.bind(this)).always(function () {
+                        amountMoney: values.amountMoney,
+                        process: 5
+                    },
+                    success: function (data) {
+                        if (!data.error.length) {
+                            message.success('提交成功!');
+                            this.props.change(6);
+                        } else {
+                            if (isNaN(Number(data.error[0].message))) {
+                                message.warning(data.error[0].message);
+                            } else {
+                                switch (Number(data.error[0].message)) {
+                                    case 1:
+                                        message.warning("超过打款日期五日,无法确认提交!");
+                                        this.props.change(6);
+                                        break;
+                                    case 2:
+                                        message.warning("输入错误金额次数过多!");
+                                        this.props.change(6);
+                                        break;
+                                }
+                            };
+                        };
+                    }.bind(this),
+                }).always(function () {
                     this.setState({
                         loading: false
                     });
@@ -89,7 +100,7 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 18, offset: 4 }}>
                         <span>
-                            请在下方输入银行卡{this.state.bankCardNumber}收到的认证打款,
+                            请在下方输入{this.state.bankAccount}银行卡{this.state.bankCardNumber}收到的认证打款,
                             务必在收到打款5日内完成,否则将无法完成
                         </span>
                     </FormItem>
@@ -108,14 +119,14 @@ const Content = Form.create()(React.createClass({
                     <FormItem
                         {...formItemLayout}
                         label="打款金额"
-                        extra={<span style={{ 'color': '#ea0862' }}><Icon type="exclamation-circle" /> 仅有3次输入机会,如3次输入有误,需更换银行卡重新认证</span>}
+                        extra={<span style={{ 'color': '#ea0862' }}><Icon type="exclamation-circle" /> 仅有3次输入机会,如3次输入有误,需重新认证</span>}
                     >
                         {getFieldDecorator('amountMoney', {
                             rules: [{ required: true, message: '请输入金额!' }]
                         })(
                             <Input />
                             )}
-                            <span className="fromItem-postfix">元</span>
+                        <span className="fromItem-postfix">元</span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">确认</Button>

+ 6 - 8
js/component/certify/result.jsx

@@ -9,7 +9,6 @@ const Content = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
-            auditStatus: 3
         };
     },
     handleSubmit() {
@@ -17,17 +16,16 @@ const Content = Form.create()(React.createClass({
             loading: true
         });
         $.ajax({
-            method: "POST",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/userNextPro",
+            url: globalConfig.context + "/api/user/identFailed",
             data: {
-                process: 4
             }
         }).done(function (data) {
             if (!data.error.length) {
-                message.success('保存成功!');
-                this.props.changeStep(5);
+                message.success('已提交重新审核!');
+                this.props.changeStep(1);
             } else {
                 message.warning(data.error[0].message);
             }
@@ -59,7 +57,7 @@ const Content = Form.create()(React.createClass({
             <Spin spinning={this.state.loading} className="certify-spin">
                 {(() => {
                     switch (this.state.auditStatus) {
-                        case 2:
+                        case 4:
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
@@ -70,7 +68,7 @@ const Content = Form.create()(React.createClass({
                                     <p>建议您下载数字证书,保障您的支付安全。</p>
                                 </div>
                             </div>;
-                        case 3:
+                        case 5:
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}

+ 5 - 4
js/component/groupCertify/audit.jsx

@@ -19,7 +19,7 @@ const Content = Form.create()(React.createClass({
             method: "POST",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/userNextPro",
+            url: globalConfig.context + "/api/user/orgNextPro",
             data: {
                 process: 4
             }
@@ -40,11 +40,12 @@ const Content = Form.create()(React.createClass({
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/api/user/userPro",
+            url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        bankCardNumber : data.data.bankCardNumber
+                        bankCardNumber : data.data.bankCardNumber,
+                        auditStatus : data.data.auditStatus
                     });
                 } else {
                     message.warning(data.error[0].message);
@@ -74,7 +75,7 @@ const Content = Form.create()(React.createClass({
                         </span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        <Button className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
+                        <Button disabled={this.state.auditStatus == "3" ? false : true } className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
                     </FormItem>
                 </Form >
             </Spin >

+ 0 - 1
js/component/groupCertify/bank.jsx

@@ -51,7 +51,6 @@ const Content = Form.create()(React.createClass({
                 message.warning("请选择所在地!");
                 return;
             };
-            debugger
             if (!err) {
                 this.setState({
                     loading: true

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

@@ -170,16 +170,14 @@
                         .idcard-img {
                             >div {
                                 float: left;
-                                padding: 20px;
-                                border: 1px solid #c9c9c9;
                                 margin-right: 20px;
+                                background: #c9c9c9;
                                 >.idcard-imgbox {
                                     width: 142px;
                                     height: 90px;
                                     padding-top: 90px;
                                     position: relative;
                                     img {
-                                        width: 142px;
                                         height: 90px;
                                         position: absolute;
                                         top: 0;

+ 65 - 13
js/component/groupCertify/confirm.jsx

@@ -18,11 +18,18 @@ const Content = Form.create()(React.createClass({
                 if (data.data) {
                     this.setState({
                         unitName: data.data.unitName,
-                        idNumber: data.data.idNumber,
+                        licenceNumber: data.data.licenceNumber,
+                        licenceScanningUrl: data.data.licenceScanningUrl,
+                        orgCode: data.data.orgCode,
+                        orgCodeUrl: data.data.orgCodeUrl,
+                        lastYearTaxReportUrl: data.data.lastYearTaxReportUrl,
                         contactMobile: data.data.contactMobile,
-                        bankName: data.data.bankName,
                         bankAccount: data.data.bankAccount,
-                        bankCardNumber: data.data.bankCardNumber
+                        banks: data.data.banks,
+                        bankBranch: data.data.bankBranch,
+                        bankCardNumber: data.data.bankCardNumber,
+                        legalPerson: data.data.legalPerson,
+                        legalPersonIdCard: data.data.legalPersonIdCard,
                     });
                 } else {
                     message.warning(data.error[0].message);
@@ -74,14 +81,14 @@ const Content = Form.create()(React.createClass({
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;
         const formItemLayout = {
-            labelCol: { span: 4 },
+            labelCol: { span: 6 },
             wrapperCol: { span: 12 },
         };
         const _me = this;
         return (
             <Spin spinning={this.state.loading} className="certify-spin">
                 <Form horizontal onSubmit={this.handleSubmit} className="certify-form">
-                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
+                    <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <p className="certify-title">请确认提交的企业信息</p>
                     </FormItem>
                     <FormItem
@@ -97,18 +104,48 @@ const Content = Form.create()(React.createClass({
                         <span>{this.state.licenceNumber}</span>
                     </FormItem>
                     <FormItem
-                        labelCol={{ span: 4 }}
+                        labelCol={{ span: 6 }}
                         wrapperCol={{ span: 18 }}
                         label="营业执照副本扫描件"
                     >
                         <div className="idcard-img clearfix">
                             <div className="idcard-imgbox">
-                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.positiveIdUrl } alt="" 
-                                onClick={(e)=>{window.open(e.target.src)}}/>
+                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.positiveIdUrl} alt="点击查看大图"
+                                    onClick={(e) => { window.open(e.target.src) }} />
                             </div>
                         </div>
                     </FormItem>
-                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
+                    <FormItem
+                        {...formItemLayout}
+                        label="组织机构代码"
+                    >
+                        <span>{this.state.orgCode}</span>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 6 }}
+                        wrapperCol={{ span: 18 }}
+                        label="组织机构代码证"
+                    >
+                        <div className="idcard-img clearfix">
+                            <div className="idcard-imgbox">
+                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.orgCodeUrl} alt="点击查看大图"
+                                    onClick={(e) => { window.open(e.target.src) }} />
+                            </div>
+                        </div>
+                    </FormItem>
+                    <FormItem
+                        labelCol={{ span: 6 }}
+                        wrapperCol={{ span: 18 }}
+                        label="上年度纳税报表"
+                    >
+                        <div className="idcard-img clearfix">
+                            <div className="idcard-imgbox">
+                                <img src={globalConfig.context + '/open/writeImage?path=' + this.state.lastYearTaxReportUrl} alt="点击查看大图"
+                                    onClick={(e) => { window.open(e.target.src) }} />
+                            </div>
+                        </div>
+                    </FormItem>
+                    <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <p className="certify-title">请确认银行卡信息</p>
                     </FormItem>
                     <FormItem
@@ -141,14 +178,29 @@ const Content = Form.create()(React.createClass({
                     >
                         <span>{this.state.contactMobile}</span>
                     </FormItem>
-                    <FormItem wrapperCol={{ span: 18, offset: 4 }}>
+                    <FormItem wrapperCol={{ span: 12, offset: 6 }}>
+                        <p className="certify-title">请确认法人信息</p>
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="法人真实姓名"
+                    >
+                        <span>{this.state.legalPerson}</span>
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="法人身份证号"
+                    >
+                        <span>{this.state.legalPersonIdCard}</span>
+                    </FormItem>
+                    <FormItem wrapperCol={{ span: 18, offset: 6 }}>
                         <span style={{ 'color': '#ea0862' }}>
                             <Icon type="exclamation-circle" />
-                            提醒:银行卡号、身份证号码,认证成功之前,最多只能申请认证3次,
-                            认证成功后,不能再申请认证。
+                            提醒:银行卡号、营业执照号码、组织机构代码证号码,认证成功之前
+                            最多只能申请认证3次;认证成功后,不能再申请认证。
                         </span>
                     </FormItem>
-                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
+                    <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">下一步</Button>
                         <Button className="exit" type="ghost" onClick={_me.changeStep}>返回修改</Button>
                     </FormItem>

+ 1 - 1
js/component/groupCertify/content.jsx

@@ -84,7 +84,7 @@ const Content = React.createClass({
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/api/user/userPro",
+            url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
                     this.state.stepNum = data.data.process + 1

+ 39 - 22
js/component/groupCertify/money.jsx

@@ -13,12 +13,13 @@ const Content = Form.create()(React.createClass({
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/api/user/userPro",
+            url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        bankAccount: bankAccount,
-                        bankCardNumber: bankCardNumber
+                        banks:data.data.banks,
+                        bankBranch:data.data.bankBranch,
+                        bankCardNumber: data.data.bankCardNumber
                     });
                 } else {
                     message.warning(data.error[0].message);
@@ -46,23 +47,33 @@ const Content = Form.create()(React.createClass({
                     method: "POST",
                     dataType: "json",
                     crossDomain: false,
-                    url: globalConfig.context + "/api/user/userNextPro",
+                    url: globalConfig.context + "/api/user/orgNextPro",
                     data: {
-                        amountMoney:values.amountMoney,
-                        process:5
-                    }
-                }).done(function (data) {
-                    if (!data.error.length) {
-                        message.success('保存成功!');
-                        this.props.change(6);
-                    } else {
-                        if ( data.amountError.length ) {
-                            message.warning(data.amountError[0].message);
-                        } else if ( data.error.length) {
-                            message.warning(data.error[0].message);
-                        }; 
-                    }
-                }.bind(this)).always(function () {
+                        amountMoney: values.amountMoney,
+                        process: 5
+                    },
+                    success: function (data) {
+                        if (!data.error.length) {
+                            message.success('提交成功!');
+                            this.props.change(6);
+                        } else {
+                            if (isNaN(Number(data.error[0].message))) {
+                                message.warning(data.error[0].message);
+                            } else {
+                                switch (Number(data.error[0].message)) {
+                                    case 1:
+                                        message.warning("超过打款日期五日,无法确认提交!");
+                                        this.props.change(6);
+                                        break;
+                                    case 2:
+                                        message.warning("输入错误金额次数过多!");
+                                        this.props.change(6);
+                                        break;
+                                }
+                            };
+                        };
+                    }.bind(this),
+                }).always(function () {
                     this.setState({
                         loading: false
                     });
@@ -89,7 +100,7 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 18, offset: 4 }}>
                         <span>
-                            请在下方输入银行卡{this.state.bankCardNumber}收到的认证打款,
+                            请在下方输入{this.state.banks}银行卡{this.state.bankCardNumber}收到的认证打款,
                             务必在收到打款5日内完成,否则将无法完成
                         </span>
                     </FormItem>
@@ -97,7 +108,13 @@ const Content = Form.create()(React.createClass({
                         {...formItemLayout}
                         label="开户银行"
                     >
-                        <span>{this.state.bankAccount}</span>
+                        <span>{this.state.banks}</span>
+                    </FormItem>
+                    <FormItem
+                        {...formItemLayout}
+                        label="开户银行支行"
+                    >
+                        <span>{this.state.bankBranch}</span>
                     </FormItem>
                     <FormItem
                         {...formItemLayout}
@@ -108,7 +125,7 @@ const Content = Form.create()(React.createClass({
                     <FormItem
                         {...formItemLayout}
                         label="打款金额"
-                        extra={<span style={{ 'color': '#ea0862' }}><Icon type="exclamation-circle" /> 仅有3次输入机会,如3次输入有误,需更换银行卡重新认证</span>}
+                        extra={<span style={{ 'color': '#ea0862' }}><Icon type="exclamation-circle" /> 仅有3次输入机会,如3次输入有误,需重新认证</span>}
                     >
                         {getFieldDecorator('amountMoney', {
                             rules: [{ required: true, message: '请输入金额!' }]

+ 7 - 9
js/component/groupCertify/result.jsx

@@ -9,7 +9,6 @@ const Content = Form.create()(React.createClass({
     getInitialState() {
         return {
             loading: false,
-            auditStatus: 3
         };
     },
     handleSubmit() {
@@ -17,17 +16,16 @@ const Content = Form.create()(React.createClass({
             loading: true
         });
         $.ajax({
-            method: "POST",
+            method: "get",
             dataType: "json",
             crossDomain: false,
-            url: globalConfig.context + "/api/user/userNextPro",
+            url: globalConfig.context + "/api/user/identFailed",
             data: {
-                process: 4
             }
         }).done(function (data) {
             if (!data.error.length) {
-                message.success('保存成功!');
-                this.props.changeStep(5);
+                message.success('已提交重新审核!');
+                this.props.changeStep(1);
             } else {
                 message.warning(data.error[0].message);
             }
@@ -41,7 +39,7 @@ const Content = Form.create()(React.createClass({
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/api/user/userPro",
+            url: globalConfig.context + "/api/user/orgProcess",
             success: function (data) {
                 if (data.data) {
                     this.setState({
@@ -59,7 +57,7 @@ const Content = Form.create()(React.createClass({
             <Spin spinning={this.state.loading} className="certify-spin">
                 {(() => {
                     switch (this.state.auditStatus) {
-                        case 2:
+                        case 4:
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
@@ -70,7 +68,7 @@ const Content = Form.create()(React.createClass({
                                     <p>建议您下载数字证书,保障您的支付安全。</p>
                                 </div>
                             </div>;
-                        case 3:
+                        case 5:
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}