yee vor 7 Jahren
Ursprung
Commit
d2e372677e
30 geänderte Dateien mit 296 neuen und 301 gelöschten Zeilen
  1. 1 1
      js/component/NewDicProvinceList.js
  2. 1 1
      js/component/account/index/normal.jsx
  3. 1 1
      js/component/account/services/content.jsx
  4. 13 11
      js/component/account/set/edu.jsx
  5. 1 1
      js/component/account/set/tech.jsx
  6. 34 35
      js/component/certify/audit.jsx
  7. 9 8
      js/component/certify/bank.jsx
  8. 8 10
      js/component/certify/certify.less
  9. 5 4
      js/component/certify/content.jsx
  10. 3 1
      js/component/certify/personal.jsx
  11. 7 8
      js/component/certify/result.jsx
  12. 6 6
      js/component/dataDic.js
  13. 23 28
      js/component/groupCertify/audit.jsx
  14. 5 11
      js/component/groupCertify/bank.jsx
  15. 7 9
      js/component/groupCertify/certify.less
  16. 5 8
      js/component/groupCertify/confirm.jsx
  17. 5 4
      js/component/groupCertify/content.jsx
  18. 3 1
      js/component/groupCertify/personal.jsx
  19. 7 8
      js/component/groupCertify/result.jsx
  20. 4 4
      js/component/manageCenter/achievement/techAchievement.jsx
  21. 3 3
      js/component/manageCenter/demand/techDemand.jsx
  22. 1 1
      js/component/manageCenter/servicesManage/contract/contractAdd.jsx
  23. 4 4
      js/component/manageCenter/servicesManage/highTech/highTechInfo.jsx
  24. 7 4
      js/component/manageCenter/userManage/highTechSearch.jsx
  25. 2 3
      js/component/manageCenter/userManage/orgDesc.jsx
  26. 2 2
      js/component/manageCenter/userManage/userDesc.jsx
  27. 3 3
      js/component/portal/search/achievementDesc.jsx
  28. 1 1
      js/component/portal/search/demandDesc.jsx
  29. 124 119
      js/component/sign/groupAccount.jsx
  30. 1 1
      js/component/tools.js

+ 1 - 1
js/component/NewDicProvinceList.js

@@ -3351,7 +3351,7 @@ const addressList = [{
                     },
                     {
                         "id": 1107,
-                        "name": "口区"
+                        "name": "口区"
                     },
                     {
                         "id": 1108,

+ 1 - 1
js/component/account/index/normal.jsx

@@ -66,7 +66,7 @@ const Content = React.createClass({
             <Spin spinning={this.state.loading} className='spin-box'>
                 <div className="index-content">
                     <div className="index-userdata clearfix">
-                        <p className="acc-title">欢迎, No.<span>{this.state.number}</span>     </p>
+                        <p className="acc-title">欢迎, <span>{this.state.nickname || ('No.' + this.state.number)}</span>     </p>
                         <div className="userdata-img">
                             {this.state.personPortraitUrl || this.state.logoUrl ?
                                 <img src={globalConfig.avatarHost + "/upload" + (this.state.type == 0 ? this.state.personPortraitUrl : this.state.logoUrl)} alt="" />

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

@@ -7,7 +7,7 @@ const Content = React.createClass({
     getInitialState() {
         return {
             loading: false,
-            leftKey: 'contract',
+            leftKey: (window.userData.type == 1) ? 'contract' : 'evaluate',
             component: null,
             userType: '0',
             params: {}

+ 13 - 11
js/component/account/set/edu.jsx

@@ -67,17 +67,19 @@ const EduFrom = Form.create()(React.createClass({
                 if (data.error && data.error.length) {
                     message.warning(data.error[0].message);
                 } else {
-                    this.setState({
-                        id: data.data.id,
-                        edulvl: data.data.education,
-                        eduPfs: data.data.majorCategory ? data.data.majorCategory.split(',') : [],
-                        schoolname: data.data.graduateSchool,
-                        graduationTimeYear: data.data.graduationTimeYear,
-                        edunum: data.data.diplomaCode,
-                        degreenum: data.data.degreeCode,
-                        xueliPicUrl: data.data.diplomaUrl,
-                        xueweiPicUrl: data.data.degreeDiplomaUrl
-                    });
+                    if (data.data) {
+                        this.setState({
+                            id: data.data.id,
+                            edulvl: data.data.education,
+                            eduPfs: data.data.majorCategory ? data.data.majorCategory.split(',') : [],
+                            schoolname: data.data.graduateSchool,
+                            graduationTimeYear: data.data.graduationTimeYear,
+                            edunum: data.data.diplomaCode,
+                            degreenum: data.data.degreeCode,
+                            xueliPicUrl: data.data.diplomaUrl,
+                            xueweiPicUrl: data.data.degreeDiplomaUrl
+                        });
+                    };
                 };
             }.bind(this),
         }).always(function () {

+ 1 - 1
js/component/account/set/tech.jsx

@@ -53,7 +53,7 @@ const TechFrom = Form.create()(React.createClass({
                     data: {
                         "id": this.state.id,
                         "technicalPeopleNum": values.techpeople,
-                        "searchAreaCategory": values.techField.join(','),
+                        "searchAreaCategory": values.techField ? values.techField.join(',') : '',
                         "specialty": specialty
                     }
                 }).done(function (data) {

+ 34 - 35
js/component/certify/audit.jsx

@@ -35,34 +35,34 @@ const Content = Form.create()(React.createClass({
             }
         }.bind(this));
     },
-    loadDate(){
-        this.setState({
-                loading:true
-            });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/api/user/userPro",
-            success: function (data) {
-                if (data.data) {
-                    this.setState({
-                        bankCardNumber: data.data.bankCardNumber,
-                        auditStatus: data.data.auditStatus
-                    });
-                };
-            }.bind(this),
-        }).done(function (data) {
-            if (data.error && data.error.length) {
-                message.warning(data.error[0].message);
-            };
-            this.setState({
-                loading:false
-            });
-        }.bind(this));
-    },
-    componentWillMount() {
-        this.loadDate();
-    },
+    // loadDate(){
+    //     this.setState({
+    //             loading:true
+    //         });
+    //     $.ajax({
+    //         method: "get",
+    //         dataType: "json",
+    //         url: globalConfig.context + "/api/user/userPro",
+    //         success: function (data) {
+    //             if (data.data) {
+    //                 this.setState({
+    //                     bankCardNumber: data.data.bankCardNumber,
+    //                     auditStatus: data.data.auditStatus
+    //                 });
+    //             };
+    //         }.bind(this),
+    //     }).done(function (data) {
+    //         if (data.error && data.error.length) {
+    //             message.warning(data.error[0].message);
+    //         };
+    //         this.setState({
+    //             loading:false
+    //         });
+    //     }.bind(this));
+    // },
+    // componentWillMount() {
+    //     this.loadDate();
+    // },
     render() {
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;
@@ -79,18 +79,17 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 18, offset: 4 }}>
                         <span>
-                            认证系统将会在1-2个工作日内给您的银行卡{this.state.bankCardNumber}转入一笔1元以下的确认金额,
-                            然后在下方正确填写正确的金额数目。
-                            若打款成功,认证系统将会通过短信的方式通知您
+                            认证系统将会在1-2个工作日内审核您的认证信息,请您耐心等待!
                         </span>
                     </FormItem>
-                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        <Button disabled={this.state.auditStatus == "3" ? false : true} className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
-                    </FormItem>
                 </Form >
             </Spin >
         );
     },
 }));
 
-export default Content;
+export default Content;
+
+// <FormItem wrapperCol={{ span: 12, offset: 4 }}>
+//                         <Button disabled={this.state.auditStatus == "3" ? false : true} className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
+//                     </FormItem>

+ 9 - 8
js/component/certify/bank.jsx

@@ -112,7 +112,7 @@ const Content = Form.create()(React.createClass({
                         {getFieldDecorator('username')(
                             <span>{this.state.username}</span>
                         )}
-                        <a style={{ 'color': '#ea0862' }} onClick={_me.changeStep}>修改</a>
+                        <a style={{ 'color': '#ea0862', marginLeft: '20px' }} onClick={_me.changeStep}>修改</a>
                     </FormItem>
                     <FormItem
                         {...formItemLayout}
@@ -129,12 +129,6 @@ const Content = Form.create()(React.createClass({
                     <FormItem
                         {...formItemLayout}
                         label="银行卡号"
-                        extra={
-                            <span style={{ 'color': '#ea0862' }}>
-                                <Icon type="exclamation-circle" />
-                                认证系统会给该银行卡打入一笔1元以下的确认金额,您需要通过银行柜台并在
-                                步骤4输入该银行卡收到的阿凡提打款金额数目
-                            </span>}
                     >
                         {getFieldDecorator('bankCardNumber', {
                             initialValue: this.state.bankCardNumber || null,
@@ -154,4 +148,11 @@ const Content = Form.create()(React.createClass({
     },
 }));
 
-export default Content;
+export default Content;
+
+//  extra={
+//                             <span style={{ 'color': '#ea0862' }}>
+//                                 <Icon type="exclamation-circle" />
+//                                 认证系统会给该银行卡打入一笔1元以下的确认金额,您需要通过银行柜台并在
+//                                 步骤4输入该银行卡收到的阿凡提打款金额数目
+//                             </span>}

+ 8 - 10
js/component/certify/certify.less

@@ -52,9 +52,9 @@
                 }
             }
             .certify-content {
-                min-height: 600px;
+                min-height: 300px;
                 .certify-step {
-                    width: 1030px;
+                    width: 880px;
                     height: 60px;
                     margin: 40px auto;
                     border-radius: 8px;
@@ -235,14 +235,10 @@
                             margin: 20px auto;
                             width: 400px;
                             i {
-                                width: 40px;
-                                height: 40px;
-                                border-radius: 50%;
-                                background: #58a3ff;
-                                color: #fff;
+                                color: #58a3ff;
                                 text-align: center;
                                 line-height: 40px;
-                                font-size: 33px;
+                                font-size: 32px;
                                 position: absolute;
                                 top: 6px;
                                 left: 0;
@@ -273,8 +269,7 @@
                             top: -1px;
                             left: -1px;
                             height: 150px;
-                        }
-                        //
+                        } //
                         float: left;
                         margin-right: 20px;
                     }
@@ -287,6 +282,9 @@
                 }
             }
             .footer {
+                position: absolute;
+                width: 100%;
+                bottom: 0;
                 padding: 10px 0;
                 text-align: center;
                 background: #f0f0f0;

+ 5 - 4
js/component/certify/content.jsx

@@ -75,7 +75,8 @@ const Content = React.createClass({
                     step1Class: 'step-off',
                     step2Class: 'step-off',
                     step3Class: 'step-off',
-                    step4Class: 'step-off',
+                    //step4Class: 'step-off',
+                    step4Class: 'step-done',
                     step5Class: 'step-done',
                     step6Class: 'step-doing'
                 });
@@ -130,11 +131,11 @@ const Content = React.createClass({
                     <div className={this.state.step4Class}>
                         {this.state.stepNum > 4 ? <Icon type="check" /> : <i>4</i>}<div>信息审核</div>
                     </div>
-                    <div className={this.state.step5Class}>
+                    <div className={this.state.step5Class} style={{display:'none'}}>
                         {this.state.stepNum > 5 ? <Icon type="check" /> : <i>5</i>}<div><p>填写打入</p><p>卡内金额</p></div>
                     </div>
                     <div className={this.state.step6Class}>
-                        {this.state.stepNum > 6 ? <Icon type="check" /> : <i>6</i>}<div>认证结果</div>
+                        {this.state.stepNum > 6 ? <Icon type="check" /> : <i>5</i>}<div>认证结果</div>
                     </div>
                 </div>
                 <div className="certify-form-box">
@@ -148,7 +149,7 @@ const Content = React.createClass({
                                 return <Confirm changeStep={this.changeStep} />;
                             case 4:
                                 return <Audit changeStep={this.changeStep} />;
-                            case 5:
+                            case 99:
                                 return <Money changeStep={this.changeStep} />;
                             case 6:
                                 return <Result changeStep={this.changeStep} />;

+ 3 - 1
js/component/certify/personal.jsx

@@ -290,7 +290,9 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">下一步</Button>
-                        <Button className="exit" type="ghost">退出实名认证</Button>
+                        <Button className="exit" type="ghost" onClick={() => {
+                            window.location.href = globalConfig.context + '/user/account/index.html'
+                        }}>退出实名认证</Button>
                     </FormItem>
                 </Form >
             </Spin >

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

@@ -58,28 +58,27 @@ const Content = Form.create()(React.createClass({
             <Spin spinning={this.state.loading} className="certify-spin">
                 {(() => {
                     switch (this.state.auditStatus) {
-                        case 5:
+                        case '5':
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
-                                >输入的金额正确后,即时审核您填写的身份信息,请耐心等待2秒钟;如审核通过,认证申请成功</p>
+                                >审核通过,认证申请成功</p>
                                 <div className="certify-result-state">
-                                    <Icon type="check" />
+                                    <Icon type="check-circle-o" />
                                     <p>您已通过了实名认证</p>
                                 </div>
                             </div>;
-                        case 4:
+                        case '4':
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
-                                >若输入金额错误,则实名认证不通过。可重新申请实名认证。</p>
+                                >实名认证未通过。您可以可重新申请实名认证。</p>
                                 <div className="certify-result-state">
-                                    <Icon type="exclamation-circle" />
+                                    <Icon type="close-circle-o" />
                                     <p>您未能通过实名认证审核</p>
                                     <p>可能的原因是:</p>
                                     <p>您提交的认证资料不符合要求,未能通过实名认证;</p>
-                                    <p>您输入的金额有误,未能通过实名认证;</p>
-                                    <p>您未及时在规定的5天期限内输入金额,未能通过实名认证;</p>
+                                    <p>您输入的银行账户信息有误,未能通过实名认证;</p>
                                     <Button className="set-submit" type="primary" onClick={this.handleSubmit}>重新申请实名认证</Button>
                                 </div>
                             </div>;

+ 6 - 6
js/component/dataDic.js

@@ -117,12 +117,12 @@ module.exports = {
         },{
             value: "1",
             key: "提交审核"
-        },{
-            value: "2",
-            key: "审核未打款"
-        },{
-            value: "3",
-            key: "审核已打款"
+        // },{
+        //     value: "2",
+        //     key: "审核未打款"
+        // },{
+        //     value: "3",
+        //     key: "审核已打款"
         },{
             value: "4",
             key: "认证未通过"

+ 23 - 28
js/component/groupCertify/audit.jsx

@@ -36,28 +36,28 @@ const Content = Form.create()(React.createClass({
             });
         }.bind(this));
     },
-    componentWillMount() {
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/api/user/orgProcess",
-            success: function (data) {
-                if (data.data) {
-                    this.setState({
-                        bankCardNumber : data.data.bankCardNumber,
-                        auditStatus : data.data.auditStatus
-                    });
-                };
-            }.bind(this),
-        }).done(function (data) {
-            if (data.error.length) {
-                message.warning(data.error[0].message);
-            };
-            this.setState({
-                loading:false
-            });
-        }.bind(this));
-    },
+    // componentWillMount() {
+    //     $.ajax({
+    //         method: "get",
+    //         dataType: "json",
+    //         url: globalConfig.context + "/api/user/orgProcess",
+    //         success: function (data) {
+    //             if (data.data) {
+    //                 this.setState({
+    //                     bankCardNumber : data.data.bankCardNumber,
+    //                     auditStatus : data.data.auditStatus
+    //                 });
+    //             };
+    //         }.bind(this),
+    //     }).done(function (data) {
+    //         if (data.error.length) {
+    //             message.warning(data.error[0].message);
+    //         };
+    //         this.setState({
+    //             loading:false
+    //         });
+    //     }.bind(this));
+    // },
     render() {
         const FormItem = Form.Item;
         const { getFieldDecorator } = this.props.form;
@@ -74,14 +74,9 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 18, offset: 4 }}>
                         <span>
-                            认证系统将会在1-2个工作日内给您的银行卡{this.state.bankCardNumber}转入一笔1元以下的确认金额,
-                            然后在下方正确填写正确的金额数目。
-                            若打款成功,认证系统将会通过短信的方式通知您
+                            认证系统将会在1-2个工作日内审核您的认证信息,请您耐心等待!
                         </span>
                     </FormItem>
-                    <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        <Button disabled={this.state.auditStatus == "3" ? false : true } className="set-submit" type="primary" htmlType="submit">输入打款金额</Button>
-                    </FormItem>
                 </Form >
             </Spin >
         );

+ 5 - 11
js/component/groupCertify/bank.jsx

@@ -18,7 +18,8 @@ const Content = Form.create()(React.createClass({
             success: function (data) {
                 if (data.data) {
                     this.setState({
-                        contactMobile: data.data.contactMobile,
+                        firstContacts: data.data.firstContacts,
+                        firstMobile: data.data.firstMobile,
                         bankAccount: data.data.bankAccount,
                         address: [data.data.locationProvince, data.data.locationCity, data.data.locationArea],
                         banks: data.data.banks,
@@ -108,7 +109,7 @@ const Content = Form.create()(React.createClass({
                     <FormItem
                         {...formItemLayout}
                         label="银行开户名"
-                        extra={<span><Icon type="exclamation-circle" /> 必须使用以名称为开户名的银行卡进行认证</span>}
+                        extra={<span><Icon type="exclamation-circle" /> 必须使用以名称为开户名的银行卡进行认证</span>}
                     >
                         {getFieldDecorator('bankAccount', {
                             initialValue: this.state.bankAccount || null,
@@ -153,14 +154,7 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem
                         {...formItemLayout}
-                        label="银行卡号"
-                        extra={
-                            <span style={{ 'color': '#ea0862' }}>
-                                <Icon type="exclamation-circle" />
-                                认证系统会给该银行卡打入一笔1元以下的确认金额,您需要通过银行柜台并在
-                                步骤4输入该银行卡收到的阿凡提打款金额数目
-                            </span>}
-                    >
+                        label="银行卡号" >
                         {getFieldDecorator('bankCardNumber', {
                             initialValue: this.state.bankCardNumber || null,
                             rules: [{
@@ -180,7 +174,7 @@ const Content = Form.create()(React.createClass({
                             </span>}
                     >
                         {getFieldDecorator('contactMobile')(
-                            <span>{this.state.contactMobile}</span>
+                            <span>{this.state.firstContacts + ' ' + this.state.firstMobile}</span>
                         )}
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>

+ 7 - 9
js/component/groupCertify/certify.less

@@ -52,9 +52,9 @@
                 }
             }
             .certify-content {
-                min-height: 600px;
+                min-height: 300px;
                 .certify-step {
-                    width: 1030px;
+                    width: 880px;
                     height: 60px;
                     margin: 40px auto;
                     border-radius: 8px;
@@ -232,11 +232,7 @@
                             margin: 20px auto;
                             width: 400px;
                             i {
-                                width: 40px;
-                                height: 40px;
-                                border-radius: 50%;
-                                background: #58a3ff;
-                                color: #fff;
+                                color: #58a3ff;
                                 text-align: center;
                                 line-height: 40px;
                                 font-size: 33px;
@@ -270,8 +266,7 @@
                             top: -1px;
                             left: -1px;
                             height: 150px;
-                        }
-                        //
+                        } //
                         float: left;
                         margin-right: 20px;
                     }
@@ -284,6 +279,9 @@
                 }
             }
             .footer {
+                position: absolute;
+                width: 100%;
+                bottom: 0;
                 padding: 10px 0;
                 text-align: center;
                 background: #f0f0f0;

+ 5 - 8
js/component/groupCertify/confirm.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Input, Button, Form, Icon, Spin, message, } from 'antd';
 import './certify.less';
+import { newDownloadFile } from '../tools';
 import ajax from 'jquery/src/ajax/xhr.js'
 import $ from 'jquery/src/ajax';
 
@@ -23,7 +24,8 @@ const Content = Form.create()(React.createClass({
                         orgCode: data.data.orgCode,
                         orgCodeUrl: data.data.orgCodeUrl,
                         lastYearTaxReportUrl: data.data.lastYearTaxReportUrl,
-                        contactMobile: data.data.contactMobile,
+                        firstContacts: data.data.firstContacts,
+                        firstMobile: data.data.firstMobile,
                         bankAccount: data.data.bankAccount,
                         banks: data.data.banks,
                         bankBranch: data.data.bankBranch,
@@ -139,12 +141,7 @@ const Content = Form.create()(React.createClass({
                         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>
+                        <a onClick={newDownloadFile.bind(null, this.state.lastYearTaxReportId, "last_year_ratepay", "/api/admin/patent/downloadRatepay")}>上年度纳税报表</a>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <p className="certify-title">请确认银行卡信息</p>
@@ -177,7 +174,7 @@ const Content = Form.create()(React.createClass({
                         {...formItemLayout}
                         label="联系方式"
                     >
-                        <span>{this.state.contactMobile}</span>
+                        <span>{this.state.firstContacts + ' ' + this.state.firstMobile}</span>
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <p className="certify-title">请确认法人信息</p>

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

@@ -75,7 +75,8 @@ const Content = React.createClass({
                     step1Class: 'step-off',
                     step2Class: 'step-off',
                     step3Class: 'step-off',
-                    step4Class: 'step-off',
+                    //step4Class: 'step-off',
+                    step4Class: 'step-done',
                     step5Class: 'step-done',
                     step6Class: 'step-doing'
                 });
@@ -130,11 +131,11 @@ const Content = React.createClass({
                     <div className={this.state.step4Class}>
                         {this.state.stepNum > 4 ? <Icon type="check" /> : <i>4</i>}<div>信息审核</div>
                     </div>
-                    <div className={this.state.step5Class}>
+                    <div className={this.state.step5Class} style={{display:'none'}}>
                         {this.state.stepNum > 5 ? <Icon type="check" /> : <i>5</i>}<div><p>填写打入</p><p>卡内金额</p></div>
                     </div>
                     <div className={this.state.step6Class}>
-                        {this.state.stepNum > 6 ? <Icon type="check" /> : <i>6</i>}<div>认证结果</div>
+                        {this.state.stepNum > 6 ? <Icon type="check" /> : <i>5</i>}<div>认证结果</div>
                     </div>
                 </div>
                 <div className="certify-form-box">
@@ -148,7 +149,7 @@ const Content = React.createClass({
                                 return <Confirm changeStep={this.changeStep} />;
                             case 4:
                                 return <Audit changeStep={this.changeStep} />;
-                            case 5:
+                            case 99:
                                 return <Money changeStep={this.changeStep} />;
                             case 6:
                                 return <Result changeStep={this.changeStep} />;

+ 3 - 1
js/component/groupCertify/personal.jsx

@@ -479,7 +479,9 @@ const Content = Form.create()(React.createClass({
                     </FormItem>
                     <FormItem wrapperCol={{ span: 12, offset: 6 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">下一步</Button>
-                        <Button className="exit" type="ghost">退出实名认证</Button>
+                        <Button className="exit" type="ghost" onClick={() => {
+                            window.location.href = globalConfig.context + '/user/account/index.html'
+                        }}>退出实名认证</Button>
                     </FormItem>
                 </Form >
             </Spin >

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

@@ -62,28 +62,27 @@ const Content = Form.create()(React.createClass({
             <Spin spinning={this.state.loading} className="certify-spin">
                 {(() => {
                     switch (this.state.auditStatus) {
-                        case "5":
+                        case '5':
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
-                                >输入的金额正确后,即时审核您填写的身份信息,请耐心等待2秒钟;如审核通过,认证申请成功</p>
+                                >审核通过,认证申请成功</p>
                                 <div className="certify-result-state">
-                                    <Icon type="check" />
+                                    <Icon type="check-circle-o" />
                                     <p>您已通过了实名认证</p>
                                 </div>
                             </div>;
-                        case "4":
+                        case '4':
                             return <div className="certify-result-box">
                                 <p className="certify-title"
                                     style={{ 'textAlign': 'center' }}
-                                >若输入金额错误,则实名认证不通过。可重新申请实名认证。</p>
+                                >实名认证未通过。您可以可重新申请实名认证。</p>
                                 <div className="certify-result-state">
-                                    <Icon type="exclamation-circle" />
+                                    <Icon type="close-circle-o" />
                                     <p>您未能通过实名认证审核</p>
                                     <p>可能的原因是:</p>
                                     <p>您提交的认证资料不符合要求,未能通过实名认证;</p>
-                                    <p>您输入的金额有误,未能通过实名认证;</p>
-                                    <p>您未及时在规定的5天期限内输入金额,未能通过实名认证;</p>
+                                    <p>您输入的银行账户信息有误,未能通过实名认证;</p>
                                     <Button className="set-submit" type="primary" onClick={this.handleSubmit}>重新申请实名认证</Button>
                                 </div>
                             </div>;

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

@@ -48,7 +48,7 @@ const AchievementList = React.createClass({
                             dataCategory: thisdata.dataCategory,
                             name: thisdata.name,
                             keyword: thisdata.keyword,
-                            theName:thisdata.username || thisdata.ownerName,
+                            theName: thisdata.username || thisdata.ownerName,
                             category: thisdata.category,
                             ownerName: thisdata.username ? thisdata.username : thisdata.ownerName,
                             ownerType: thisdata.ownerType,
@@ -59,9 +59,9 @@ const AchievementList = React.createClass({
                             auditStatus: thisdata.auditStatus
                         });
                     };
-                }
-                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

+ 3 - 3
js/component/manageCenter/demand/techDemand.jsx

@@ -70,9 +70,9 @@ const DemandList = React.createClass({
                             auditStatus: thisdata.auditStatus
                         });
                     };
-                }
-                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

+ 1 - 1
js/component/manageCenter/servicesManage/contract/contractAdd.jsx

@@ -116,7 +116,7 @@ const ContractAddFrom = Form.create()(React.createClass({
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
             if (!err) {
-                if (!values.uid || !values.contacts) {
+                if (!(this.state.data.uid || values.uid) || !values.contacts) {
                     message.warning('请选择一个公司和联系人!');
                     return;
                 }

+ 4 - 4
js/component/manageCenter/servicesManage/highTech/highTechInfo.jsx

@@ -1,11 +1,11 @@
 import React from 'react';
 import { Icon, Button, Spin, message, Table } from 'antd';
 import {
-    getSearchUrl, getScaleState, getCompanyType,
-    getTechField, getIndustryType, getCatagory, getIntellectualObtainWay,
+    getSearchUrl, getScaleState, getCompanyType, getIndustryType, getCatagory, getIntellectualObtainWay,
     getTechnicalSource
 } from '../../../tools.js';
 import { getProvince } from '../../../NewDicProvinceList';
+import { getTechField } from '../../../DicTechFieldList';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -274,7 +274,7 @@ const highTechInfo = React.createClass({
                     techTotal: thisdata.techTotal,
                     listedDateFormattedDate: thisdata.listedDateFormattedDate,
                     registrationTimeFormattedDate: thisdata.registrationTimeFormattedDate,
-                    address: getProvince(thisdata.province, thisdata.city, thisdata.area),
+                    address: getProvince(thisdata.licenceProvince, thisdata.licenceCity, thisdata.licenceArea),
                     field: thisdata.field ? thisdata.field.split(',') : [],
                     registerType: thisdata.registerType ? thisdata.registerType.split(',') : []
                 });
@@ -1128,7 +1128,7 @@ const highTechInfo = React.createClass({
                         </div>
                         <div className="all-item">
                             <span className="item-title">技术领域</span>
-                            <span>{getTechField(Number(theData.field[0]), theData.field[1] ? Number(theData.field[1]) : null, theData.field[2] ? Number(theData.field[2]) : null)}</span>
+                            <span>{getTechField(theData.field[0], theData.field[1], theData.field[2])}</span>
                         </div>
                         <div className="clearfix">
                             <div className="half-item">

+ 7 - 4
js/component/manageCenter/userManage/highTechSearch.jsx

@@ -9,7 +9,7 @@ import { companySearch } from '../../tools';
 
 const HighTechSearch = React.createClass({
     loadData(pageNo) {
-        if (!this.state.searchUnitName && !this.state.province && !this.state.city && !this.state.searchYear) {
+        if (!this.state.searchName && !this.state.province && !this.state.city && !this.state.searchYear) {
             message.warning('请选择至少一个搜索条件!');
             return;
         };
@@ -22,8 +22,10 @@ const HighTechSearch = React.createClass({
             crossDomain: false,
             url: globalConfig.context + "/api/admin/cognizanceRecord/search",
             data: {
+                "pageNo": pageNo || 1,
+                "pageSize": this.state.pagination.pageSize,
                 "district": this.state.city || this.state.province,
-                "unitName": this.state.searchUnitName,
+                "unitName": this.state.searchName,
                 "year": this.state.searchYear
             },
             success: function (data) {
@@ -136,12 +138,13 @@ const HighTechSearch = React.createClass({
         this.loadData();
     },
     reset() {
+        this.state.pagination.total = 0;
         this.setState({
             city: undefined,
             province: undefined,
-            searchUnitName: undefined,
+            searchName: undefined,
             searchYear: undefined,
-            dataSource: []
+            dataSource: [],
         });
     },
     render() {

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

@@ -5,7 +5,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import { eduLevelList, auditStatusList, certifyStepList } from '../../dataDic.js'
-import { beforeUploadFile, getAuditState } from '../../tools.js';
+import { beforeUploadFile, getAuditState, newDownloadFile } from '../../tools.js';
 import { areaSelect, getProvince } from '../../NewDicProvinceList';
 import { getTechField, techFieldList } from '../../DicTechFieldList';
 
@@ -368,8 +368,7 @@ const OrgShow = Form.create()(React.createClass({
                             <div className="idcard-img clearfix">
                                 {this.state.lastYearTaxReportUrl ? <div>
                                     <div className="idcard-imgbox">
-                                        <img src={globalConfig.context + '/open/writeImage?path=' + this.state.lastYearTaxReportUrl} alt="点击查看大图"
-                                            onClick={(e) => { window.open(e.target.src) }} />
+                                        <a onClick={newDownloadFile.bind(null, this.state.lastYearTaxReportId, "last_year_ratepay", "/api/admin/patent/downloadRatepay")}>上年度纳税报表</a>
                                     </div>
                                 </div> : <div>
                                         <p><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传</p>

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

@@ -267,14 +267,14 @@ const UserShow = Form.create()(React.createClass({
                     {...formItemLayout}
                     label="是否专家" >
                     {getFieldDecorator('expert')(
-                        <span>{this.state.expert ? "否" : "是"}</span>
+                        <span>{this.state.expert == 1 ? "是" : "否"}</span>
                     )}
                 </FormItem>
                 <FormItem
                     {...formItemLayout}
                     label="是否明星" >
                     {getFieldDecorator('celebrity')(
-                        <span>{this.state.celebrity ? "否" : "是"}</span>
+                        <span>{this.state.celebrity == 1 ? "是" : "否"}</span>
                     )}
                 </FormItem>
                 <FormItem

+ 3 - 3
js/component/portal/search/achievementDesc.jsx

@@ -340,7 +340,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.maturityTextFileUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_maturity_text_file') }}>成熟度证明材料(文本文件)</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + theData.id + '&sign=achievement_maturity_text_file') }}>成熟度证明材料(文本文件)</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>
@@ -419,7 +419,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.techPlanUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_tech_plan') }}>技术方案</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + theData.id + '&sign=achievement_tech_plan') }}>技术方案</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>
@@ -429,7 +429,7 @@ const AchievementDetail = React.createClass({
                             <Col span={20}>
                                 {theData.businessPlanUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + this.props.data.id + '&sign=achievement_business_plan') }}>商业计划书</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/achievement/download?id=' + theData.id + '&sign=achievement_business_plan') }}>商业计划书</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>

+ 1 - 1
js/component/portal/search/demandDesc.jsx

@@ -314,7 +314,7 @@ const DemandDetail = React.createClass({
                             <Col span={20}>
                                 {theData.textFileUrl ?
                                     <span className="download-file">
-                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/demand/download?id=' + this.props.data.id + '&sign=demand_maturity_text_file') }}>需求文件(文本文件)</a>
+                                        <a onClick={() => { window.open(globalConfig.context + '/api/user/demand/download?id=' + theData.id + '&sign=demand_maturity_text_file') }}>需求文件(文本文件)</a>
                                     </span>
                                     : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}
                             </Col>

+ 124 - 119
js/component/sign/groupAccount.jsx

@@ -61,6 +61,9 @@ const Group = Form.create()(React.createClass({
     getMCode() {
         const _me = this;
         const form = this.props.form;
+        this.setState({
+            loading: true
+        });
         $.ajax({
             method: "get",
             dataType: "json",
@@ -162,125 +165,127 @@ const Group = Form.create()(React.createClass({
         };
         return (
             <div className="group clearfix">
-                <Form className="account-left" horizontal onSubmit={this.handleSubmit}>
-                    <FormItem
-                        {...formItemLayout}
-                        label="密码"
-                        extra={<span><Icon type="exclamation-circle" /> 建议字母、数字和符号两种以上组合,6-20个字符</span>}
-                        hasFeedback >
-                        {getFieldDecorator('password', {
-                            rules: [{
-                                required: true, message: '请输入密码!',
-                            }, {
-                                validator: this.checkConfirm,
-                            }],
-                        })(
-                            <Input type="password" onBlur={this.handlePasswordBlur} />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="确认密码"
-                        extra={<span><Icon type="exclamation-circle" /> 请再次输入密码</span>}
-                        hasFeedback
-                    >
-                        {getFieldDecorator('confirm', {
-                            rules: [{
-                                required: true, message: '请再次输入密码!',
-                            }, {
-                                validator: this.checkPassowrd,
-                            }],
-                        })(
-                            <Input type="password" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="手机号码"
-                        hasFeedback
-                        extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
-                    >
-                        {getFieldDecorator('phone', {
-                            rules: [{ required: true, message: '请输入手机号码!' }, {
-                                validator: this.checkPhone,
-                            }],
-                        })(
-                            <Input size="large" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="验证码"
-                        extra={<span className="redFont"><Icon type="exclamation-circle" /> 看不清?点击图片更换验证码</span>}
-                    >
-                        <Row gutter={8}>
-                            <Col span={16}>
-                                {getFieldDecorator('captcha', {
-                                    rules: [{ required: true, message: '请输入图片中的验证码' }],
-                                })(
-                                    <Input size="large" />
-                                    )}
-                            </Col>
-                            <Col span={8}>
-                                <div className="acc-getVcode">
-                                    <img id="VCode" src={this.state.vCodeUrl} alt="点击刷新验证码" onClick={this.reloadVCode} />
-                                </div>
-                            </Col>
-                        </Row>
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="手机验证码"
-                        extra={<span><Icon type="exclamation-circle" /> 点击获取后我们将发送验证码到上面手机号</span>}
-                    >
-                        <Row gutter={8}>
-                            <Col span={16}>
-                                {getFieldDecorator('phonecaptcha', {
-                                    rules: [{ required: true, message: '请输入手机获取到的验证码' }],
-                                })(
-                                    <Input size="large" />
-                                    )}
-                            </Col>
-                            <Col span={8}>
-                                <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>{this.state.mCodeText}</Button>
-                            </Col>
-                        </Row>
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="单位名称"
-                        hasFeedback
-                        extra={<span><Icon type="exclamation-circle" /> 请填写工商局注册的全称</span>}
-                    >
-                        {getFieldDecorator('company', {
-                            rules: [{ required: true, message: '请填写公司全称!' }],
-                        })(
-                            <Input size="large" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        {...formItemLayout}
-                        label="联系人"
-                        hasFeedback
-                    >
-                        {getFieldDecorator('user', {
-                            rules: [{ required: true, message: '请输入联系人姓名!' }],
-                        })(
-                            <Input size="large" />
-                            )}
-                    </FormItem>
-                    <FormItem {...tailFormItemLayout} style={{ marginBottom: 8 }}>
-                        {getFieldDecorator('agreement', {
-                            valuePropName: 'checked',
-                        })(
-                            <Checkbox>同意 <a onClick={() => { this.setState({ showDesc: true }); }}> 阿凡提会员服务协议条款</a></Checkbox>
-                            )}
-                    </FormItem>
-                    <FormItem {...tailFormItemLayout}>
-                        <Button type="primary" htmlType="submit" size="large">提 交</Button>
-                    </FormItem>
-                </Form>
-                <Modal showDesc={this.state.showDesc} closeModal={this.closeModal} />
+                <Spin spinning={this.state.loading} >
+                    <Form className="account-left" horizontal onSubmit={this.handleSubmit}>
+                        <FormItem
+                            {...formItemLayout}
+                            label="密码"
+                            extra={<span><Icon type="exclamation-circle" /> 建议字母、数字和符号两种以上组合,6-20个字符</span>}
+                            hasFeedback >
+                            {getFieldDecorator('password', {
+                                rules: [{
+                                    required: true, message: '请输入密码!',
+                                }, {
+                                    validator: this.checkConfirm,
+                                }],
+                            })(
+                                <Input type="password" onBlur={this.handlePasswordBlur} />
+                                )}
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="确认密码"
+                            extra={<span><Icon type="exclamation-circle" /> 请再次输入密码</span>}
+                            hasFeedback
+                        >
+                            {getFieldDecorator('confirm', {
+                                rules: [{
+                                    required: true, message: '请再次输入密码!',
+                                }, {
+                                    validator: this.checkPassowrd,
+                                }],
+                            })(
+                                <Input type="password" />
+                                )}
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="手机号码"
+                            hasFeedback
+                            extra={<span><Icon type="exclamation-circle" /> 请输入正确的手机号码</span>}
+                        >
+                            {getFieldDecorator('phone', {
+                                rules: [{ required: true, message: '请输入手机号码!' }, {
+                                    validator: this.checkPhone,
+                                }],
+                            })(
+                                <Input size="large" />
+                                )}
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="验证码"
+                            extra={<span className="redFont"><Icon type="exclamation-circle" /> 看不清?点击图片更换验证码</span>}
+                        >
+                            <Row gutter={8}>
+                                <Col span={16}>
+                                    {getFieldDecorator('captcha', {
+                                        rules: [{ required: true, message: '请输入图片中的验证码' }],
+                                    })(
+                                        <Input size="large" />
+                                        )}
+                                </Col>
+                                <Col span={8}>
+                                    <div className="acc-getVcode">
+                                        <img id="VCode" src={this.state.vCodeUrl} alt="点击刷新验证码" onClick={this.reloadVCode} />
+                                    </div>
+                                </Col>
+                            </Row>
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="手机验证码"
+                            extra={<span><Icon type="exclamation-circle" /> 点击获取后我们将发送验证码到上面手机号</span>}
+                        >
+                            <Row gutter={8}>
+                                <Col span={16}>
+                                    {getFieldDecorator('phonecaptcha', {
+                                        rules: [{ required: true, message: '请输入手机获取到的验证码' }],
+                                    })(
+                                        <Input size="large" />
+                                        )}
+                                </Col>
+                                <Col span={8}>
+                                    <Button size="large" onClick={this.getMCode} disabled={this.state.getCodeButton}>{this.state.mCodeText}</Button>
+                                </Col>
+                            </Row>
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="单位名称"
+                            hasFeedback
+                            extra={<span><Icon type="exclamation-circle" /> 请填写工商局注册的全称</span>}
+                        >
+                            {getFieldDecorator('company', {
+                                rules: [{ required: true, message: '请填写公司全称!' }],
+                            })(
+                                <Input size="large" />
+                                )}
+                        </FormItem>
+                        <FormItem
+                            {...formItemLayout}
+                            label="联系人"
+                            hasFeedback
+                        >
+                            {getFieldDecorator('user', {
+                                rules: [{ required: true, message: '请输入联系人姓名!' }],
+                            })(
+                                <Input size="large" />
+                                )}
+                        </FormItem>
+                        <FormItem {...tailFormItemLayout} style={{ marginBottom: 8 }}>
+                            {getFieldDecorator('agreement', {
+                                valuePropName: 'checked',
+                            })(
+                                <Checkbox>同意 <a onClick={() => { this.setState({ showDesc: true }); }}> 阿凡提会员服务协议条款</a></Checkbox>
+                                )}
+                        </FormItem>
+                        <FormItem {...tailFormItemLayout}>
+                            <Button type="primary" htmlType="submit" size="large">提 交</Button>
+                        </FormItem>
+                    </Form>
+                    <Modal showDesc={this.state.showDesc} closeModal={this.closeModal} />
+                </Spin>
             </div>
         );
     },

+ 1 - 1
js/component/tools.js

@@ -551,7 +551,7 @@ module.exports = {
     getIndustryType(e) {
         if (e) {
             let theType = '';
-            companyType.map(function (item) {
+            industryList.map(function (item) {
                 if (item.value == e) {
                     theType = item.key;
                 };