lvzhuo 3 years ago
parent
commit
c5c41974fd

+ 44 - 41
src/App.js

@@ -43,22 +43,25 @@ export default class App extends React.Component {
   //初始化执行
   componentDidMount() {
     let isSignout = localStorage.getItem('isSignout');  //获取退出时存储的数据,用于判断用户退出后是否刷新页面
+    // let obj = {   //默认信息
+    //   userName: '测试用户',
+    //   mallId: 2, //多商户所属商城id
+    //   merchantNo: 'com.smrongshengtianxia',//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+    //   merchantType: 2,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
+    //   Jur: 1,//用户权限
+    //   pages: '1-0'
+    // }
+
+    // let userData = obj
+    
     let userData = cookie.load('userInformation');// 获取上游跳转时带给的信息
-    // userData = JSON.parse(unescape(userData));
-    let obj = {   //默认信息
-      userName: '测试用户',
-      mallId: 2, //多商户所属商城id
-      merchantNo: 'com.rongshengtianxia',//入网的appname、社群name、商户号等(香香或者嘉旺提供)
-      merchantType: 2,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
-      Jur: 1,//用户权限
-      pages: '1-0'
+    // userData = JSON.parse(encodeURIComponent(userData));
+    this.autoLogin(userData) //跳转查询用户信息,验证用户是否入网
+    if(isSignout == 'yes' && userData == undefined){ //拦截是否为刷新页面
+      this.setState({
+        signout : true
+      })
     }
-    this.autoLogin(obj) //跳转查询用户信息,验证用户是否入网
-    // if(isSignout == 'yes' && userData == undefined){ //拦截是否为刷新页面
-    //   this.setState({
-    //     signout : true
-    //   })
-    // }
 
   }
   initJurisdiction() {//初始化用户权限
@@ -144,7 +147,7 @@ export default class App extends React.Component {
 
         let data = res.data.body;
         let type = data.status;
-        if (type !== 1) {
+        if (type !== 1 && type) {
           that_.setState({
             yc: true
           })
@@ -161,30 +164,30 @@ export default class App extends React.Component {
         } else {
           let s = data.status;
           if (s == undefined) {  //商户已入网
-            that_.setState({
-              arr1: [{ txt: '商户入网列表', icon: 'SlidersOutlined', assembly: 'center-tab' }],
-              assembly: 'center-tab'
-            });
-            if (e.pages == '1-0') {
+              that_.setState({
+                arr1: [{ txt: '商户入网列表', icon: 'SlidersOutlined', assembly: 'center-tab' }],
+                assembly: 'center-tab'
+              });
+              if (e.pages == '1-0') {
+                notification.open({
+                  message: '提示:',
+                  description:
+                    '当前用户已入网,自动跳转为账户概览',
+                  onClick: () => { },
+                });
+                e.pages = '2-0'
+              }
+            } else if (s == 1) {  //未入网
               notification.open({
                 message: '提示:',
                 description:
-                  '当前用户已入网,自动跳转为账户概览',
+                  '当前用户未入网,请您入网后在进行其他操作',
                 onClick: () => { },
               });
-              e.pages = '2-0'
-            }
-          } else if (s == 1) {  //未入网
-            notification.open({
-              message: '提示:',
-              description:
-                '当前用户未入网,请您入网后在进行其他操作',
-              onClick: () => { },
-            });
-            e.pages = '1-0'
-            that_.setState({
-              assembly: 'Layout'
-            });
+              e.pages = '1-0'
+              that_.setState({
+                assembly: 'Layout'
+              });
           }
           localStorage.setItem('userData', JSON.stringify(e)) //存储上游信息 到本地储存
           that_.initJurisdiction();  //初始化用户权限以及各种信息
@@ -213,13 +216,13 @@ export default class App extends React.Component {
       <React.Fragment>
         {
           yc == true && <div style={{ width: '100%', height: '100%' }}>
-          <Result
-            status="error"
-            title="您的账户存在异常情况,请联系管理员!"
-            subTitle="There are exceptions in your account, please contact the administrator."
-          // extra={}
-          />
-        </div>
+            <Result
+              status="error"
+              title="您的账户存在异常情况,请联系管理员!"
+              subTitle="There are exceptions in your account, please contact the administrator."
+            // extra={}
+            />
+          </div>
         }
         {
           signout == true && <div style={{ width: '100%', height: '100%' }}>

+ 2 - 2
src/common/publish.js

@@ -52,11 +52,11 @@ Date.prototype.formats = function (fmt) {
 export function $Axios (method,urls, param, fn, err) {
     let url;
     // if(process.env.NODE_ENV === 'development'){ 
-    //     url = 'http://paytest.zhongsou.com'//开发测试环境API
+        url = 'http://paytest.zhongsou.com'//开发测试环境API
     // }else{  
     //     url = 'http://pay.zhongsou.com' //生产线上环境API
     // }
-    url = 'http://paytest.zhongsou.com'//开发测试环境API
+    // url = 'http://192.168.31.17:8816'//开发测试环境API
 	let methods = method.trim()
 	let obj = {
 		method: methods, //请求方式

+ 6 - 3
src/component/Account-overview/Account-overview.jsx

@@ -85,10 +85,12 @@ export default class AccountOverview extends React.Component {
                 let data = res.data.body;
                 let yestdayTrade = res.data.body.yestdayTrade; //昨日收支
                 let preMonthTrade = res.data.body.preMonthTrade;//上月收支
+                let parentAppName = res.data.body.parentAppName
                 that_.setState({
                     data: data,
                     yestdayTrade: yestdayTrade,
-                    preMonthTrade: preMonthTrade
+                    preMonthTrade: preMonthTrade,
+                    parentAppName : parentAppName
                 })
             }
         })
@@ -119,10 +121,10 @@ export default class AccountOverview extends React.Component {
                         let url = '/payment/merchant.pwd.update.groovy'
                         let params = {
                             id: this.state.data.id,//商户id
+                            pfAppName : this.state.parentAppName,// 新增参数
                             pwd: document.getElementById("pwd").value,//密码
                             mobile: this.state.data.contactPhone,//手机号
                             code: document.getElementById("num1").value,//验证码
-                            pfAppName: JSON.parse(localStorage.getItem('userData')).pfAppName, //包名
                         }
                         $Axios('get', url, params, (res) => {
                             let status = res.data.head.status;
@@ -156,6 +158,7 @@ export default class AccountOverview extends React.Component {
             mobile: this.state.data.contactPhone,//手机号
             // mobile : 17600982892,//手机号
             pfAppName: JSON.parse(localStorage.getItem('userData')).pfAppName,//包名
+            pfAppName : this.state.parentAppName,// 新增参数
             eventType: 51
         }
         $AxiosGet('get', url, Params, (res) => {
@@ -327,7 +330,7 @@ export default class AccountOverview extends React.Component {
                     <div>
                         <div className='c-ls'>
                             <div className='titles_tk'>手机号 :</div>
-                            <div className='titles_num'><Input id='orderNo' disabled={true} defaultValue={data.contactPhone == '' ? 17600982892 : data.contactPhone} /></div>
+                            <div className='titles_num'><Input id='orderNo' disabled={true} defaultValue={data.contactPhone == '' ? '未获取到手机号' : data.contactPhone} /></div>
                             {t == '' && <Button key="submit" type="primary" onClick={this.handleOk_yzm.bind(this)}>
                                 获取验证码
                             </Button>}

+ 14 - 34
src/component/Finance-orderQuery/Finance-orderQuery.jsx

@@ -117,6 +117,7 @@ export default class FinanceoRderQuery extends React.Component {
                     title: '分账金额',
                     dataIndex: 'amount',
                     key: 'amount',
+                    render: (text, record, index) => <span>{record.amount}({record.amountType})</span>,
                 },
                 {
                     title: '分账状态',
@@ -286,8 +287,9 @@ export default class FinanceoRderQuery extends React.Component {
         this.state.params.endTime = this.state.endTime
         $Axios('get', url, params, (res) => {
             let status = res.data.head.status;
-            if (status == 200) {
-                let data = res.data.body.list;
+            let data = res.data.body.list;
+            console.log(data)
+            if (status == 200 && data !== undefined) {
                 let arr = [];
                 data.map((item, index) => {
                     let obj = {
@@ -315,37 +317,15 @@ export default class FinanceoRderQuery extends React.Component {
                     total: total,  //数据的总的条数
                     lodings: false
                 })
+            }else{
+                that_.setState({
+                    lodings: false
+                })
             }
 
         })
     }
 
-
-    // orderStatus(e) {
-    //     let txt = '';
-    //     switch (e) {
-    //         case 1:
-    //             txt = "未付款";
-    //             break;
-    //         case 2:
-    //             txt = "已付待入账";
-    //             break;
-    //         case 3:
-    //             txt = "已付已入账";
-    //             break;
-    //         case 4:
-    //             txt = "支付失败";
-    //             break;
-    //         case 5:
-    //             txt = "部分退款";
-    //             break;
-    //         case 6:
-    //             txt = "全部退款";
-    //             break;
-    //     }
-    //     return txt
-    // }
-
     render() {
         const { data, columns, headTxt, keys, keye, select_data, timeType, paginationProps, isModalVisible, columns_tk, payOrderInfo, orderSplitInfo, orderNo, lodings, tklodings, tablesW, tablesH } = this.state;
         const { Option } = Select;
@@ -434,12 +414,12 @@ export default class FinanceoRderQuery extends React.Component {
                         tklodings == true && <div>
                             <div>
                                 <p style={{ fontSize: '16px', fontWeight: '600' }}>订单信息</p>
-                                <p>商户订单号 : {orderNo}</p>
-                                <p>订单金额 : {payOrderInfo.totalAmount}</p>
-                                <p>支付金额 : {payOrderInfo.cash}</p>
-                                <p>联盟积分 : {payOrderInfo.stbPrice}</p>
-                                <p>积分币金额 : {payOrderInfo.benbiPrice}</p>
-                                <p>付款人 : {payOrderInfo.nickname}</p>
+                                <p><span className={StyleData.spans}>商户订单号 :</span> {orderNo}</p>
+                                <p><span className={StyleData.spans}>付款人 :</span> {payOrderInfo.nickname}</p>
+                                <p><span className={StyleData.spans}>订单金额 :</span> {payOrderInfo.totalAmount}</p>
+                                <p><span className={StyleData.spans}>支付金额 :</span> {payOrderInfo.cash}</p>
+                                <p><spam className={StyleData.spans}>联盟积分 :</spam> {payOrderInfo.stbPrice}</p>
+                                <p><span className={StyleData.spans}>积分币金额 :</span> {payOrderInfo.benbiPrice}</p>
                             </div>
                             <div className={StyleData.tabDiv}>
                                 <p style={{ fontSize: '16px', fontWeight: '600' }}>订单金额流向信息</p>

+ 5 - 0
src/component/Finance-orderQuery/Finance.module.scss

@@ -38,4 +38,9 @@
 .tabDiv{
     width: 100%;
     height: 300px;
+}
+.spans{
+    display: inline-block;
+    width: 100px;
+    text-align: right;
 }

+ 24 - 6
src/component/Income-record/Income-record.jsx

@@ -65,7 +65,8 @@ export default class IncomeRecord extends React.Component {
                 onChange: (current) => this.changePage(current), //点击当前页码
             },
             lodings : null,
-            shdata : ''
+            shdata : '',
+            staType : 0
         }
         
     }
@@ -122,6 +123,7 @@ export default class IncomeRecord extends React.Component {
             merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
             merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
             ownerName:document.getElementById("fzsh").value,//关联分账商户
+            inOutType : this.state.staType,//分账类型
             status: this.state.status,//分账状态,1:分账成功2:分账中3:分账撤回
             createTimeStart : '',//创建开始时间
             createTimeEnd : '',//创建结束时间
@@ -149,8 +151,8 @@ export default class IncomeRecord extends React.Component {
         }
         $Axios('get',url,params,(res) => {
             let status = res.data.head.status;
-            if(status == 200){
-                let data = res.data.body.list;
+            let data = res.data.body.list;
+            if(status == 200 && data !== undefined){
                 let arr = [];
                 data.map((item,index) => {
                     let obj = {
@@ -173,9 +175,19 @@ export default class IncomeRecord extends React.Component {
                     total: total,  //数据的总的条数
                     lodings : false
                 })
+            }else{
+                that_.setState({
+                    lodings : false
+                })
             }
         })
     }
+
+    handleChange_1(e){
+        this.setState({
+            staType : e
+        })
+    }
     
     handleChange_2(e) {  //分账状态
         this.setState({
@@ -238,15 +250,21 @@ export default class IncomeRecord extends React.Component {
                </div>
                <div className='query_table_l' style={{height:'60px'}}>
                    <div className='btm_div' style={{height:'100%',lineHeight:'60px',paddingLeft:'20px'}}>
+                        <div style={{display : 'inline-block',}}> 分账类型 : </div>
+                        <Select size='default' placeholder="请选择分账类型"  onChange={ this.handleChange_1.bind(this) } style={{ width: 150,marginRight:'20px' }}>
+                            <Option key={1} value={0}>全部</Option>
+                            <Option key={2} value={2}>供货结算</Option>
+                            <Option key={3} value={3}>商品分账</Option>
+                        </Select>
                         <div style={{display : 'inline-block',}}> 关联分账商户 : </div>
-                        <Input id='fzsh' style={{width:'200px',marginRight:'20px'}}  placeholder="请输入分账商户"/>
+                        <Input id='fzsh' style={{width:'130px',marginRight:'20px'}}  placeholder="请输入分账商户"/>
                         <div style={{display : 'inline-block',}}> 分账状态 : </div>
-                        <Select size='default' placeholder="请选择分账状态"  onChange={ this.handleChange_2.bind(this) } style={{ width: 200,marginRight:'20px' }}>
+                        <Select size='default' placeholder="请选择分账状态"  onChange={ this.handleChange_2.bind(this) } style={{ width: 150,marginRight:'20px' }}>
                             <Option key={1} value={1}>分账中</Option>
                             <Option key={2} value={2}>分账成功</Option>
                             <Option key={3} value={3}>分账撤回</Option>
                         </Select>
-                        <Select size='default' placeholder="请选择时间类型"  onChange={this.handleChange_5.bind(this)} style={{ width: 200,marginRight:'20px' }}>
+                        <Select size='default' placeholder="请选择时间类型"  onChange={this.handleChange_5.bind(this)} style={{ width: 150,marginRight:'20px' }}>
                             <Option key={0} value={0}>不限时间类型</Option>
                             <Option key={1} value={1}>创建时间</Option>
                             <Option key={2} value={2}>到账完成时间</Option>

+ 109 - 19
src/component/Layout/Layout.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Button, message, Spin , Alert  } from 'antd';
+import { Button, message, Spin , Alert , Modal  } from 'antd';
 import { $Axios } from '../../common/publish';
 import '../Layout/Layout.scss'
 import styleData from '../moduleCss/style.module.scss';
@@ -19,7 +19,9 @@ export default class Layout extends React.Component {
             signedType: '',
             lodings : true,
             btnType : '',
-            registerRole :''
+            registerRole :'',
+            isModalVisible: false,
+            modalTxt : ''
         }
 
     }
@@ -30,7 +32,7 @@ export default class Layout extends React.Component {
     }
 
     handleChange(value) {
-        console.log(`Selected: ${value}`);
+
     }
     bindRef_o = ref => { this.CenterO = ref }
     bindRef_w = ref => { this.CenterW = ref }
@@ -90,6 +92,11 @@ export default class Layout extends React.Component {
                 flag = false
                 return flag
             };
+            if (data.businessAddress == '') {
+                this.messageTK('请输入经营地址')
+                flag = false
+                return flag
+            };
             if(data.desireAuth == 'DESIRE_MOBILEINFO'){
                 if (data.legalPersonName == '') {
                     this.messageTK('请输入法人姓名')
@@ -168,11 +175,30 @@ export default class Layout extends React.Component {
                 flag = false
                 return flag
             };
+            if (data.businessLicensePath == '') {
+                this.messageTK('请上传营业执照照片')
+                flag = false
+                return flag
+            };
+            if (data.openAccountPath == '') {
+                this.messageTK('请上传开户许可证照片')
+                flag = false
+                return flag
+            };
+            if (data.holdingIdCardPath == '') {
+                this.messageTK('请上传法人手持证件照片')
+                flag = false
+                return flag
+            };
+            if (data.legalPersonBankCardPath == '') {
+                this.messageTK('请上传法人银行卡照片')
+                flag = false
+                return flag
+            };
             return flag
 
         } else if (e == 3) {
             data = JSON.parse(localStorage.getItem('sData'));
-            console.log(data)
             if (data.accountName == '') {
                 this.messageTK('请输入开户名称')
                 flag = false
@@ -236,7 +262,6 @@ export default class Layout extends React.Component {
         let that_ = this;
         that_.setState({lodings : true});
         that_.CenterO.childMethod()  //第一页跳第二页保存第一页数据
-        // let flag = true
         let flag = that_.Validation_data(1);//验证第一页数据 所有必填项是否获得数据
         if(flag == false){
             that_.setState({lodings : false})
@@ -354,12 +379,15 @@ export default class Layout extends React.Component {
         let merchantType = JSON.parse(localStorage.getItem('userData')).merchantType;
         let merchantNo = JSON.parse(localStorage.getItem('userData')).merchantNo;
         let mallId = JSON.parse(localStorage.getItem('userData')).mallId; //上游提供
+        let odata = localStorage.getItem('oData');
+        let wdata = localStorage.getItem('wData');
+        let sdata = localStorage.getItem('sData');
         let that_ = this;
         let url = '/payment/merchant.declaration.groovy'
         let params = {
             operationType: 'CREATE', // :1:CREATE创建即入网,2:MODIFY更新即修改(审核通过前)
             name: JSON.parse(localStorage.getItem('userData')).userName,
-            appName: merchantNo,
+            appName: merchantType == 2 ? merchantNo : '',
             parentAppName: merchantType == 2 ? mallId : '',
             mallId: merchantType == 3 ? mallId : '',
             merchantNo: merchantNo,//上游提供
@@ -368,17 +396,17 @@ export default class Layout extends React.Component {
                 requestId: '', //订单号为商户自行拟定,提交的订单号必须在自身平台交易中唯一。商户平台不能以相同的订单号再次提交。
                 operationType: 'CREATE', // :1:CREATE创建即入网,2:MODIFY更新即修改(审核通过前)
                 notifyUrl: '',//服务器通知:当订单状态发生变更后会向该地址发送五次通知,该地址可以带参数,如:“https://www.5upay.com/callback.action?test=test”.注意:如不填notifyUrl的参数值成功后您的服务器将得不到通知。
-                extendedParameters: {//autoReview 是否跳过流程 TRUE 是, FALSE 否 sendActiveEmail 是否发送激活邮件 TRUE 是, FALSE 否 (这两项参数传递用”,”隔开,示例:autoReview:FALSE,sendActiveEmail:TRUE)
-                    autoReview: false, sendActiveEmail: true
-                },
-                baseInfo: this.state.Params_o,
-                bankCardInfo : this.state.Params_S,
+                extendedParameters: //autoReview 是否跳过流程 TRUE 是, FALSE 否 sendActiveEmail 是否发送激活邮件 TRUE 是, FALSE 否 (这两项参数传递用”,”隔开,示例:autoReview:FALSE,sendActiveEmail:TRUE)
+                    'autoReview: FALSE,sendActiveEmail: TRUE'
+                ,
+                baseInfo: JSON.parse(odata),
+                bankCardInfo : JSON.parse(sdata),
                 desireAuthInfo :{
-                    legalPersonName : this.state.Params_o.legalPersonName,
-                    legalPersonIdNo : this.state.Params_o.legalPersonIdNo,
-                    legalPersonPhoneNo : this.state.Params_o.legalPersonPhoneNo
+                    legalPersonName : odata.legalPersonName,
+                    legalPersonIdNo : odata.legalPersonIdNo,
+                    legalPersonPhoneNo : odata.legalPersonPhoneNo
                 },
-                certificateInfo : this.state.Params_w,
+                certificateInfo : JSON.parse(wdata),
                 certificateContacts : '',
                 contractInfo : '',
                 paymentProfiles : '',
@@ -387,17 +415,61 @@ export default class Layout extends React.Component {
                 // Object.assign(, this.state.Params_w, this.state.Params_S),
             }
         }
-        $Axios('get', url, params, (res) => {
-            console.log(res)
-            that_.setState({lodings : false});
+        let contactName = JSON.parse(odata).contactName;
+        let legalPersonName = JSON.parse(odata).legalPersonName;
+        let legalPersonName_2 = JSON.parse(wdata).legalPersonName;
+        let accountName = JSON.parse(sdata).accountName;
+        if(contactName == legalPersonName){
+            if(contactName == legalPersonName_2){
+                if(contactName == accountName){
+                    $Axios('get', url, params, (res) => {
+                        let data = res.data.body.msg;
+                        if(data == '请求成功'){
+                            that_.setState({
+                                isModalVisibleImg : true,
+                                modalTxt : '申请已提交,请等待审核。'
+                            })
+                            that_.countDown('申请已提交,请等待审核。')
+                        }else{
+                            that_.setState({
+                                isModalVisibleImg : true,
+                                modalTxt : data
+                            })
+                            that_.countDown(data)
+                        }
+                        that_.setState({lodings : false});
+                    })
+                }else{
+                    that_.messageTK('联系人姓名需与结算信息内开户名称一致')
+                }
+            }else{
+                that_.messageTK('联系人姓名需与资质信息内法人姓名一致')
+            }
+        }else{
+            that_.messageTK('联系人姓名需与基本信息内法人姓名一致')
+        }
+       
+    }
 
+    handleOk_c(){  //关闭弹框
+        this.setState({
+            isModalVisibleImg : false,
         })
     }
 
+    countDown (e) {
+        let secondsToGo = 5;
+        const modal = Modal.success({
+          title: e,
+        });
+        setTimeout(() => {
+          modal.destroy();
+        }, secondsToGo * 1000);
+      }
 
 
     render() {
-        const { headTxt, htmls , lodings , btnType } = this.state;
+        const { headTxt, htmls , lodings , btnType ,isModalVisibleImg , modalTxt } = this.state;
         return (
             <div className={styleData.rootDom}>
                 <div className={styleData.header_center}>
@@ -427,6 +499,24 @@ export default class Layout extends React.Component {
                         {htmls === 3 && lodings == false &&  <Button className={styleData.btn, styleData.btn_next} type="primary" onClick={() => this.btnClick('ok')} loading={btnType}>提交</Button>}
                     </div>
                 </div>
+                {/* <Modal title="入网结果"
+                    footer={[]}
+                    visible={isModalVisibleImg}
+                    closable={true}
+                    onCancel={this.handleOk_c.bind(this)}
+                >
+                        <div style={{
+                            width: '95%',
+                            height: '200px',
+                            textAlign : 'center',
+                            fontSize : '20px',
+                            color : '#ccc',
+                            lineHeight : '200px',
+                            overflow:'auto'
+                        }}>
+                             {modalTxt}
+                        </div>
+                </Modal> */}
             </div>
         )
     }

+ 2 - 3
src/component/Refund-inquiry/Refund-inquiry.jsx

@@ -141,8 +141,8 @@ export default class RefundInquiry extends React.Component {
         this.state.params.userName = userName;
         $Axios('get', url, params, (res) => {
             let status = res.data.head.status;
-            if (status == 200) {
-                let data = res.data.body.list;
+            let data = res.data.body.list;
+            if (status == 200 && data !== undefined) {
                 let arr = [];
                 data.map((item, index) => {
                     let obj = {
@@ -170,7 +170,6 @@ export default class RefundInquiry extends React.Component {
                     lodings: false
                 })
             } else {
-                message.info(res.data.body);
                 that_.setState({
                     data: [],
                     total: 0,  //数据的总的条数

+ 6 - 2
src/component/Withdrawal-record/Withdrawal-record.jsx

@@ -128,8 +128,8 @@ export default class WithdrawalRecord extends React.Component {
         }
         $Axios('get', url, params, (res) => {
             let status = res.data.head.status;
-            if (status == 200) {
-                let data = res.data.body.list;
+            let data = res.data.body.list;
+            if (status == 200 && data !== undefined) {
                 let arr = [];
                 data.map((item, index) => {
                     let obj = {
@@ -154,6 +154,10 @@ export default class WithdrawalRecord extends React.Component {
                     total: total,  //数据的总的条数
                     lodings: false
                 })
+            }else{
+                that_.setState({
+                    lodings: false
+                })
             }
         })
     }

+ 3 - 3
src/component/center-o/centerO.jsx

@@ -239,7 +239,7 @@ export default class centerO extends React.Component {
                         </Select>
                     </div>
                     <div className='c-x'>
-                        <div className='titles_txt'> 经营地址 : </div>
+                        <div className='titles_txt'> 经营地址<i className='label_x'>*</i>  : </div>
                         <div className='TextAreas'>
                             <TextArea id='mywb' style={{ resize: 'none' }} defaultValue={Params.businessAddress} rows={6} />
                         </div>
@@ -269,11 +269,11 @@ export default class centerO extends React.Component {
                             </div>
                             <div className='c-l'>
                                 <div className='titles_o'> 法人身份证号<i className='label_x'>*</i> : </div>
-                                <div className='inputs'><Input id='myname2' placeholder="请输入法人身份证号" defaultValue={Params.contactName} /></div>
+                                <div className='inputs'><Input id='myname2' placeholder="请输入法人身份证号" defaultValue={Params.legalPersonIdNo} /></div>
                             </div>
                             <div className='c-l'>
                                 <div className='titles_o'> 法人手机号<i className='label_x'>*</i> : </div>
-                                <div className='inputs'><Input id='myname3' placeholder="请输入法人手机号" defaultValue={Params.contactName} /></div>
+                                <div className='inputs'><Input id='myname3' placeholder="请输入法人手机号" defaultValue={Params.legalPersonPhoneNo} /></div>
                             </div>
                         </div>
                     }

+ 6 - 4
src/component/center-s/centerS.jsx

@@ -40,7 +40,7 @@ export default class centerS extends React.Component {
 
     initData(){
         if(this.props.arr){  //初始化判断数据回填
-            if(this.state.Params.provinceCode !== undefined){ // 判断回填数据内是否有省编码
+            if(this.state.Params.provinceCode !== undefined && this.state.Params.provinceCode !== ''){ // 判断回填数据内是否有省编码
                 let Province = this.state.Params.provinceCode; //获取省编码
                 let data = this.state.selectData.Area;  //拿到省数据组
                 let cityList = data.find((item,index) => { return Province == item.provinceCode}); //抽取省编码内下的城市列表数据
@@ -48,6 +48,8 @@ export default class centerS extends React.Component {
                     cityOs : false,
                     citylist : cityList.mallCityList,
                 })
+            }else{
+
             }
         }
     }
@@ -137,7 +139,7 @@ export default class centerS extends React.Component {
                     </div>
                     <div className='c-l'>
                         <div className='titles'> 省编码<i className='label_x'>*</i> : </div>
-                        <Select size='default' placeholder="请选择省编码" defaultValue={Params.provinceCode}  onChange={ this.selectChange_2.bind(this) } style={{ width: 200 }}>
+                        <Select size='default' placeholder="请选择省编码" defaultValue={Params.provinceCode}   onChange={ this.selectChange_2.bind(this) } style={{ width: 200 }}>
                                             {selectData.Area.map((item,index) => (
                                                 <Option key={index} value={item.provinceCode}>{item.provinceName}-{item.provinceCode}</Option>
                                             ))}
@@ -160,8 +162,8 @@ export default class centerS extends React.Component {
                     </div>
                     <div className='c-l'>
                         <div className='titles'> 清算方式 : </div>
-                        <Radio.Group name="radiogroup" defaultValue={1}>
-                                            <Radio value={1}>提现</Radio>
+                        <Radio.Group name="radiogroup" defaultValue='WITHDRAW'>
+                                            <Radio value='WITHDRAW'>提现</Radio>
                                         </Radio.Group>
                     </div>
                     <div className='c-l'>

+ 0 - 4
src/component/center-tab/center-tab.jsx

@@ -202,14 +202,12 @@ export default class centerTab extends React.Component {
                     })
                 });
             }else{
-                console.log(123)
                 let txt = res.data.body.msg
                 that_.setState({
                     isModalVisible: true,
                 })
                 message.error(txt);
             }
-            console.log(status)
 
         })
 
@@ -222,7 +220,6 @@ export default class centerTab extends React.Component {
     }
 
     bankCode(e){ //开户行反查
-        console.log(e)
         let s;
         if(e !== '' && e !== undefined){
             s = this.state.select_data.contractS.find((item, index) => { return e == item.value }).txt;
@@ -366,7 +363,6 @@ export default class centerTab extends React.Component {
         this.setState({
             isModalVisibleImg : true
         })
-        console.log(url)
     }
     handleOk_img(){
         this.setState({

+ 28 - 15
src/component/center-w/centerW.jsx

@@ -48,9 +48,10 @@ export default class centerW extends React.Component {
     componentDidMount() {
         this.props.onRef(this);
         let signedType = JSON.parse(localStorage.getItem('oData')).signedType;
+        localStorage.setItem('rightArray',JSON.stringify(select_data.rightArray))
         this.setState({
-            signedType: signedType
-        })
+            signedType: signedType,
+        });
     }
 
     toParent = (data) => {
@@ -76,18 +77,18 @@ export default class centerW extends React.Component {
             appName: document.getElementById("appName").value,//APP名称
             wechatAppletName: document.getElementById("wechatAppletName").value,//公众号/小程序/生活号
             testAccountInfo: '',//测试账户信息
-            businessLicensePath: this.state.Params.businessLicensePath,//营业执照照片路径
-            openAccountPath: this.state.Params.openAccountPath,//开户许可证照片路径
-            legalIdCardProsPath: this.state.Params.legalIdCardProsPath,//法人证件人像面路径
-            legalIdCardConsPath: this.state.Params.legalIdCardConsPath,//法人证件国徽面路径
-            desireAuthPath: this.state.Params.desireAuthPath,//确认入网意愿视频路径
-            holdingIdCardPath: this.state.Params.holdingIdCardPath,//法人手持证件影印件路径
-            webSitePath: this.state.Params.webSitePath,//商户网址截图影印件路径
-            wechatAppletPath: this.state.Params.wechatAppletPath,//公众号/小程序/生活号业务流程截图影印件路径	
-            appPath: this.state.Params.appPath,//APP首页截图影印件路径
-            legalPersonBankCardPath: this.state.Params.legalPersonBankCardPath,//法人银行卡图影印件路径
-            desireAuthOtherPath: this.state.Params.desireAuthOtherPath,//确认入网意愿其他验证方式路径
-            otherCerPath: this.state.Params.otherCerPath,//其他资质文件路径
+            businessLicensePath: this.state.Params.businessLicensePath == undefined ? '' : this.state.Params.businessLicensePath,//营业执照照片路径
+            openAccountPath: this.state.Params.openAccountPath == undefined ? '' : this.state.Params.openAccountPath,//开户许可证照片路径
+            legalIdCardProsPath: this.state.Params.legalIdCardProsPath == undefined ? '' : this.state.Params.legalIdCardProsPath,//法人证件人像面路径
+            legalIdCardConsPath: this.state.Params.legalIdCardConsPath == undefined ? '' : this.state.Params.legalIdCardConsPath,//法人证件国徽面路径
+            desireAuthPath: this.state.Params.desireAuthPath == undefined ? '' : this.state.Params.desireAuthPath,//确认入网意愿视频路径
+            holdingIdCardPath: this.state.Params.holdingIdCardPath == undefined ? '' : this.state.Params.holdingIdCardPath,//法人手持证件影印件路径
+            webSitePath: this.state.Params.webSitePath == undefined ? '' : this.state.Params.webSitePath,//商户网址截图影印件路径
+            wechatAppletPath: this.state.Params.wechatAppletPath == undefined ? '' : this.state.Params.wechatAppletPath,//公众号/小程序/生活号业务流程截图影印件路径	
+            appPath: this.state.Params.appPath == undefined ? '' : this.state.Params.appPath,//APP首页截图影印件路径
+            legalPersonBankCardPath: this.state.Params.legalPersonBankCardPath == undefined ? '' : this.state.Params.legalPersonBankCardPath,//法人银行卡图影印件路径
+            desireAuthOtherPath: this.state.Params.desireAuthOtherPath == undefined ? '' : this.state.Params.desireAuthOtherPath,//确认入网意愿其他验证方式路径
+            otherCerPath: this.state.Params.otherCerPath == undefined ? '' : this.state.Params.otherCerPath,//其他资质文件路径
         }
         localStorage.setItem('wData', JSON.stringify(Params))
         return Params
@@ -178,6 +179,7 @@ export default class centerW extends React.Component {
         switch (e) {
             case 0:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.businessLicensePath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     businessLicensePath : dataUrl,
@@ -186,6 +188,7 @@ export default class centerW extends React.Component {
                 break;
             case 1:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.openAccountPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     openAccountPath : dataUrl,
@@ -195,6 +198,7 @@ export default class centerW extends React.Component {
                 break;
             case 2:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.legalIdCardProsPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     legalIdCardProsPath : dataUrl,
@@ -203,6 +207,7 @@ export default class centerW extends React.Component {
                 break;
             case 3:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.legalIdCardConsPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     legalIdCardConsPath : dataUrl,
@@ -211,6 +216,7 @@ export default class centerW extends React.Component {
                 break;
             case 4:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.desireAuthPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     desireAuthPath : dataUrl,
@@ -219,6 +225,7 @@ export default class centerW extends React.Component {
                 break;
             case 5:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.holdingIdCardPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     holdingIdCardPath : dataUrl,
@@ -227,6 +234,7 @@ export default class centerW extends React.Component {
                 break;
             case 6:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.webSitePath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     webSitePath : dataUrl,
@@ -235,6 +243,7 @@ export default class centerW extends React.Component {
                 break;
             case 7:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.wechatAppletPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     wechatAppletPath : dataUrl,
@@ -243,6 +252,7 @@ export default class centerW extends React.Component {
                 break;
             case 8:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.appPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     appPath : dataUrl,
@@ -251,6 +261,7 @@ export default class centerW extends React.Component {
                 break;
             case 9:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.legalPersonBankCardPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     legalPersonBankCardPath : dataUrl,
@@ -259,6 +270,7 @@ export default class centerW extends React.Component {
                 break;
             case 10:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.desireAuthOtherPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     desireAuthOtherPath : dataUrl,
@@ -267,6 +279,7 @@ export default class centerW extends React.Component {
                 break;
             case 11:
                 rightArray[e].txts = '上传成功'
+                that_.state.Params.otherCerPath = dataUrl;
                 that_.setState({
                     rightArray: rightArray,
                     otherCerPath : dataUrl,
@@ -374,7 +387,7 @@ export default class centerW extends React.Component {
                 <div className={styleData.center_right}>
                     {rightArray.map((item, index) => (
                         <div className={styleData.cl} key={index}>
-                            <div className={styleData.titles}> {item.txt}{(item.value == 3 || item.value == 4) && <i className='label_x'>*</i>} : </div>
+                            <div className={styleData.titles}> {item.txt}{(item.value == 1 || item.value == 2 || item.value == 3 || item.value == 4 || item.value == 6 || item.value == 10) && <i className='label_x'>*</i>} : </div>
                             <div className={styleData.Upload_wrap}>
                                 <Upload
                                      {...headerProps}