Browse Source

增加接口数据回填

lvzhuo 3 years ago
parent
commit
134a2f8bcf
5 changed files with 195 additions and 91 deletions
  1. 16 17
      src/App.js
  2. 12 12
      src/common/ssq.js
  3. 64 25
      src/component/center-o/centerO.jsx
  4. 60 19
      src/component/center-s/centerS.jsx
  5. 43 18
      src/component/center-w/centerW.jsx

+ 16 - 17
src/App.js

@@ -49,25 +49,21 @@ export default class App extends React.Component {
   //初始化执行
   componentDidMount() {
     let isSignout = localStorage.getItem('isSignout');  //获取退出时存储的数据,用于判断用户退出后是否刷新页面
-    // let userData = {   //默认信息
-    //   userName: '用户名xxx',
-    //   mallId: 2, //多商户所属商城id
-    //   merchantNo: 250 , //入网申请失败',//入网的appname、社群name、商户号等(香香或者嘉旺提供) 
-    //   merchantType: 3,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
-    //   Jur: 1,//用户权限
-    //   pages: '1-0',
-    //   org_name : '商户名xxx'
-    // }
-
-    let s = "{\"userName\":\"15392502888\",\"merchantNo\":\"com.smyipaijide\",\"org_name\":\"易拍即得\",\"mallId\":\"com.smrongshengtianxia\",\"Jur\":1,\"pages\":\"1-0\",\"merchantType\":2}"
+    let userData = {   //默认信息
+      userName: '用户名xxx',
+      mallId: 2, //多商户所属商城id
+      merchantNo: 250 , //入网申请失败',//入网的appname、社群name、商户号等(香香或者嘉旺提供) 
+      merchantType: 3,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
+      Jur: 1,//用户权限
+      pages: '1-0',
+      org_name : '商户名xxx'
+    }
 
-    // console.log(s)
-    console.log(JSON.parse(unescape(s)))
     // let userData = cookie.load('userInformation');// 获取上游跳转时带给的信息
     // let type = this.isObject(userData)
     // if( type == false){
+    //   userData = JSON.parse(unescape(userData));
     // }
-    let userData = JSON.parse(unescape(s));
 
     this.autoLogin(userData) //跳转查询用户信息,验证用户是否入网
     if (isSignout == 'yes' && userData == undefined) { //拦截是否为刷新页面
@@ -78,6 +74,7 @@ export default class App extends React.Component {
 
     window.onbeforeunload = () => {
       // 这里写    
+      localStorage.removeItem('merchantInfo');
       localStorage.removeItem('wData');
       localStorage.removeItem('sData');
       localStorage.removeItem('oData');
@@ -169,7 +166,6 @@ export default class App extends React.Component {
     }
     $Axios('get', url, param, (res) => {
       let status = res.data.head.status;
-
       if (status >= 700) { //账户状态异常 或者 未入网
         let Tips = res.data.body;
         notification.open({ //给出提示
@@ -186,13 +182,16 @@ export default class App extends React.Component {
       } else if (status == 200) {  //账户状态正常
         let Flag = res.data.body.subMerchantReviewStatus;
         let Dtips = res.data.body.subMerchantReviewRemarks;
+        if(Flag == 5 || Flag == 6){
+          let merchantInfo = res.data.body.merchantInfo;
+          merchantInfo = JSON.parse(merchantInfo);
+          localStorage.setItem('merchantInfo',JSON.stringify(merchantInfo))
+        }
         if (Flag !== 7) { //账户入网申请失败  返回信息
-
           that_.FlagIsStatus(Flag,Dtips)  
           that_.setState({ // 予以拦截 不展示上方第二菜单
             ktyc : false
           });
-
         } else { //账户入网申请成功
           notification.open({
             message: '提示:',

+ 12 - 12
src/common/ssq.js

@@ -13958,18 +13958,18 @@ const ssq = {
         { txt: '营业执照号码', value: 'BUSINESS_LICENSE_NO' },
     ],
     'rightArray': [
-        { txt: '营业执照照片路径', value: 'businessLicensePath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M' ,type:'.jpg, .jpeg, .png, .pdf'},
-        { txt: '开户许可证照片路径', value: 'openAccountPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '法人证件人面像路径', value: 'legalIdCardProsPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '法人证件国徽面路径', value: 'legalIdCardConsPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M' ,type:'.jpg, .jpeg, .png, .pdf'},
-        { txt: '确认入网意愿视频路径', value: 'desireAuthPath', txts: '格式限制为.AVI, .mov, .rmvb, .rm, .FLV, .mp4, .3gp,最大不超过50M',type:'.AVI, .mov, .rmvb, .rm, .FLV, .mp4, .3gp' },
-        { txt: '法人手持证件影印件路径', value: 'holdingIdCardPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '商户网址截图影印件路径', value: 'webSitePath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '公众号/小程序/生活号影印件路径', value: 'wechatAppletPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: 'APP首页截图影印件路径', value: 'appPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '法人银行卡图影印件路径', value: 'legalPersonBankCardPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '确认入网意愿其他方式验证路径', value: 'desireAuthOtherPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
-        { txt: '其他资质文件路径', value: 'otherCerPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 0,  txt: '营业执照照片路径', value: 'businessLicensePath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M' ,type:'.jpg, .jpeg, .png, .pdf'},
+        {num : 1,  txt: '开户许可证照片路径', value: 'openAccountPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 2,  txt: '法人证件人面像路径', value: 'legalIdCardProsPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 3,  txt: '法人证件国徽面路径', value: 'legalIdCardConsPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M' ,type:'.jpg, .jpeg, .png, .pdf'},
+        {num : 4,  txt: '确认入网意愿视频路径', value: 'desireAuthPath', txts: '格式限制为.AVI, .mov, .rmvb, .rm, .FLV, .mp4, .3gp,最大不超过50M',type:'.AVI, .mov, .rmvb, .rm, .FLV, .mp4, .3gp' },
+        {num : 5,  txt: '法人手持证件影印件路径', value: 'holdingIdCardPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 6,  txt: '商户网址截图影印件路径', value: 'webSitePath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 7,  txt: '公众号/小程序/生活号影印件路径', value: 'wechatAppletPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 8,  txt: 'APP首页截图影印件路径', value: 'appPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 9,  txt: '法人银行卡图影印件路径', value: 'legalPersonBankCardPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 10,  txt: '确认入网意愿其他方式验证路径', value: 'desireAuthOtherPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
+        {num : 11,  txt: '其他资质文件路径', value: 'otherCerPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
     ],
     'options': [
         // { label: '网站', value: 'WEBSITE' },

+ 64 - 25
src/component/center-o/centerO.jsx

@@ -20,7 +20,8 @@ export default class centerO extends React.Component {
             desireAuth: '',
             offlist : select_data.offlist,
             validation_list : [],
-            signedType : 'BY_SPLIT_BILL' // 默认被分帐方
+            signedType : 'BY_SPLIT_BILL', // 默认被分帐方
+            merchantInfo : JSON.parse(localStorage.getItem('merchantInfo')) == undefined ? '' : JSON.parse(localStorage.getItem('merchantInfo'))
         }
 
     }
@@ -31,6 +32,9 @@ export default class centerO extends React.Component {
             desireAuth : this.state.Params.desireAuth == undefined ? 'DESIRE_VIDEO' : this.state.Params.desireAuth, // 开户意愿核实类型
         })
         this.initData();
+        if(this.state.merchantInfo !== ''){
+            this.initPcc();
+        }
     }
 
     listTypes(e){
@@ -45,7 +49,7 @@ export default class centerO extends React.Component {
     }
 
     initData() {
-        if (this.props.arr) {  //初始化判断数据回填
+        if (this.props.arr && this.state.merchantInfo == '') {  //初始化判断数据回填
             if (this.state.Params.businessAddressProvince !== undefined) {
                 let Province = this.state.Params.businessAddressProvince;
                 let city = this.state.Params.businessAddressCity;
@@ -61,16 +65,17 @@ export default class centerO extends React.Component {
                 })
             }
             let signedType = this.state.Params.signedType;
+            let merchantInfo = this.state.merchantInfo;
             if(signedType == 'GENERAL_SUB_MERCHANT'){
                 this.setState({
                     offlist:select_data.GENERAL_SUB_MERCHANT
                 })
             }else{
-                if(this.state.Params.registerRole == 'INDIVIDUAL_BUSINESS'){ //个体工商户
+                if(this.state.Params.registerRole == 'INDIVIDUAL_BUSINESS' || merchantInfo.baseInfo.registerRole == 'INDIVIDUAL_BUSINESS'){ //个体工商户
                     this.setState({
                         offlist:select_data.INDIVIDUAL_BUSINESS
                     })
-                }else if(this.state.Params.registerRole == 'NATURAL_PERSON'){  //自然人
+                }else if(this.state.Params.registerRole == 'NATURAL_PERSON' || merchantInfo.baseInfo.registerRole == 'NATURAL_PERSON'){  //自然人
                     this.setState({
                         offlist:select_data.NATURAL_PERSON
                     })
@@ -146,6 +151,30 @@ export default class centerO extends React.Component {
         this.state.Params.cerType = cerType;
     }
 
+    initPcc(){
+        let registerRole = this.state.merchantInfo.baseInfo.registerRole;
+        this.handleChangeQy(registerRole)
+        let Province = this.state.merchantInfo.baseInfo.businessAddressProvince;
+        let city = this.state.merchantInfo.baseInfo.businessAddressCity;
+        let region = this.state.merchantInfo.baseInfo.businessAddressArea;
+        this.state.Params.businessAddressProvince = Province;
+        this.state.Params.businessAddressCity = city;
+        this.state.Params.businessAddressArea = region;
+        let data = this.state.selectData.Area;
+        let cityList = data.find((item, index) => { return Province == item.provinceCode });
+        let regionlist = cityList.mallCityList.find((item, index) => { return city == item.cityCode });
+        let that_ = this;
+        setTimeout(function(){
+            that_.setState({
+                cityOs: false,
+                citylist: cityList.mallCityList,
+                regionOs: false,
+                regionlist: regionlist.mallAreaList
+            })
+        },500)
+       
+    }
+
     province_select(e) {  //选择省
         this.state.Params.businessAddressProvince = e;
         let citylist = this.state.selectData.Area.find((item, index) => { return e == item.provinceCode });
@@ -229,20 +258,34 @@ export default class centerO extends React.Component {
 
 
     render() {
-        const { selectData, cityOs, regionOs, citylist, regionlist, cityTxt, regionTxt, desireAuth, Params , validation_list, signedType } = this.state;
+        const { selectData, cityOs, regionOs, citylist, regionlist, cityTxt, regionTxt, desireAuth, Params , validation_list, signedType , merchantInfo } = this.state;
         const { Option } = Select;
         const { TextArea } = Input;
+        const { baseInfo } = merchantInfo;
         const layout = {
             labelCol: { span: 4 },
-            // wrapperCol: { span:  },
           };
         return (
             <div className='center_up'>
                  <Form 
                     {...layout}
-                    initialValues={{  //数据回填
-                        signedType : Params.signedType == undefined ? 'BY_SPLIT_BILL' : Params.signedType,   //入网类型默认被分帐方
-
+                    initialValues={{
+                        //数据回填,先检测用户状态是否为,入网被拒用户,符合则先以接口数据进行回填,否则按照自己输入的数据进行回填
+                        signedType : merchantInfo == '' ? Params.signedType == undefined ? 'BY_SPLIT_BILL' : Params.signedType : baseInfo.signedType,  
+                        signedName : merchantInfo == '' ? Params.signedName : baseInfo.signedName, 
+                        registerRole : merchantInfo == '' ? Params.registerRole : baseInfo.registerRole, 
+                        cerType : merchantInfo == '' ? Params.cerType : baseInfo.cerType == '' ? null : baseInfo.cerType, 
+                        signedShorthand : merchantInfo == '' ? Params.signedShorthand : baseInfo.signedShorthand == '' ? null : baseInfo.signedShorthand, 
+                        contactName : merchantInfo == '' ? Params.contactName : baseInfo.contactName == '' ? null : baseInfo.contactName, 
+                        contactEmail : merchantInfo == '' ? Params.contactEmail : baseInfo.contactEmail == '' ? null : baseInfo.contactEmail, 
+                        contactPhone : merchantInfo == '' ? Params.contactPhone : baseInfo.contactPhone == '' ? null : baseInfo.contactPhone, 
+                        businessAddress : merchantInfo == '' ? Params.businessAddress : baseInfo.businessAddress == '' ? null : baseInfo.businessAddress, 
+                        businessClassification : merchantInfo == '' ? Params.businessClassification : baseInfo.businessClassification == '' ? null : baseInfo.businessClassification, 
+                        desireAuth : merchantInfo == '' ? Params.desireAuth == '' ? 'DESIRE_VIDEO' : Params.desireAuth : baseInfo.desireAuth == '' ? 'DESIRE_VIDEO' : baseInfo.desireAuth, 
+                        businessAddressProvince : merchantInfo == '' ? Params.businessAddressProvince : baseInfo.businessAddressProvince == '' ? null : baseInfo.businessAddressProvince, 
+                        businessAddressCity : merchantInfo == '' ? Params.businessAddressCity : baseInfo.businessAddressCity == '' ? null : baseInfo.businessAddressCity, 
+                        businessAddressArea : merchantInfo == '' ? Params.businessAddressArea : baseInfo.businessAddressArea == '' ? null : baseInfo.businessAddressArea, 
+                        
                     }}
                  >
                 <div className='center_left'>
@@ -270,7 +313,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'signedName'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'signedName'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='qymc' style={{ width: 200 }} placeholder='请输入签约名称' defaultValue={Params.signedName} />
+                                <Input id='qymc' style={{ width: 200 }} placeholder='请输入签约名称' />
                             </Form.Item>
                         </div>
                     </div>
@@ -287,13 +330,11 @@ export default class centerO extends React.Component {
                                     size='default'
                                     id='qyxz'
                                     placeholder="请选择商户签约性质"
-                                    defaultValue={Params.registerRole}
                                     onChange={this.handleChangeQy.bind(this)}
                                     style={{ width: 200 }}
                                 >
                                     {selectData.contract.map((item, index) => (
                                         signedType == 'GENERAL_SUB_MERCHANT' ? 
-
                                             item.value !== 'ENTERPRISE_LEGAL_PERSON' ? 
                                                 <Option key={index} value={item.value} disabled>{item.txt}</Option>
                                             :<Option key={index} value={item.value}>{item.txt}</Option>
@@ -317,7 +358,6 @@ export default class centerO extends React.Component {
                                     size='default'
                                     id='zslx'
                                     placeholder="请选择证书类型"
-                                    defaultValue={Params.cerType}
                                     onChange={this.handleChangeZs.bind(this)}
                                     style={{ width: 200 }}
                                 >
@@ -336,7 +376,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'signedShorthand'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'signedShorthand'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='names' style={{ width: 200 }} placeholder='请输入商户简称' defaultValue={Params.signedShorthand} />
+                                <Input id='names' style={{ width: 200 }} placeholder='请输入商户简称' />
                             </Form.Item>
                     </div>
                     <div className='c-l'>
@@ -348,7 +388,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'contactName'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'contactName'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='myname' style={{ width: 200 }} placeholder='请输入联系人姓名' defaultValue={Params.contactName} />
+                                <Input id='myname' style={{ width: 200 }} placeholder='请输入联系人姓名'  />
                             </Form.Item>
                     </div>
                     <div className='c-l'>
@@ -360,7 +400,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'contactEmail'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'contactEmail'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='mymail' style={{ width: 200 }} placeholder='请输入联系人邮箱' defaultValue={Params.contactEmail} />
+                                <Input id='mymail' style={{ width: 200 }} placeholder='请输入联系人邮箱' />
                             </Form.Item>
                     </div>
                     <div className='c-l'>
@@ -372,7 +412,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'contactPhone'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'contactPhone'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='mynums' style={{ width: 200 }} placeholder="请输入联系人电话" onChange={this.inputDatas.bind(this)} defaultValue={Params.contactPhone} />
+                                <Input id='mynums' style={{ width: 200 }} placeholder="请输入联系人电话" onChange={this.inputDatas.bind(this)} />
                             </Form.Item>
                     </div>
                 </div>
@@ -386,7 +426,7 @@ export default class centerO extends React.Component {
                                 validateStatus = {validation_list.find((item,index) => { return item == 'businessAddressProvince'}) !== undefined ? 'error' : null}
                                 help = {validation_list.find((item,index) => { return item == 'businessAddressProvince'}) !== undefined ? '此项为必填项!' : null}
                             >
-                                 <Select size='default' placeholder="请选择省份" defaultValue={Params.businessAddressProvince} onChange={this.province_select.bind(this)} style={{ width: 200 }}>
+                                 <Select size='default' placeholder="请选择省份"  onChange={this.province_select.bind(this)} style={{ width: 200 }}>
                                     {selectData.Area.map((item, index) => (
                                         <Option key={index} value={item.provinceCode}>{item.provinceName}</Option>
                                     ))}
@@ -403,7 +443,7 @@ export default class centerO extends React.Component {
                             validateStatus = {validation_list.find((item,index) => { return item == 'businessAddressCity'}) !== undefined ? 'error' : null}
                             help = {validation_list.find((item,index) => { return item == 'businessAddressCity'}) !== undefined ? '此项为必填项!' : null}
                         >
-                            <Select size='default' placeholder="请选择市" defaultValue={Params.businessAddressCity} key={cityTxt} onChange={this.city_select.bind(this)} style={{ width: 200 }} disabled={cityOs}>
+                            <Select size='default' placeholder="请选择市" key={cityTxt} onChange={this.city_select.bind(this)} style={{ width: 200 }} disabled={cityOs}>
                                 {citylist.map((item, index) => (
                                     <Option key={index} value={item.cityCode}>{item.cityName}</Option>
                                 ))}
@@ -419,7 +459,7 @@ export default class centerO extends React.Component {
                             validateStatus = {validation_list.find((item,index) => { return item == 'businessAddressArea'}) !== undefined ? 'error' : null}
                             help = {validation_list.find((item,index) => { return item == 'businessAddressArea'}) !== undefined ? '此项为必填项!' : null}
                         >
-                            <Select size='default' placeholder="请选择区" defaultValue={Params.businessAddressArea} key={regionTxt} onChange={this.region_select.bind(this)} style={{ width: 200 }} disabled={regionOs}>
+                            <Select size='default' placeholder="请选择区"  key={regionTxt} onChange={this.region_select.bind(this)} style={{ width: 200 }} disabled={regionOs}>
                                 {regionlist.map((item, index) => (
                                     <Option key={index} value={item.areaCode}>{item.areaName}</Option>
                                 ))}
@@ -435,9 +475,9 @@ export default class centerO extends React.Component {
                             validateStatus = {validation_list.find((item,index) => { return item == 'businessAddress'}) !== undefined ? 'error' : null}
                             help = {validation_list.find((item,index) => { return item == 'businessAddress'}) !== undefined ? '此项为必填项!' : null}
                         >
-                             <div className='TextAreas' >
-                                <TextArea id='mywb' style={{ resize: 'none' }} defaultValue={Params.businessAddress} rows={6} />
-                            </div>
+                             {/* <div className='TextAreas' > */}
+                                <Input.TextArea id='mywb' style={{ resize: 'none',width : 400 }}  rows={6} />
+                            {/* </div> */}
                         </Form.Item>
                        
                     </div>
@@ -454,7 +494,6 @@ export default class centerO extends React.Component {
                                 showSearch
                                 size='default' 
                                 placeholder="请选择业务类型" 
-                                defaultValue={Params.businessClassification} 
                                 onChange={this.handleChange.bind(this)} 
                                 style={{ width: 400 }}
                                 filterOption={(input, option) =>
@@ -477,7 +516,7 @@ export default class centerO extends React.Component {
                             // validateStatus="error"
                             // help="此项为必填项!"
                         >
-                             <Radio.Group name="radiogroup" defaultValue={Params.desireAuth == undefined ? 'DESIRE_VIDEO' : Params.desireAuth} onChange={this.onChangeRadio.bind(this)}>
+                             <Radio.Group name="radiogroup" onChange={this.onChangeRadio.bind(this)}>
                                 <Radio value='DESIRE_VIDEO'>视频验证</Radio>
                                 <Radio value='DESIRE_MOBILEINFO'>手机短信验证</Radio>
                                 <Radio value='DESIRE_NONEED'>其他验证方式</Radio>

+ 60 - 19
src/component/center-s/centerS.jsx

@@ -22,7 +22,8 @@ export default class centerS extends React.Component {
             signedType: null,
             starTime : '',
             endTime : '',
-            idType : null
+            idType : null,
+            bankCardInfo : JSON.parse(localStorage.getItem('merchantInfo')) == undefined ? '' : JSON.parse(localStorage.getItem('merchantInfo'))
         }
 
     }
@@ -40,6 +41,9 @@ export default class centerS extends React.Component {
             regisClick: registerRole.type == 1 ? 'PRIVATE' : 'PUBLIC'
         })
         this.initData();
+        if(this.state.bankCardInfo !== ''){
+            this.initPcc();
+        }
     }
 
     toParent = (data) => {
@@ -105,19 +109,35 @@ export default class centerS extends React.Component {
             withdrawRateType: '',//提现费率类型
             // withdrawRate: document.getElementById("withdrawRate").value,//提现费率
             withdrawRate: '',//提现费率
-
-            // 收单子户独立参数
-            name : document.getElementById("name").value, //最终受益人姓名
-            idType : this.state.Params.idType == undefined ? '' : this.state.Params.idType,//最终受益人证件类型
-            idNo : document.getElementById("idNo").value, //最终受益人证件号码
-            effectiveDateStart : this.state.Params.effectiveDateStart == undefined ? '' : this.state.Params.effectiveDateStart,//证件有效期开始时间
-            effectiveDateEnd : this.state.Params.effectiveDateEnd == undefined ? '' : this.state.Params.effectiveDateEnd,//证件有效期结束时间
-            address : document.getElementById("address").value, //最终受益人住址
-            equityRatio : document.getElementById("equityRatio").value, //股权占比
-            receiverName : document.getElementById("receiverName").value, //收件人姓名
-            receiverPhone : document.getElementById("receiverPhone").value, //收件人电话
-            receiverAddress : document.getElementById("receiverAddress").value, //收件人地址
-
+        }
+        if(this.state.signedType == 'GENERAL_SUB_MERCHANT'){
+            Params = {
+                bankCode: this.state.Params.bankCode == undefined ? '' : this.state.Params.bankCode,//开户行
+                bankBranchName: document.getElementById("bankBranchName").value,//支行名称
+                accountName: document.getElementById("accountName").value,//开户名称
+                bankCardNo: document.getElementById("bankCardNo").value,//开户账号
+                cityCode: this.state.Params.cityCode == undefined ? '' : this.state.Params.cityCode,//市编码
+                provinceCode: this.state.Params.provinceCode == undefined ? '' : this.state.Params.provinceCode,//省编码
+                accountType: this.state.Params.accountType == undefined ? 'PUBLIC' : this.state.Params.accountType, //结算银行卡属性   PUBLIC 对公 PRIVATE 对私
+                liquidationType: 'WITHDRAW',//清算方式 WITHDRAW 提现   SETTLE 结算
+                // withdrawRateType: this.state.Params.withdrawRateType == undefined ? 'SINGLE' : this.state.Params.withdrawRateType,//提现费率类型
+                withdrawRateType: '',//提现费率类型
+                // withdrawRate: document.getElementById("withdrawRate").value,//提现费率
+                withdrawRate: '',//提现费率
+    
+                // 收单子户独立参数
+                name : document.getElementById("name").value, //最终受益人姓名
+                idType : this.state.Params.idType == undefined ? '' : this.state.Params.idType,//最终受益人证件类型
+                idNo : document.getElementById("idNo").value, //最终受益人证件号码
+                effectiveDateStart : this.state.Params.effectiveDateStart == undefined ? '' : this.state.Params.effectiveDateStart,//证件有效期开始时间
+                effectiveDateEnd : this.state.Params.effectiveDateEnd == undefined ? '' : this.state.Params.effectiveDateEnd,//证件有效期结束时间
+                address : document.getElementById("address").value, //最终受益人住址
+                equityRatio : document.getElementById("equityRatio").value, //股权占比
+                receiverName : document.getElementById("receiverName").value, //收件人姓名
+                receiverPhone : document.getElementById("receiverPhone").value, //收件人电话
+                receiverAddress : document.getElementById("receiverAddress").value, //收件人地址
+    
+            }
         }
         localStorage.setItem('sData', JSON.stringify(Params))
         return Params
@@ -132,6 +152,22 @@ export default class centerS extends React.Component {
         // console.log(`Selected: ${value}`);
     }
 
+    initPcc(){
+        let bankCardInfo = this.state.bankCardInfo.bankCardInfo;
+        this.selectChange_1(bankCardInfo.bankCode)
+        let Province = bankCardInfo.provinceCode;
+        let cityCode = bankCardInfo.cityCode;
+        let data = this.state.selectData.Area;
+        let cityList = data.find((item, index) => { return Province == item.provinceCode });
+        let that_ = this;
+        setTimeout(function(){
+            that_.setState({
+                cityOs: false,
+                citylist: cityList.mallCityList,
+            })
+        },500)
+    }
+
     selectChange_1(value) {  //开户行选择
         this.state.Params.bankCode = value;
     }
@@ -201,9 +237,10 @@ export default class centerS extends React.Component {
     }
 
     render() {
-        const { selectData, cityOs, citylist, Params, contactName, registerRole, regisClick, validation_list, form_width, signedType } = this.state;
+        const { selectData, cityOs, citylist, Params, contactName, registerRole, regisClick, validation_list, form_width, signedType, bankCardInfo } = this.state;
         const { Option } = Select;
         const { TextArea } = Input;
+        const Inofs = bankCardInfo.bankCardInfo;
         const layout = {
             labelCol: { span: 4 },
         };
@@ -217,7 +254,12 @@ export default class centerS extends React.Component {
                         {...layout}
                         onFinish={onFinish}
                         initialValues={{  //数据回填
-                            accountName: Params.accountName
+                            bankCode: Inofs == '' ? Params.bankCode : Inofs.bankCode == '' ? null : Inofs.bankCode, 
+                            bankBranchName : Inofs == '' ? Params.bankBranchName : Inofs.bankBranchName == '' ? null : Inofs.bankBranchName, 
+                            accountName : Inofs == '' ? Params.accountName : Inofs.accountName == '' ? null : Inofs.accountName, 
+                            bankCardNo : Inofs == '' ? Params.bankCardNo : Inofs.bankCardNo == '' ? null : Inofs.bankCardNo, 
+                            provinceCode : Inofs == '' ? Params.provinceCode : Inofs.provinceCode == '' ? null : Inofs.provinceCode, 
+                            cityCode : Inofs == '' ? Params.cityCode : Inofs.cityCode == '' ? null : Inofs.cityCode, 
                         }}
                     >
                         <div className='c-l'>
@@ -233,7 +275,6 @@ export default class centerS extends React.Component {
                                     showSearch
                                     size='default'
                                     placeholder="请选择开户行"
-                                    defaultValue={Params.bankCode}
                                     onChange={this.selectChange_1.bind(this)}
                                     style={{ width: 200 }}
                                     optionFilterProp="children"
@@ -257,7 +298,7 @@ export default class centerS extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'bankBranchName' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'bankBranchName' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='bankBranchName' style={{ width: form_width }} defaultValue={Params.bankBranchName} placeholder="请输入支行名称" />
+                                <Input id='bankBranchName' style={{ width: form_width }}  placeholder="请输入支行名称" />
                             </Form.Item>
                         </div>
                         <div className='c-l'>
@@ -293,7 +334,7 @@ export default class centerS extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'provinceCode' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'provinceCode' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Select size='default' placeholder="请选择省编码" defaultValue={Params.provinceCode} onChange={this.selectChange_2.bind(this)} style={{ width: 200 }}>
+                                <Select size='default' placeholder="请选择省编码"  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>
                                     ))}

+ 43 - 18
src/component/center-w/centerW.jsx

@@ -46,7 +46,8 @@ export default class centerW extends React.Component {
             validation_list: [],
             form_width: 200,
             registerRole : null,
-            contactName : JSON.parse(localStorage.getItem('oData')).contactName
+            contactName : JSON.parse(localStorage.getItem('oData')).contactName,
+            merchantInfo : JSON.parse(localStorage.getItem('merchantInfo')) == undefined ? '' : JSON.parse(localStorage.getItem('merchantInfo'))
         }
 
     }
@@ -82,13 +83,27 @@ export default class centerW extends React.Component {
                 })
             }
         }
-        
+        if(this.state.merchantInfo !== ''){
+            this.initPcc();
+        }
     }
 
     toParent = (data) => {
         this.props.parent.getParams_w(this, data)
     }
 
+    initPcc(){
+        let certificateInfo = this.state.merchantInfo.certificateInfo;
+        this.selectChange_1(certificateInfo.profession) //法人职业类型
+        this.selectChange_2(certificateInfo.legalPersonIdType) //法人证件类型
+        this.selectChange_3(certificateInfo.cerNoType) //企业证件类型
+        this.selectChange_4(certificateInfo.sellingArea) //营业面积
+        this.selectChange_5(certificateInfo.staffSize) //员工规模
+        let merchantInfo = this.state.merchantInfo;
+        let that_ = this;
+    }
+
+
     InputWdata(e) {
         let Params = {
             legalPersonName: document.getElementById("legalPersonName").value,//法人姓名
@@ -131,7 +146,6 @@ export default class centerW extends React.Component {
     }
 
     btnClick(e) {  //区分上传图片类型
-        let index = e + 1;
         this.state.imgType = e;
     }
 
@@ -337,8 +351,9 @@ export default class centerW extends React.Component {
     }
 
     render() {
-        const { selectData, Params, rightArray, headerProps, scLodings, imgType, validation_list, form_width , registerRole , contactName } = this.state;
+        const { selectData, Params, rightArray, headerProps, scLodings, imgType, validation_list, form_width , registerRole , contactName, merchantInfo } = this.state;
         const { Option } = Select;
+        const { certificateInfo } = merchantInfo;
         const layout = {
             labelCol: { span: 4 },
         };
@@ -351,11 +366,21 @@ export default class centerW extends React.Component {
                     {...layout}
                     onFinish={onFinish}
                     initialValues={{  //数据回填
-                        legalPersonName : contactName, 
-                        'tradingScenarios':  Params.tradingScenarios == undefined ? ['WEBSITE'] : Params.tradingScenarios, 
-                        'profession' : Params.profession == undefined ? null : Params.profession, 
-                        'legalPersonIdType' : Params.legalPersonIdType == undefined ? null : Params.legalPersonIdType, 
- 
+                        legalPersonName : contactName,  //法人姓名
+                        profession : merchantInfo == '' ? Params.profession == undefined ? null  : Params.profession : certificateInfo.profession == '' ? null : certificateInfo.profession, 
+                        legalPersonIdType : merchantInfo == '' ? Params.legalPersonIdType == undefined ? null  : Params.legalPersonIdType : certificateInfo.legalPersonIdType == '' ? null : certificateInfo.legalPersonIdType, 
+                        legalPersonIdNo : merchantInfo == '' ? Params.legalPersonIdNo == undefined ? null  : Params.legalPersonIdNo  : certificateInfo.legalPersonIdNo == '' ? null : certificateInfo.legalPersonIdNo, 
+                        cerNoType : merchantInfo == '' ? Params.cerNoType == undefined ? null  : Params.cerNoType : certificateInfo.cerNoType == '' ? null :  Params.cerNoType, 
+                        tradingScenarios :  Params.tradingScenarios == undefined ? [''] : Params.tradingScenarios,   //交易场景说明
+                        cerNo : merchantInfo == '' ? Params.cerNo == undefined ? null  : Params.cerNo : certificateInfo.cerNo == '' ? null : certificateInfo.cerNo, 
+                        sellingArea : merchantInfo == '' ? Params.sellingArea == undefined ? null  : Params.sellingArea : certificateInfo.sellingArea == '' ? null : certificateInfo.sellingArea, 
+                        staffSize : merchantInfo == '' ? Params.staffSize == undefined ? null  : Params.staffSize : certificateInfo.staffSize == '' ? null : certificateInfo.staffSize, 
+                        webSite : merchantInfo == '' ? Params.webSite == undefined ? null  : Params.webSite : certificateInfo.webSite == '' ? null : certificateInfo.webSite, 
+                        webSiteName : merchantInfo == '' ? Params.webSiteName == undefined ? null  : Params.webSiteName : certificateInfo.webSiteName == '' ? null : certificateInfo.webSiteName, 
+                        icp : merchantInfo == '' ? Params.icp == undefined ? null  : Params.icp : certificateInfo.icp == '' ? null : certificateInfo.icp, 
+                        appName : merchantInfo == '' ? Params.appName == undefined ? null  : Params.appName : certificateInfo.appName == '' ? null : certificateInfo.appName, 
+                        wechatAppletName : merchantInfo == '' ? Params.wechatAppletName == undefined ? null  : Params.wechatAppletName : certificateInfo.wechatAppletName == '' ? null : certificateInfo.wechatAppletName, 
+                    
                     }}
                 >
                     <div className={styleData.center_left}>
@@ -424,7 +449,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'cerNoType' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'cerNoType' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Select size='default' placeholder="请选择证件类型" defaultValue={Params.cerNoType} onChange={this.selectChange_3.bind(this)} style={{ width: 200 }}>
+                                <Select size='default' placeholder="请选择证件类型"  onChange={this.selectChange_3.bind(this)} style={{ width: 200 }}>
                                     {selectData.cerNoTypeW.map((item, index) => (
                                         <Option key={index} value={item.value}>{item.txt}</Option>
                                     ))}
@@ -440,7 +465,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'cerNo' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'cerNo' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='cerNo' style={{ width: form_width }} placeholder="请输入证书编号" defaultValue={Params.cerNo} />
+                                <Input id='cerNo' style={{ width: form_width }} placeholder="请输入证书编号" />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
@@ -452,7 +477,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'sellingArea' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'sellingArea' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Select size='default' placeholder="请选择营业面积" defaultValue={Params.sellingArea} onChange={this.selectChange_4.bind(this)} style={{ width: 200 }}>
+                                <Select size='default' placeholder="请选择营业面积"  onChange={this.selectChange_4.bind(this)} style={{ width: 200 }}>
                                     <Option key={1} value='A'>500平米以上</Option>
                                     <Option key={2} value='B'>200-500平米(含)</Option>
                                     <Option key={3} value='C'>200平米以下</Option>
@@ -468,7 +493,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'staffSize' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'staffSize' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Select size='default' placeholder="请选择员工规模" defaultValue={Params.staffSize} onChange={this.selectChange_5.bind(this)} style={{ width: 200 }}>
+                                <Select size='default' placeholder="请选择员工规模"  onChange={this.selectChange_5.bind(this)} style={{ width: 200 }}>
                                     <Option key={4} value='A'>100人以上</Option>
                                     <Option key={5} value='B'>50-100人(含)</Option>
                                     <Option key={6} value='C'>50人以下</Option>
@@ -497,7 +522,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'webSite' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'webSite' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='webSite' style={{ width: form_width }} placeholder="请输入网站网址" defaultValue={Params.webSite} />
+                                <Input id='webSite' style={{ width: form_width }} placeholder="请输入网站网址" />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
@@ -509,7 +534,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'webSiteName' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'webSiteName' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='webSiteName' style={{ width: form_width }} placeholder="请输入网站名称" defaultValue={Params.webSiteName} />
+                                <Input id='webSiteName' style={{ width: form_width }} placeholder="请输入网站名称" />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
@@ -521,7 +546,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'icp' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'icp' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='icp' style={{ width: form_width }} placeholder="请输入ICP备案号" defaultValue={Params.icp} />
+                                <Input id='icp' style={{ width: form_width }} placeholder="请输入ICP备案号" />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
@@ -533,7 +558,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'appName' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'appName' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='appName' style={{ width: form_width }} placeholder="请输入APP名称" defaultValue={Params.appName} />
+                                <Input id='appName' style={{ width: form_width }} placeholder="请输入APP名称"  />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
@@ -545,7 +570,7 @@ export default class centerW extends React.Component {
                                 validateStatus={validation_list.find((item, index) => { return item == 'wechatAppletName' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'wechatAppletName' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='wechatAppletName' style={{ width: form_width }} placeholder="请输入名称" defaultValue={Params.wechatAppletName} />
+                                <Input id='wechatAppletName' style={{ width: form_width }} placeholder="请输入名称" />
                             </Form.Item>
                         </div>
                     </div>