+

src/App.css

@@ -4,8 +4,10 @@
 }
 
 #root{
-  width: 100%;
+  width: 1680px;
   height: 100%;
+  min-width: 1680px;
+  min-height: 100%;
   font-family: Avenir,-apple-system,BlinkMacSystemFont,segoe ui,Roboto,helvetica neue,Arial,noto sans,sans-serif,apple color emoji,segoe ui emoji,segoe ui symbol,noto color emoji,sans-serif;
 }
 

src/App.js

@@ -1,7 +1,7 @@
 import React, { Suspense } from 'react';
 import ReactDOM from 'react-dom';
 import './App.css';
-import { Menu, Button, Result, notification, Spin } from 'antd';
+import { Menu, Button, Result, notification } from 'antd';
 import { $Axios } from './common/publish';
 import { SettingOutlined, DollarCircleOutlined, } from '@ant-design/icons';
 import * as Icons from "@ant-design/icons";
@@ -9,6 +9,9 @@ import cookie from 'react-cookies'
 import {
   MenuUnfoldOutlined,
   MenuFoldOutlined,
+  FrownTwoTone,
+  SmileTwoTone,
+  MehTwoTone 
 } from '@ant-design/icons';
 export default class App extends React.Component {
   constructor(props) {
@@ -35,40 +38,55 @@ export default class App extends React.Component {
       signout: false,
       isSignout: 'no',
       yc: '',
-      jurs : true
+      jurs: true,
+      jur: null,
+      ktyc : true
     }
   }
-
+  // 测试  入网申请失败 250 3
+  // 测试  入网申请成功 252 3
+  // 测试  入网成功  com.smrongshengtianxia  2
   //初始化执行
   componentDidMount() {
     let isSignout = localStorage.getItem('isSignout');  //获取退出时存储的数据,用于判断用户退出后是否刷新页面
-    // let obj = {   //默认信息
-    //   userName: '测试用户blabalablalba',
-    //   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');// 获取上游跳转时带给的信息
-    let type = this.isObject(userData)
-    if( type == false){
-      userData = JSON.parse(unescape(userData));
+    let obj = {   //默认信息
+      userName: '测试用户blabalablalba',
+      mallId: 2, //多商户所属商城id
+      merchantNo: '入网申请失败',//入网的appname、社群name、商户号等(香香或者嘉旺提供) 
+      merchantType: 3,//入网来源，2：app或社群3：商户或店铺(香香或者嘉旺提供)
+      Jur: 1,//用户权限
+      pages: '1-0'
     }
+    let userData = obj
+
+    // let userData = cookie.load('userInformation');// 获取上游跳转时带给的信息
+    // let type = this.isObject(userData)
+    // if( type == false){
+    //   userData = JSON.parse(unescape(userData));
+    // }
+
     this.autoLogin(userData) //跳转查询用户信息,验证用户是否入网
-    if(isSignout == 'yes' && userData == undefined){ //拦截是否为刷新页面
+    if (isSignout == 'yes' && userData == undefined) { //拦截是否为刷新页面
       this.setState({
-        signout : true
+        signout: true
       })
     }
 
+    window.onbeforeunload = () => {
+      // 这里写    
+      localStorage.removeItem('wData');
+      localStorage.removeItem('sData');
+      localStorage.removeItem('oData');
+      localStorage.removeItem('userData');
+      localStorage.removeItem('rightArray');
+      localStorage.removeItem('verification');
+    }
+
   }
 
 
-  isObject (obj){
-    return (typeof obj=='object')&&obj.constructor==Object;
+  isObject(obj) {
+    return (typeof obj == 'object') && obj.constructor == Object;
   }
   initJurisdiction() {//初始化用户权限
     let e = JSON.parse(localStorage.getItem('userData'));
@@ -88,8 +106,6 @@ export default class App extends React.Component {
         assembly_cw: arr.find((item, index) => { return index == page[1] }).assembly
       })
     }
-
-
   }
 
   handleClick(e) {  //上方导航菜单点击
@@ -139,7 +155,6 @@ export default class App extends React.Component {
    * 逻辑更改：如果商户未入网无论指定跳转到任何页面全部跳转为入网页面
    */
   autoLogin = (e) => {   //初始化进入页面请求查询用户是否入网以及其他信息
-    // console.log(e)
     localStorage.setItem('userData', JSON.stringify(e)) //存储上游信息 到本地储存
     let that_ = this;
     let url = '/payment/merchant.query.groovy'
@@ -150,63 +165,121 @@ export default class App extends React.Component {
     }
     $Axios('get', url, param, (res) => {
       let status = res.data.head.status;
-      if (status == 200) {
 
-        let data = res.data.body;
-        let type = data.status;
-        if (type !== 1 && type) {
-          that_.setState({
-            yc: true
-          })
+      if (status >= 700) { //账户状态异常 或者 未入网
+        let Tips = res.data.body;
+        notification.open({ //给出提示
+          message: '提示:',
+          description: Tips,
+          icon: <MehTwoTone  twoToneColor="red" />,
+          onClick: () => { },
+        });
+        e.pages = '1-0'  // 并予以拦截
+        that_.setState({
+          assembly: 'Layout',
+          ktyc : false
+        });
+      } else if (status == 200) {  //账户状态正常
+        let Flag = res.data.body.subMerchantReviewStatus;
+        let Dtips = res.data.body.subMerchantReviewRemarks;
+        if (Flag !== 7) { //账户入网申请失败  返回信息
+
+          that_.FlagIsStatus(Flag,Dtips)  
+          that_.setState({ // 予以拦截 不展示上方第二菜单
+            ktyc : false
+          });
+
+        } else { //账户入网申请成功
           notification.open({
             message: '提示:',
-            style: {
-              color: 'red',
-            },
-            description:
-              '当前账户存在异常情况,请联系管理员！',
+            description: '该账户已入网！',
+            icon: <SmileTwoTone  twoToneColor="green" />,
             onClick: () => { },
           });
-          localStorage.setItem('userData', JSON.stringify(e)) //存储上游信息 到本地储存
-        } else {
-          let s = data.status;
-          if (s == undefined) {  //商户已入网
-              that_.setState({
-                arr1: [{ txt: '商户入网列表', icon: 'SlidersOutlined', assembly: 'center-tab' }],
-                assembly: 'center-tab',
-                jurs : false
-              });
-              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 = '1-0'
-              that_.setState({
-                assembly: 'Layout'
-              });
+          //已入网用户进行菜单拦截 不在进入 商户入网界面
+          that_.setState({
+            arr1: [{ txt: '商户入网列表', icon: 'SlidersOutlined', assembly: 'center-tab' }],
+            assembly: 'center-tab',
+            jurs: false
+          });
+          if (e.pages == '1-0') {
+            e.pages = '2-0'
           }
-          localStorage.setItem('userData', JSON.stringify(e)) //存储上游信息 到本地储存
-          that_.initJurisdiction();  //初始化用户权限以及各种信息
         }
 
       }
+      localStorage.setItem('userData', JSON.stringify(e)) //存储上游信息 到本地储存
+      that_.initJurisdiction();  //初始化用户权限以及各种信息
     });
 
     return e
   }
 
+
+  FlagTKtips(Tips,Dtips){
+    notification.open({
+      message: Tips,
+      description: Dtips,
+      icon: <FrownTwoTone  twoToneColor="red" />,
+      onClick: () => { },
+    });
+  }
+
+
+  FlagIsStatus(e,Dtips){
+    let Tips = '';
+    switch(e){
+      case 1:
+        Tips = '入网参数错误！'
+        this.FlagTKtips(Tips,Dtips);
+        this.setState({
+          yc : true
+        })
+        break;
+      case 2:
+        Tips = '待审核!'
+        this.FlagTKtips(Tips,Dtips);
+        this.setState({
+          yc : true,
+          title : Tips,
+          subTitle : '申请已经发起,请等待审核!'
+        })
+      break;
+      case 3:
+        Tips = '审核中!'
+        this.FlagTKtips(Tips,Dtips);
+        this.setState({
+          yc : true,
+          title : Tips,
+          subTitle : '申请已经发起,已开始审核,请等待结果!'
+        })
+      break;
+      case 4:
+        Tips = '审核通过!'
+        this.FlagTKtips(Tips,Dtips);
+        this.setState({
+          yc : true,
+          title : Tips,
+          subTitle : '审核已通过,正在入网入网,请等待结果!'
+        })
+      break;
+      case 5:
+        Tips = '审核不通过!'
+        this.FlagTKtips(Tips,Dtips);
+      break;
+      case 6:
+        Tips = '审核拒绝!'
+        this.FlagTKtips(Tips,Dtips);
+      break;
+      case 7:
+        Tips = '入网完成!'
+        this.FlagTKtips(Tips,Dtips);
+      break;
+    }
+    return Tips
+  }
+
+
   signout() {
     localStorage.setItem('isSignout', 'yes')
     localStorage.removeItem('userData') //退出清除用户本地数据
@@ -218,16 +291,16 @@ export default class App extends React.Component {
   }
 
   render() {
-    const { current, arr1, arr2, user_txt, signout, assembly, assembly_cw, yc ,jurs } = this.state;
+    const { current, arr1, arr2, user_txt, signout, assembly, assembly_cw, yc, jurs, jur, ktyc , title,subTitle } = this.state;
     const { SubMenu } = Menu;
     return (
       <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."
+              status="success"
+              title={title}
+              subTitle={subTitle}
             // extra={}
             />
           </div>
@@ -258,14 +331,14 @@ export default class App extends React.Component {
                     {jurs == true && <Menu.Item key={1} icon={<SettingOutlined />}>
                       高级设置
                     </Menu.Item>}
-                    
-                    <Menu.Item key={2} icon={<DollarCircleOutlined />}>
+
+                    {jur !== 2 && ktyc == true &&  <Menu.Item key={2} icon={<DollarCircleOutlined />}>
                       财务管理
-                    </Menu.Item>
+                    </Menu.Item>}
                   </Menu>
                 </div>
                 <div className='header_user' style={{ lineHeight: '60px' }}>
-                  <div style={{ width: '50%', lineHeight: '60px', float: 'left', whiteSpace: 'nowrap',textOverflow : 'ellipsis',overflow : 'hidden' }}>用户名 : {user_txt.userName}</div>
+                  <div style={{ width: '50%', lineHeight: '60px', float: 'left', whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' }}>用户名 : {user_txt.userName}</div>
                   <div style={{ width: '50%', lineHeight: '60px', float: 'left' }}>
                     {/* <a>修改密码</a> */}
                     <a style={{ marginLeft: '10px' }} onClick={this.signout.bind(this)}>退出</a>

src/common/ssq.js

@@ -13796,8 +13796,6 @@ const ssq = {
         { txt : '证件号码' , of : 'M', value : 'legalPersonIdNo'}, //默认必填
         { txt : '法人证件人像面路径' , of : 'M', value : 'legalIdCardProsPath'}, //默认必填
         { txt : '法人证件国徽面路径' , of : 'M', value : 'legalIdCardConsPath'}, //默认必填
-        { txt : '营业执照照片路径' , of : 'M', value : 'businessLicensePath'}, //默认必填
-        { txt : '开户许可证照片路径' , of : 'M', value : 'openAccountPath'}, //默认必填
         { txt : '法人银行卡图影印件路径' , of : 'M', value : 'legalPersonBankCardPath'}, //默认必填
         { txt : '开户名称' , of : 'M', value : 'accountName'}, //默认必填
         { txt : '开户账号' , of : 'M', value : 'bankCardNo'}, //默认必填
@@ -13901,7 +13899,7 @@ const ssq = {
     ],
     '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: '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' },
@@ -13914,9 +13912,9 @@ const ssq = {
         { txt: '其他资质文件路径', value: 'otherCerPath', txts: '格式限制为.jpg, .jpeg, .png, .pdf,最大不超过50M',type:'.jpg, .jpeg, .png, .pdf' },
     ],
     'options': [
-        { label: '网站', value: 'WEBSITE' },
+        // { label: '网站', value: 'WEBSITE' },
         { label: 'APP', value: 'APP' },
-        { label: '公众号', value: 'WECHAT_APPLET' },
+        // { label: '公众号', value: 'WECHAT_APPLET' },
     ],
     'contractS': [
         { txt: '浙江稠州商业银行', value: '888888' },

src/component/Cash-initiated/Cash-initiated.jsx

@@ -52,24 +52,28 @@ export default class AccountOverview extends React.Component {
             if( document.getElementById("pwd").value !== ''){
                 if(Number(this.state.data.withdrawBalance) > 0 && Number(this.state.data.withdrawBalance) >= Number(document.getElementById("je").value)){
                     if(this.state.isPwd == 1){
-                        let nums = 0.5;
-                        let that_ = this;
-                        let url = '/payment/merchant.pickup.groovy'
-                        let params = {
-                            action :"create",//提现
-                            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
-                            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源，2：app或社群 3：商户或店铺(香香或者嘉旺提供)
-                            withdrawAmount : Number(document.getElementById("je").value) + Number(nums),//提现金额以元为单位，默认都是人民币，以元为单位
-                            pwd : document.getElementById("pwd").value//String,交易密码
-                        }
-                        $Axios('get',url,params,(res) => {
-                            let status = res.data.head.status;
-                            if(status == 200){
-                                message.info('提交成功,请注意账户变更!');
-                            }else{
-                                message.info('提交失败,原因未知!');
+                        if(Number(document.getElementById("je").value) > 0.5){
+                            let nums = 0.5;
+                            let that_ = this;
+                            let url = '/payment/merchant.pickup.groovy'
+                            let params = {
+                                action :"create",//提现
+                                merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+                                merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源，2：app或社群 3：商户或店铺(香香或者嘉旺提供)
+                                withdrawAmount : Number(document.getElementById("je").value),//提现金额以元为单位，默认都是人民币，以元为单位
+                                pwd : document.getElementById("pwd").value//String,交易密码
                             }
-                        })
+                            $Axios('get',url,params,(res) => {
+                                let status = res.data.head.status;
+                                if(status == 200){
+                                    message.info('提交成功,请注意账户变更!');
+                                }else{
+                                    message.info('提交失败,原因未知!');
+                                }
+                            })
+                        }else{
+                            message.info('提现金额需大于手续费!');
+                        }
                     }else{
                         message.info('请先设置支付密码,再进行提现!');
                     }

src/component/Layout/Layout.jsx

@@ -13,7 +13,7 @@ export default class Layout extends React.Component {
         super(props)
         this.state = {
             headTxt: '商户入网 > 商户基本信息',
-            htmls: 3,
+            htmls: 1,
             initHtmls: 1,
             Params_o: {},
             Params_w: {},
@@ -50,6 +50,7 @@ export default class Layout extends React.Component {
     Validation_data(e) {
         let listArr = [];  //必填项数组
         let data = '';
+        let odatas = JSON.parse(localStorage.getItem('oData'));
         if (e == 1) {
             data = JSON.parse(localStorage.getItem('oData'));
             this.setState({
@@ -62,8 +63,7 @@ export default class Layout extends React.Component {
         if (e == 3) {
             data = JSON.parse(localStorage.getItem('sData'));
         }
-        console.log(this.state.registerRole)
-        if(this.state.registerRole == 'INDIVIDUAL_BUSINESS'){ //个体工商户必填项验证
+        if(odatas.registerRole == 'INDIVIDUAL_BUSINESS'){ //个体工商户必填项验证
             let datas = select_data.INDIVIDUAL_BUSINESS;
             if(data.desireAuth == 'DESIRE_MOBILEINFO'){ //手机短信验证 增加必填项
                 datas.push({ txt : '法人手机号' , of : 'M', value : 'legalPersonPhoneNo'})
@@ -79,12 +79,11 @@ export default class Layout extends React.Component {
                 }
             })
             
-        }else if(this.state.registerRole == 'NATURAL_PERSON'){ //自然人必填项验证
+        }else if(odatas.registerRole == 'NATURAL_PERSON'){ //自然人必填项验证
             let datas = select_data.NATURAL_PERSON;  //必填项列表
             datas.map((item,index) => {  
                 let s = item.value;
                 for(let key  in data){
-                    console.log(key)
                     if(key == s){
                         if(data[key] == ''){
                             listArr.push(key)
@@ -171,10 +170,8 @@ export default class Layout extends React.Component {
         let headTxt = '商户入网 > 结算信息'
         let that_ = this;
         that_.setState({lodings : true});
-
         that_.CenterW.childMethod()  //第一页跳第二页保存第一页数据
         let list = that_.Validation_data(2);//验证第一页必填项是否填写，获取未填写的必填项
-        console.log(list)
         that_.CenterW.verification(list)  //发送给组件 未填写必填项 给出提示
         let flag = list.length > 0 ? false : true;  //list长度大于0 代表有必填项未填写
         if(flag == false){
@@ -220,7 +217,6 @@ export default class Layout extends React.Component {
     }
 
     getParams_w = (result, msg) => {
-        // console.log(msg)
         this.setState({
             Params_w: msg
         })
@@ -234,8 +230,10 @@ export default class Layout extends React.Component {
 
     btnClick() {
         let that_ = this;
-        this.CenterS.childMethod(); //提取第三页数据
-        let flag = that_.Validation_data(3);//验证第二页数据 所有必填项是否获得数据
+        that_.CenterS.childMethod(); //提取第三页数据
+        let list = that_.Validation_data(3);//验证第一页必填项是否填写，获取未填写的必填项
+        that_.CenterS.verification(list)  //发送给组件 未填写必填项 给出提示
+        let flag = list.length > 0 ? false : true;  //list长度大于0 代表有必填项未填写
         that_.setState({lodings : true});
         if(flag == false){
             that_.setState({lodings : false})
@@ -288,41 +286,36 @@ export default class Layout extends React.Component {
             }
         }
         let contactName = JSON.parse(odata).contactName;
-        let legalPersonName = JSON.parse(odata).legalPersonName;
-        let legalPersonName_2 = JSON.parse(wdata).legalPersonName;
+        let legalPersonName = 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('联系人姓名需与资质信息内法人姓名一致')
-            }
+        if(contactName == legalPersonName && contactName == accountName){
+            $Axios('get', url, params, (res) => {
+                let data = res.data;
+                let status = res.data.head.status;
+                that_.countDownTK(status,data)
+                that_.setState({lodings : false});
+            })
         }else{
-            that_.messageTK('联系人姓名需与基本信息内法人姓名一致')
+            that_.messageTK('联系人姓名需与法人姓名和开户名称一致!')
         }
        
     }
 
+
+    countDownTK(e,data){
+        let Tips = '';
+        switch(e){
+            case 700:
+                Tips = data.body;
+                this.countDown(Tips)
+              break;
+            case 200:
+                Tips = data.body.msg;
+                this.countDown(Tips)
+                break;
+          }
+    }
+
     handleOk_c(){  //关闭弹框
         this.setState({
             isModalVisibleImg : false,
@@ -341,7 +334,7 @@ export default class Layout extends React.Component {
 
 
     render() {
-        const { headTxt, htmls , lodings , btnType ,isModalVisibleImg , modalTxt } = this.state;
+        const { headTxt, htmls , lodings , btnType  } = this.state;
         return (
             <div className={styleData.rootDom}>
                 <div className={styleData.header_center}>

src/component/center-o/centerO.jsx

@@ -60,6 +60,19 @@ export default class centerO extends React.Component {
                     regionlist: regionlist.mallAreaList
                 })
             }
+            if(this.state.Params.registerRole == 'INDIVIDUAL_BUSINESS'){ //个体工商户
+                this.setState({
+                    offlist:select_data.INDIVIDUAL_BUSINESS
+                })
+            }else if(this.state.Params.registerRole == 'NATURAL_PERSON'){  //自然人
+                this.setState({
+                    offlist:select_data.NATURAL_PERSON
+                })
+            }else { //默认
+                this.setState({
+                    offlist:select_data.offlist
+                })
+            }
         }
     }
 
@@ -116,7 +129,6 @@ export default class centerO extends React.Component {
     handleChangeZs(e) {  //商户证书类型
         let cerType = e;
         this.state.Params.cerType = cerType;
-        // console.log(this.state.Params)
     }
 
     province_select(e) {  //选择省
@@ -174,7 +186,6 @@ export default class centerO extends React.Component {
     }
 
     verification(e) { //暴露给父组件的方法,验证当前页面必填项
-        console.log(e);
         this.setState({
             validation_list : e
         })
@@ -214,7 +225,6 @@ export default class centerO extends React.Component {
                  >
                 <div className='center_left'>
                     <div className='c-x' style={{height : '50px'}}>
-                        {/* <div className='titles'> 商户入网类型{this.listTypes('signedType') == true && <i className='label_x'>*</i>} ： </div> */}
                         <Form.Item
                             label="商户入网类型"
                             name="signedType"
@@ -228,7 +238,6 @@ export default class centerO extends React.Component {
                         
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles'> 签约名称{this.listTypes('signedName') == true && <i className='label_x'>*</i>}  ： </div> */}
                         <div className='inputs'>
                             <Form.Item
                                 label="签约名称"
@@ -240,11 +249,9 @@ export default class centerO extends React.Component {
                             >
                                 <Input id='qymc' style={{ width: 200 }} placeholder='请输入签约名称' defaultValue={Params.signedName} />
                             </Form.Item>
-                            {/* <Input id='qymc' placeholder='请输入签约名称' defaultValue={Params.signedName} /> */}
                         </div>
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles'> 商户签约性质{this.listTypes('registerRole') == true && <i className='label_x'>*</i>}  ： </div> */}
                         <Form.Item
                                 label="商户签约性质"
                                 name="registerRole"
@@ -269,7 +276,6 @@ export default class centerO extends React.Component {
                        
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles'> 证书类型{this.listTypes('cerType') == true && <i className='label_x'>*</i>} ： </div> */}
                             <Form.Item
                                 label="证书类型"
                                 name="cerType"
@@ -293,7 +299,6 @@ export default class centerO extends React.Component {
                             </Form.Item>
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles'> 商户简称{this.listTypes('signedShorthand') == true && <i className='label_x'>*</i>}  ： </div> */}
                             <Form.Item
                                 label="商户简称"
                                 name="signedShorthand"
@@ -304,7 +309,6 @@ export default class centerO extends React.Component {
                             >
                                 <Input id='names' style={{ width: 200 }} placeholder='请输入商户简称' defaultValue={Params.signedShorthand} />
                             </Form.Item>
-                        {/* <div className='inputs'><Input id='names' placeholder="请输入商户简称" defaultValue={Params.signedShorthand} /></div> */}
                     </div>
                     <div className='c-l'>
                             <Form.Item
@@ -317,8 +321,6 @@ export default class centerO extends React.Component {
                             >
                                 <Input id='myname' style={{ width: 200 }} placeholder='请输入商户简称' defaultValue={Params.contactName} />
                             </Form.Item>
-                        {/* <div className='titles'> 联系人姓名{this.listTypes('contactName') == true && <i className='label_x'>*</i>}  ： </div>
-                        <div className='inputs'><Input id='myname' placeholder="请输入联系人姓名" defaultValue={Params.contactName} /></div> */}
                     </div>
                     <div className='c-l'>
                             <Form.Item
@@ -331,8 +333,6 @@ export default class centerO extends React.Component {
                             >
                                 <Input id='mymail' style={{ width: 200 }} placeholder='请输入商户简称' defaultValue={Params.contactEmail} />
                             </Form.Item>
-                        {/* <div className='titles'> 联系人邮箱{this.listTypes('contactEmail') == true && <i className='label_x'>*</i>}  ： </div>
-                        <div className='inputs'><Input id='mymail' placeholder="请输入联系人邮箱" defaultValue={Params.contactEmail} /></div> */}
                     </div>
                     <div className='c-l'>
                         <Form.Item
@@ -345,13 +345,10 @@ export default class centerO extends React.Component {
                             >
                                 <Input id='mynums' style={{ width: 200 }} placeholder="请输入联系人电话" onChange={this.inputDatas.bind(this)} defaultValue={Params.contactPhone} />
                             </Form.Item>
-                        {/* <div className='titles'> 联系人电话{this.listTypes('contactPhone') == true && <i className='label_x'>*</i>}  ： </div> */}
-                        {/* <div className='inputs'><Input id='mynums' placeholder="请输入联系人电话" onChange={this.inputDatas.bind(this)} defaultValue={Params.contactPhone} /></div> */}
                     </div>
                 </div>
                 <div className='center_right'>
                     <div className='c-l' style={{marginTop : '10px'}}>
-                        {/* <div className='titles_o'> 经营地址省{this.listTypes('businessAddressProvince') == true && <i className='label_x'>*</i>}  ： </div> */}
                             <Form.Item
                                 label="经营地址省"
                                 name="businessAddressProvince"
@@ -369,7 +366,6 @@ export default class centerO extends React.Component {
                         
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles_o'> 经营地址市{this.listTypes('businessAddressCity') == true && <i className='label_x'>*</i>}  ： </div> */}
                         <Form.Item
                             label="经营地址市"
                             name="businessAddressCity"
@@ -399,12 +395,9 @@ export default class centerO extends React.Component {
                                     <Option key={index} value={item.areaCode}>{item.areaName}</Option>
                                 ))}
                             </Select>
-                        </Form.Item>
-                        {/* <div className='titles_o'> 经营地址区{this.listTypes('businessAddressArea') == true && <i className='label_x'>*</i>} ： </div> */}
-                        
+                        </Form.Item>                       
                     </div>
                     <div className='c-x' style={{marginBottom : '30px'}}>
-                        {/* <div className='titles_txt'> 经营地址{this.listTypes('businessAddress') == true && <i className='label_x'>*</i>}  ： </div> */}
                         <Form.Item
                             label="经营地址区"
                             name="businessAddress"
@@ -420,7 +413,6 @@ export default class centerO extends React.Component {
                        
                     </div>
                     <div className='c-l'>
-                        {/* <div className='titles_o'> 业务类型{this.listTypes('businessClassification') == true && <i className='label_x'>*</i>} ： </div> */}
                         <Form.Item
                             label="业务类型"
                             name="businessClassification"
@@ -451,9 +443,7 @@ export default class centerO extends React.Component {
                                 <Radio value='DESIRE_MOBILEINFO'>手机短信验证</Radio>
                                 <Radio value='DESIRE_NONEED'>其他验证方式</Radio>
                             </Radio.Group>
-                        </Form.Item>
-                        {/* <div className='titles_o'> 开户意愿核实类型{this.listTypes('desireAuth') == true && <i className='label_x'>*</i>} ： </div> */}
-                        
+                        </Form.Item>                       
                     </div>
                     {
                         desireAuth == 'DESIRE_MOBILEINFO' &&
@@ -469,8 +459,6 @@ export default class centerO extends React.Component {
                                 >
                                     <Input id='myname3' style={{ width: 200 }} placeholder="请输入法人手机号" defaultValue={Params.legalPersonPhoneNo} />
                                 </Form.Item>
-                                {/* <div className='titles_o'> 法人手机号<i className='label_x'>*</i> ： </div>
-                                <div className='inputs'><Input id='myname3' placeholder="请输入法人手机号" defaultValue={Params.legalPersonPhoneNo} /></div> */}
                             </div>
                         </div>
                     }

src/component/center-s/centerS.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Select, Input  } from 'antd';
+import { Radio, Select, Input, Form } from 'antd';
 // import { $Axios } from '../../common/publish';
 import select_data from '../../common/ssq';
 import '../center-s/centerS.scss'
@@ -8,28 +8,32 @@ export default class centerS extends React.Component {
     constructor(props) {
         super(props)
         this.state = {
-            selectData : select_data,
-            Params : this.props.arr,
-            cityOs : true,
-            citylist : [],
-            registerRole : '', //1为自然人2为企业
-            registerRoleTxt : '', //是否为个体工商户
-            regisClick : ''
+            selectData: select_data,
+            Params: this.props.arr,
+            cityOs: true,
+            citylist: [],
+            registerRole: '', //1为自然人2为企业
+            registerRoleTxt: '', //是否为个体工商户
+            regisClick: '',
+            offlist: select_data.offlist,
+            validation_list: [],
+            form_width: 200,
+            contactName : JSON.parse(localStorage.getItem('oData')).contactName
         }
-        
+
     }
-	
-	componentDidMount() {
+
+    componentDidMount() {
         this.props.onRef(this)
         let selectData = this.state.selectData;
-        let registerRole = selectData.contract.find((item,index) =>{
+        let registerRole = selectData.contract.find((item, index) => {
             return item.value == JSON.parse(localStorage.getItem('oData')).registerRole;
         });
 
         this.setState({
-            registerRole : registerRole.type,
-            registerRoleTxt : registerRole.txt,
-            regisClick : registerRole.type == 1 ? 'PRIVATE' : 'PUBLIC'
+            registerRole: registerRole.type,
+            registerRoleTxt: registerRole.txt,
+            regisClick: registerRole.type == 1 ? 'PRIVATE' : 'PUBLIC'
         })
         this.initData();
     }
@@ -38,40 +42,42 @@ export default class centerS extends React.Component {
         this.props.parent.getParams_s(this, data)
     }
 
-    initData(){
-        if(this.props.arr){  //初始化判断数据回填
-            if(this.state.Params.provinceCode !== undefined && this.state.Params.provinceCode !== ''){ // 判断回填数据内是否有省编码
+    initData() {
+        if (this.props.arr) {  //初始化判断数据回填
+            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}); //抽取省编码内下的城市列表数据
+                let cityList = data.find((item, index) => { return Province == item.provinceCode }); //抽取省编码内下的城市列表数据
                 this.setState({  //重新设置数据
-                    cityOs : false,
-                    citylist : cityList.mallCityList,
+                    cityOs: false,
+                    citylist: cityList.mallCityList,
                 })
-            }else{
+            } else {
 
             }
         }
     }
 
-    InputSdata(e){
+    InputSdata(e) {
         let Params = {
-            bankCode : 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,//提现费率类型
-            withdrawRate : document.getElementById("withdrawRate").value,//提现费率
+            bankCode: 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: '',//提现费率
         }
-        localStorage.setItem('sData',JSON.stringify(Params))
+        localStorage.setItem('sData', JSON.stringify(Params))
         return Params
     }
 
-    childMethod () { //暴露给父组件的方法,集合当前页面拿到的参数存入缓存
+    childMethod() { //暴露给父组件的方法,集合当前页面拿到的参数存入缓存
         let data = this.InputSdata();
         this.toParent(data)
     }
@@ -84,99 +90,212 @@ export default class centerS extends React.Component {
         this.state.Params.bankCode = value;
     }
 
-    selectChange_2(value){ //省编码选择
+    selectChange_2(value) { //省编码选择
         this.state.Params.provinceCode = value;
-        let citylist = this.state.selectData.Area.find((item,index) => { return value == item.provinceCode});
+        let citylist = this.state.selectData.Area.find((item, index) => { return value == item.provinceCode });
         this.setState({
-            cityOs : false,
-            citylist :  citylist.mallCityList,
+            cityOs: false,
+            citylist: citylist.mallCityList,
         });
     }
-    
-    selectChange_3(value){ //市编码选择
+
+    selectChange_3(value) { //市编码选择
         this.state.Params.cityCode = value;
     }
-    
-    onChangeRadio(e){
+
+    onChangeRadio(e) {
         let accountType = e.target.value;
         this.state.Params.accountType = accountType;
         this.setState({
-            regisClick : accountType
+            regisClick: accountType
         })
     }
 
-    onChangeRadio_s(e){
+    onChangeRadio_s(e) {
         let withdrawRateType = e;
         this.state.Params.withdrawRateType = withdrawRateType;
     }
 
+    listTypes(e) {
+        let data = this.state.offlist;
+        let type = data.find((item, index) => { return item.value == e });
+        if (type !== undefined) {
+            type = true
+        } else {
+            type = false
+        }
+        return type
+    }
+
+    verification(e) { //暴露给父组件的方法,验证当前页面必填项
+        this.setState({
+            validation_list: e,
+        })
+    }
+
     render() {
-        const { selectData, cityOs , citylist ,Params ,registerRoleTxt ,registerRole , regisClick} = this.state;
+        const { selectData, cityOs, citylist, Params, contactName, registerRole, regisClick, validation_list, form_width } = this.state;
         const { Option } = Select;
         const { TextArea } = Input;
-        return(
+        const layout = {
+            labelCol: { span: 4 },
+        };
+        const onFinish = (values) => {
+            // console.log('xxx: ', values);
+        };
+        return (
             <div className='center_up'>
                 <div className='center_left'>
-                    <div className='c-l'>
-                        <div className='titles'> 开户行{regisClick == 'PUBLIC' && <i className='label_x'>*</i>} ： </div>
-                        <Select size='default' placeholder="请选择开户行" defaultValue={Params.bankCode}  onChange={ this.selectChange_1.bind(this) } style={{ width: 200 }}>
-                                            {selectData.contractS.map((item,index) => (
-                                                <Option key={index} value={item.value}>{item.txt}</Option>
-                                            ))}
-                                        </Select>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 支行名称{regisClick == 'PUBLIC' && <i className='label_x'>*</i>} ： </div>
-                        <div className='inputs'><Input id='bankBranchName' defaultValue={Params.bankBranchName} placeholder="请输入支行名称" /></div>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 开户名称<i className='label_x'>*</i> ： </div>
-                        <div className='inputs'><Input id='accountName' defaultValue={Params.accountName} placeholder="请输入开户名称" /></div>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 开户账号<i className='label_x'>*</i> ： </div>
-                        <div className='inputs'><Input id='bankCardNo' defaultValue={Params.bankCardNo}  placeholder="请输入开户账号" /></div>
-                    </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 }}>
-                                            {selectData.Area.map((item,index) => (
-                                                <Option key={index} value={item.provinceCode}>{item.provinceName}-{item.provinceCode}</Option>
-                                            ))}
-                                        </Select>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 市编码<i className='label_x'>*</i> ： </div>
-                        <Select size='default' placeholder="请选择市编码" defaultValue={Params.cityCode}  onChange={ this.selectChange_3.bind(this) } style={{ width: 200 }} disabled={cityOs}>
-                                            {citylist.map((item,index) => (
-                                                        <Option key={index} value={item.cityCode}>{item.cityName}-{item.cityCode}</Option>
-                                                    ))}
-                                        </Select>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 结算银行卡属性{registerRoleTxt == '个体工商户' && <i className='label_x'>*</i>} ： </div>
-                        <Radio.Group name="radiogroup" defaultValue={Params.accountType == undefined ? registerRole == 2 ? 'PUBLIC' : 'PRIVATE' : Params.accountType} onChange={this.onChangeRadio.bind(this) }>
-                                            <Radio value='PUBLIC'>对公</Radio>
-                                            <Radio value='PRIVATE'>对私</Radio>
-                                        </Radio.Group>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 清算方式 ： </div>
-                        <Radio.Group name="radiogroup" defaultValue='WITHDRAW'>
-                                            <Radio value='WITHDRAW'>提现</Radio>
-                                        </Radio.Group>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 提现费率类型 ： </div>
-                        <Select size='default' placeholder="请选择提现费率类型" defaultValue={Params.withdrawRateType == undefined ? 'SINGLE' : Params.withdrawRateType}   style={{ width: 200 }} onChange={this.onChangeRadio_s.bind(this) }>
-                                            <Option key='SINGLE' value='SINGLE'>单笔</Option>
-                                            <Option key='RATE' value='RATE'>百分比</Option>
-                                        </Select>
-                    </div>
-                    <div className='c-l'>
-                        <div className='titles'> 提现费率<i className='label_x'>*</i>  ： </div>
-                        <div className='inputs'><Input id='withdrawRate' defaultValue={Params.withdrawRate} placeholder="请输入提现费率" /></div>
-                    </div>
+                    <Form
+                        {...layout}
+                        onFinish={onFinish}
+                        initialValues={{  //数据回填
+                            accountName : contactName
+                        }}
+                    >
+                        <div className='c-l'>
+                            <Form.Item
+                                label="开户行"
+                                name="bankCode"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('bankCode') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'bankCode' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'bankCode' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Select size='default' placeholder="请选择开户行" defaultValue={Params.bankCode} onChange={this.selectChange_1.bind(this)} style={{ width: 200 }}>
+                                    {selectData.contractS.map((item, index) => (
+                                        <Option key={index} value={item.value}>{item.txt}</Option>
+                                    ))}
+                                </Select>
+                            </Form.Item>
+
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="支行名称"
+                                name="bankBranchName"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('bankBranchName') == true ? true : false, message: '' }]}
+                                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="请输入支行名称" />
+                            </Form.Item>
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="开户名称"
+                                name="accountName"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('accountName') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'accountName' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'accountName' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Input id='accountName' style={{ width: form_width }}  placeholder="请输入开户名称" disabled />
+                            </Form.Item>
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="开户账号"
+                                name="bankCardNo"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('bankCardNo') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'bankCardNo' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'bankCardNo' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Input id='bankCardNo' style={{ width: form_width }} defaultValue={Params.bankCardNo} placeholder="请输入开户账号" />
+                            </Form.Item>
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="省编码"
+                                name="provinceCode"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('provinceCode') == true ? true : false, message: '' }]}
+                                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 }}>
+                                    {selectData.Area.map((item, index) => (
+                                        <Option key={index} value={item.provinceCode}>{item.provinceName}-{item.provinceCode}</Option>
+                                    ))}
+                                </Select>
+                            </Form.Item>
+
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="市编码"
+                                name="cityCode"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('cityCode') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'cityCode' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'cityCode' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Select size='default' placeholder="请选择市编码" defaultValue={Params.cityCode} onChange={this.selectChange_3.bind(this)} style={{ width: 200 }} disabled={cityOs}>
+                                    {citylist.map((item, index) => (
+                                        <Option key={index} value={item.cityCode}>{item.cityName}-{item.cityCode}</Option>
+                                    ))}
+                                </Select>
+                            </Form.Item>
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="结算银行卡属性"
+                                name="accountType"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('accountType') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'accountType' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'accountType' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Radio.Group name="radiogroup" defaultValue={Params.accountType == undefined ? registerRole == 2 ? 'PUBLIC' : 'PRIVATE' : Params.accountType} onChange={this.onChangeRadio.bind(this)}>
+                                    <Radio value='PUBLIC'>对公</Radio>
+                                    <Radio value='PRIVATE'>对私</Radio>
+                                </Radio.Group>
+                            </Form.Item>
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="清算方式"
+                                name="accountType"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('accountType') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'accountType' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'accountType' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Radio.Group name="radiogroup" defaultValue='WITHDRAW'>
+                                    <Radio value='WITHDRAW'>提现</Radio>
+                                </Radio.Group>
+                            </Form.Item>                       
+                        </div>
+                        {/* <div className='c-l'>
+                            <Form.Item
+                                label="提现费率类型"
+                                name="withdrawRateType"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('withdrawRateType') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'withdrawRateType' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'withdrawRateType' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Select size='default' placeholder="请选择提现费率类型" defaultValue={Params.withdrawRateType == undefined ? 'SINGLE' : Params.withdrawRateType} style={{ width: 200 }} onChange={this.onChangeRadio_s.bind(this)}>
+                                    <Option key='SINGLE' value='SINGLE'>单笔</Option>
+                                    <Option key='RATE' value='RATE'>百分比</Option>
+                                </Select>
+                            </Form.Item>                           
+                        </div>
+                        <div className='c-l'>
+                            <Form.Item
+                                label="提现费率"
+                                name="withdrawRate"
+                                labelCol={{ style: { width: 150 } }}
+                                rules={[{ required: this.listTypes('withdrawRate') == true ? true : false, message: '' }]}
+                                validateStatus={validation_list.find((item, index) => { return item == 'withdrawRate' }) !== undefined ? 'error' : null}
+                                help={validation_list.find((item, index) => { return item == 'withdrawRate' }) !== undefined ? '此项为必填项!' : null}
+                            >
+                                <Input id='withdrawRate' style={{ width : form_width}} defaultValue={Params.withdrawRate} placeholder="请输入提现费率" />
+                            </Form.Item>
+                        </div> */}
+                    </Form>
                 </div>
                 <div className='center_right'> </div>
             </div>

src/component/center-w/centerW.jsx

@@ -44,7 +44,9 @@ export default class centerW extends React.Component {
             scLodings: null,
             offlist: select_data.offlist,
             validation_list: [],
-            form_width: 200
+            form_width: 200,
+            registerRole : null,
+            contactName : JSON.parse(localStorage.getItem('oData')).contactName
         }
 
     }
@@ -74,7 +76,6 @@ export default class centerW extends React.Component {
                 offlist: select_data.offlist
             })
         }
-        console.log(registerRole)
     }
 
     toParent = (data) => {
@@ -151,7 +152,6 @@ export default class centerW extends React.Component {
     }
 
     CheckChange(e) {
-        console.log(e)
         this.state.Params.tradingScenarios = e.toString()
     }
 
@@ -326,6 +326,7 @@ export default class centerW extends React.Component {
     }
 
     verification(e) { //暴露给父组件的方法,验证当前页面必填项
+        console.log(e)
         this.setState({
             validation_list : e,
             rightArray : this.state.rightArray
@@ -333,26 +334,22 @@ export default class centerW extends React.Component {
     }
 
     render() {
-        const { selectData, Params, signedType, rightArray, headerProps, scLodings, imgType, validation_list, form_width } = this.state;
+        const { selectData, Params, rightArray, headerProps, scLodings, imgType, validation_list, form_width , registerRole , contactName } = this.state;
         const { Option } = Select;
         const layout = {
             labelCol: { span: 4 },
         };
+        console.log(contactName)
         const onFinish = (values) => {
-            console.log('xxx: ', values);
+            // console.log('xxx: ', values);
         };
-        console.log(Params)
-        console.log(validation_list)
-        let s = validation_list.find((item, index) => { return item === 'businessLicensePath'}) ;
-        console.log(s)
-        // Params.profession = 8
         return (
             <div className={styleData.center_up}>
                 <Form
                     {...layout}
                     onFinish={onFinish}
                     initialValues={{  //数据回填
-                        'legalPersonName' : Params.legalPersonName == undefined ? '' : Params.legalPersonName, 
+                        legalPersonName : contactName, 
                         'tradingScenarios':  Params.tradingScenarios == undefined ? ['WEBSITE'] : Params.tradingScenarios, 
                         'profession' : Params.profession == undefined ? null : Params.profession, 
                         'legalPersonIdType' : Params.legalPersonIdType == undefined ? null : Params.legalPersonIdType, 
@@ -362,26 +359,26 @@ export default class centerW extends React.Component {
                     <div className={styleData.center_left}>
                         <div className={styleData.cl}>
                             <Form.Item
-                                label="法人姓名"
+                                label={registerRole && registerRole == 'NATURAL_PERSON' ? '姓名' : '法人姓名'}
                                 name="legalPersonName"
                                 labelCol={{ style: { width: 150 } }}
                                 rules={[{ required: this.listTypes('legalPersonName') == true ? true : false, message: '' }]}
                                 validateStatus={validation_list.find((item, index) => { return item == 'legalPersonName' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'legalPersonName' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Input id='legalPersonName' style={{ width: form_width }} placeholder="请输入法人姓名" />
+                                <Input id='legalPersonName' style={{ width: form_width }} defaultValue={contactName} placeholder={registerRole && registerRole == 'NATURAL_PERSON' ? '请输入姓名' : '请输入法人姓名'}  disabled />
                             </Form.Item>
                         </div>
                         <div className={styleData.cl}>
                             <Form.Item
-                                label="法人职业"
+                                label={registerRole && registerRole == 'NATURAL_PERSON' ? '职业' : '法人职业'}
                                 name="profession"
                                 labelCol={{ style: { width: 150 } }}
                                 rules={[{ required: this.listTypes('profession') == true ? true : false, message: '' }]}
                                 validateStatus={validation_list.find((item, index) => { return item == 'profession' }) !== undefined ? 'error' : null}
                                 help={validation_list.find((item, index) => { return item == 'profession' }) !== undefined ? '此项为必填项!' : null}
                             >
-                                <Select size='default' placeholder="请选择法人职业"  onChange={this.selectChange_1.bind(this)} style={{ width: 200 }}>
+                                <Select size='default' placeholder={registerRole && registerRole == 'NATURAL_PERSON' ? '请选择职业' : '请选择法人职业'}  onChange={this.selectChange_1.bind(this)} style={{ width: 200 }}>
                                     {selectData.contractW.map((item, index) => (
                                         <Option key={index} value={item.value}>{item.txt}</Option>
                                     ))}

src/component/moduleCss/style.module.scss

@@ -59,7 +59,7 @@
             width: 100%;
             height: 50px;
             line-height: 50px;
-            margin-bottom: 2px;
+            margin-bottom: 1px;
         }
     }
     .center_right{