Browse Source

增加功能跳转及CSS模块化

lvzhuo 3 years ago
parent
commit
685f1b3dcb

+ 36 - 3
src/App.css

@@ -112,8 +112,41 @@
   float: left;
 }
 .ant-table-thead > tr > th{
+  padding: 15px 16px !important;
   white-space:nowrap;
-  }
-  .ant-table-row td{
+}
+.ant-table-row td{
+  padding: 15px 16px !important;
   white-space:nowrap;
-  }
+}
+
+
+/*整个滚动条*/ 
+::-webkit-scrollbar {
+ 
+  width: 5px;
+ 
+  height: 8px;
+ 
+  background-color: #fff;
+ 
+}
+ 
+/*定义滚动条轨道*/
+ 
+::-webkit-scrollbar-track {
+ 
+  background-color: #fff;
+ 
+}
+ 
+/*定义滑块*/
+ 
+::-webkit-scrollbar-thumb {
+ 
+  background-color: #ACB1BF;
+ 
+  border-radius: 4px;
+ 
+}
+  

+ 20 - 29
src/App.js

@@ -22,9 +22,9 @@ export default class App extends React.Component {
         { txt: '商户入网列表', icon: 'SlidersOutlined', assembly: 'center-tab' }   // ok 1-1
       ],
       arr2: [
-        { txt: '订单查询', icon: '', assembly: 'Finance-orderQuery' },//ok  2-0
-        { txt: '退款查询', icon: '', assembly: 'Refund-inquiry' },  //ok  2-1
-        { txt: '账户概览', icon: '', assembly: 'Account-overview' },  //ok 2-2
+        { txt: '账户概览', icon: '', assembly: 'Account-overview' },  //ok 2-0
+        { txt: '订单查询', icon: '', assembly: 'Finance-orderQuery' },//ok  2-1
+        { txt: '退款查询', icon: '', assembly: 'Refund-inquiry' },  //ok  2-2
         { txt: '发起提现', icon: '', assembly: 'Cash-initiated' }, //ok 2-3
         { txt: '提现记录', icon: '', assembly: 'Withdrawal-record' }, //ok 2-4
         { txt: '分账收益记录', icon: '', assembly: 'Income-record' }, //ok 2-5
@@ -32,7 +32,7 @@ export default class App extends React.Component {
       ],
       assembly: 'Layout',
       defaultSelectedKeys: 'Layout',
-      assembly_cw: 'Finance-orderQuery',
+      assembly_cw: 'Account-overview',
       user_txt: {},
       signout: false,
       isSignout : 'no'
@@ -43,17 +43,7 @@ export default class App extends React.Component {
   componentDidMount() {
     let isSignout = localStorage.getItem('isSignout');
     let userData = cookie.load('userInformation')
-    // let obj = {   //默认信息
-    //   userName: '测试用户',
-    //   appName: 'com.smrongshengtianxia',
-    //   merchantId: '896582034',
-    //   id: 2,
-    //   pfAppName: 'com.chuangyetong', //包名
-    //   Jur : 1,//用户权限
-    //   pages : '2-0' 
-    // }
-    // cookie.save('userInformation', obj);
-    
+    // console.log(userData)
     // if(isSignout == 'yes' && userData == undefined){ //拦截是否为刷新页面
     //   this.setState({
     //     signout : true
@@ -67,28 +57,31 @@ export default class App extends React.Component {
     console.log(process.env.NODE_ENV == 'development' ? '----------开发测试环境----------' : '----------线上生产环境----------')
     // this.autoLogin() //登录查询用户信息
     let userData = cookie.load('userInformation');
-    // console.log(userData)
+    // let userData = '%7B%22userName%22%3A%22limx001%22%2C%22merchantNo%22%3A%22com.chuangyetong%22%2C%22mallId%22%3A%22com.chuangyetong%22%2C%22Jur%22%3A1%2C%22pages%22%3A%221-0%22%2C%22merchantType%22%3A2%7D'
+    // let s1 = '%7B%22userName%22%3A%22%u4E2D%u641C%u670D%u52A1%u53F7%28%u5DF2%u8BA4%u8BC1%29%22%2C%22mallId%22%3A%221%22%2C%22merchantNo%22%3A1154%2C%22Jur%22%3A2%2C%22pages%22%3A%221-0%22%2C%22merchantType%22%3A3%7D'
+    // console.log(JSON.parse(unescape(s)))
+    // console.log(unescape(s))
+    // console.log(unescape(s1))
     let obj = {   //默认信息
       userName: '测试用户',
-      appName: 'com.smrongshengtianxia',
-      merchantId: '896582034',
-      id: 2,
-      pfAppName: 'com.chuangyetong', //包名
+      mallId : '', //多商户所属商城id
+      merchantNo : 'com.smrongshengtianxia',//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+      merchantType : 2 ,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
       Jur : 1,//用户权限
       pages : '2-0' 
     }
     if (userData !== undefined) {  //能获取用户信息 改变存储信息
+      userData = JSON.parse(unescape(userData));
       obj = {
         userName: userData.userName, //用户名
-        appName: userData.appName,  //appName
-        merchantId: userData.merchantId,  //merchantId
-        id: userData.id,  //id
-        userId: userData.userId,
-        pfAppName: userData.pfAppName, //包名
+        mallId : userData.mallId, //多商户所属商城id
+        merchantNo : userData.merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+        merchantType :userData.merchantType,//入网来源,2:app或社群3:商户或店铺(香香或者嘉旺提供)
         Jur : userData.Jur, //用户权限 1为云悦平台权限最高权限  //2为商城权限二级权限  // 3为商户权限属于个人权限;
         pages : userData.pages   //支持页面跳转
       }
     }
+    
     let page = obj.pages.split('-');
     if(page[0] == 1){
       let arr = this.state.arr1;
@@ -105,9 +98,7 @@ export default class App extends React.Component {
         assembly_cw : arr.find((item,index) => { return index == page[1]}).assembly
       })
     }
-  
     localStorage.setItem('userData', JSON.stringify(obj))
-
   }
 
   handleClick(e) {
@@ -125,7 +116,7 @@ export default class App extends React.Component {
 
   toggleNavs(e) {
     let current = this.state.current;
-    if (current == 'one') {
+    if (current == 1) {
       this.setState({
         assembly: e.key,
       });
@@ -139,7 +130,7 @@ export default class App extends React.Component {
   initassembly() {
     let current = this.state.current;
     let Assembly = null;
-    if (current == 'one') {
+    if (current == 1) {
       Assembly = React.lazy(() => import(`./component/${this.state.assembly}/${this.state.assembly}.jsx`));
     } else {
       Assembly = React.lazy(() => import(`./component/${this.state.assembly_cw}/${this.state.assembly_cw}.jsx`));

+ 14 - 11
src/component/Account-overview/Account-overview.jsx

@@ -38,7 +38,8 @@ export default class AccountOverview extends React.Component {
         let url = '/payment/merchant.query.groovy'
         let params = {
             action: 'queryGeneral',//查询商户概览信息
-            appName: JSON.parse(localStorage.getItem('userData')).appName//当前商户的appname,
+            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
         }
         $Axios('get', url, params, (res) => {
             let status = res.data.head.status;
@@ -75,7 +76,8 @@ export default class AccountOverview extends React.Component {
         let url = '/payment/merchant.pwd.update.groovy'
         let params = {
             action: 'queryGeneral',//查询商户概览信息
-            appName: JSON.parse(localStorage.getItem('userData')).appName//当前商户的appname,
+            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
         }
         $Axios('get', url, params, (res) => {
             let status = res.data.head.status;
@@ -116,10 +118,9 @@ export default class AccountOverview extends React.Component {
                         let that_ = this;
                         let url = '/payment/merchant.pwd.update.groovy'
                         let params = {
-                            id: JSON.parse(localStorage.getItem('userData')).id,//商户id
+                            id: this.state.data.id,//商户id
                             pwd: document.getElementById("pwd").value,//密码
                             mobile: this.state.data.contactPhone,//手机号
-                            // mobile : 17600982892,//手机号
                             code: document.getElementById("num1").value,//验证码
                             pfAppName: JSON.parse(localStorage.getItem('userData')).pfAppName, //包名
                         }
@@ -325,7 +326,7 @@ export default class AccountOverview extends React.Component {
                 >
                     <div>
                         <div className='c-ls'>
-                            <test className='titles_tk'>手机号 :</test>
+                            <div className='titles_tk'>手机号 :</div>
                             <div className='titles_num'><Input id='orderNo' disabled={true} defaultValue={data.contactPhone == '' ? 17600982892 : data.contactPhone} /></div>
                             {t == '' && <Button key="submit" type="primary" onClick={this.handleOk_yzm.bind(this)}>
                                 获取验证码
@@ -333,23 +334,25 @@ export default class AccountOverview extends React.Component {
                             {t !== '' && <Button key="submitNum" type="primary" style={{ width: '102px' }} disabled={true}>{num}</Button>}
                         </div>
                         <div className='c-ls'>
-                            <test className='titles_tk'>验证码 :</test>
+                            <div className='titles_tk'>验证码 :</div>
                             <div className='titles_yzm'><Input className='inputs' id='num1' maxLength={6} onChange={(e) => this.inputChange1(e)} /></div>
                         </div>
                         <div className='c-ls'>
-                            <test className='titles_tk'>支付密码 :</test>
-                            <div className='titles_num'><Input.Password id='pwd' defaultValue='' onChange={(e) => this.colorChange(e)} placeholder="请输入支付密码" /></div>
-                            <div className='titles_num' style={{ marginLeft: '10px', color: '#ccc' }}>8-20位,必须由数字和字母混合组成</div>
+                            <div className='titles_tk'>支付密码 :</div>
+                            <div className='titles_num'>
+                                <Input.Password id='pwd' defaultValue='' onChange={(e) => this.colorChange(e)} placeholder="请输入支付密码" />
+                            </div>
+                            <div className='titles_num' style={{ marginLeft: '130px', color: '#ccc' }}>8-20位,必须由数字和字母混合组成</div>
                         </div>
                         <div className='c-ls'>
-                            <test className='titles_tk'></test>
+                            <div className='titles_tk'></div>
                             <div className='titles_pas' style={{ backgroundColor: colors == 1 ? '#76EE00' : '', }}>差</div>
                             <div className='titles_pas' style={{ backgroundColor: colors == 2 ? '#FFD700' : '', }}>弱</div>
                             <div className='titles_pas' style={{ backgroundColor: colors == 3 ? '#FF0000' : '', }}>中</div>
                             <div className='titles_pas' style={{ backgroundColor: colors == 4 ? '#CD0000' : '', }}>强</div>
                         </div>
                         <div className='c-ls'>
-                            <test className='titles_tk'>确认支付密码 :</test>
+                            <div className='titles_tk'>确认支付密码 :</div>
                             <div className='titles_num'><Input.Password id='cfPassword' placeholder="再次输入支付密码" /></div>
                         </div>
 

+ 1 - 0
src/component/Account-overview/Account-overview.scss

@@ -46,6 +46,7 @@
     display: inline-block;
     padding: 0 5px;
     margin-right: 10px;
+    text-align: right;
 }
 .titles_num{
     display: inline-block;

+ 6 - 4
src/component/Cash-initiated/Cash-initiated.jsx

@@ -29,7 +29,9 @@ export default class AccountOverview extends React.Component {
         let url = '/payment/merchant.pickup.groovy'
         let params = {
             action :"queryOpInfo", //提现操作相关信息,可提现金额等
-            appName :JSON.parse(localStorage.getItem('userData')).appName, //当前商户的appname,
+            // appName :JSON.parse(localStorage.getItem('userData')).appName, //当前商户的appname,
+            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
             // merchantId : JSON.parse(localStorage.getItem('userData')).merchantId//商户ID在第三方的唯一编号,
         }
         $Axios('get',url,params,(res) => {
@@ -54,8 +56,8 @@ export default class AccountOverview extends React.Component {
                         let url = '/payment/merchant.pickup.groovy'
                         let params = {
                             action :"create",//提现
-                            appName : JSON.parse(localStorage.getItem('userData')).appName,//当前商户的appname,
-                            // merchantId : JSON.parse(localStorage.getItem('userData')).appmerchantIdName,//商户ID在第三方的唯一编号,
+                            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+                            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
                             withdrawAmount : document.getElementById("je").value,//提现金额以元为单位,默认都是人民币,以元为单位
                             pwd : document.getElementById("pwd").value//String,交易密码
                         }
@@ -114,7 +116,7 @@ export default class AccountOverview extends React.Component {
                                 lodings == false && <Spin indicator={antIcon} />
                             }
                             {
-                                lodings == true && <text>{data.withdrawBalance == '' ? '--' : data.withdrawBalance}</text>
+                                lodings == true && <text>{data.withdrawBalance == 0 ? 0 : data.withdrawBalance}</text>
                             }
                        </div>
                        <div>

+ 20 - 23
src/component/Finance-orderQuery/Finance-orderQuery.jsx

@@ -3,7 +3,8 @@ import { Button, Table, Select, Input, DatePicker, Space, Modal, message, Spin }
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 import { $Axios, format, $payTxt } from '../../common/publish';
-import '../Finance-orderQuery/Finance-orderQuery.scss'
+// import '../Finance-orderQuery/Finance-orderQuery.scss'
+import StyleData from '../Finance-orderQuery/Finance.module.scss'
 import select_data from '../../common/ssq';
 const { Column, ColumnGroup } = Table;
 export default class FinanceoRderQuery extends React.Component {
@@ -41,7 +42,7 @@ export default class FinanceoRderQuery extends React.Component {
                     key: 'cash',
                 },
                 {
-                    title: '本金金额',
+                    title: '联盟积分',
                     dataIndex: 'stbPrice',
                     key: 'stbPrice',
                 },
@@ -79,7 +80,9 @@ export default class FinanceoRderQuery extends React.Component {
             ],
             params: {
                 action: "payOrderList",//查询订单列表
-                appName: JSON.parse(localStorage.getItem('userData')).appName,//当前商户的appName,
+                // appName: JSON.parse(localStorage.getItem('userData')).appName,//当前商户的appName,
+                merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+                merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
                 pSize: 10, //每页条数
                 pNo: 1, //第几页,起始值从1开始
                 orderStatus: '', //订单状态:1:未付款2:已付待入账3:已付已入账4:支付失败
@@ -141,13 +144,6 @@ export default class FinanceoRderQuery extends React.Component {
     }
 
     componentDidMount() {
-        let tables = document.getElementById('tables');
-        if (tables) { //此处在加一层判断,更加严密,如果box存在的情况下获取
-            this.setState({
-                tablesW : tables.offsetWidth,
-                tablesH : tables.offsetHeight
-            })
-        }
         this.initData();
     }
 
@@ -346,11 +342,11 @@ export default class FinanceoRderQuery extends React.Component {
         const { Option } = Select;
         return (
             <div className='wrap_table'>
-                <div className='header_center'>
+                <div className={StyleData.header_center}>
                     {headTxt}
                 </div>
-                <div className='query_table'>
-                    <div className='top_div'>
+                <div className={StyleData.query_table}>
+                    <div className={StyleData.top_div}>
                         <div style={{ display: 'inline-block', }}> 订单状态 : </div>
                         <Select size='default' placeholder="请选择" onChange={this.handleChange_1.bind(this)} style={{ width: 200, marginRight: '20px' }}>
                             {select_data.OrderType.map((item, index) => (
@@ -360,7 +356,7 @@ export default class FinanceoRderQuery extends React.Component {
                         <div style={{ display: 'inline-block', }}> 商户订单号 : </div>
                         <div style={{ width: '200px', display: 'inline-block', marginLeft: '20px' }}><Input id='orderNo' placeholder="请输入订单号" /></div>
                     </div>
-                    <div className='btm_div'>
+                    <div className={StyleData.btm_div}>
                         <div style={{ display: 'inline-block', }}> 付款人 : </div>
                         <div style={{ width: '200px', display: 'inline-block', marginLeft: '20px', marginRight: '20px' }}><Input id='userName' placeholder="请输入用户名" /></div>
                         <div style={{ display: 'inline-block', }}> 支付方式 : </div>
@@ -395,7 +391,7 @@ export default class FinanceoRderQuery extends React.Component {
 
                     </div>
                 </div>
-                <div className='tables' id='tables'>
+                <div className={StyleData.tables} id='tables'>
                     <Table
                         columns={columns}
                         dataSource={data}
@@ -405,14 +401,12 @@ export default class FinanceoRderQuery extends React.Component {
                     />
                 </div>
                 <Modal title="订单金额流向"
-                    footer={[
-                        <Button key="submit" type="primary" onClick={this.handleOk.bind(this)}>
-                            确定
-                        </Button>,
-                    ]}
+                    footer={[]}
                     visible={isModalVisible}
-                    closable={false}
                     mask={true}
+                    closable={true}
+                    mask={true}
+                    onCancel={this.handleOk.bind(this)}
                 // onOk={this.handleOk} 
                 >
                     {
@@ -434,14 +428,17 @@ export default class FinanceoRderQuery extends React.Component {
                                 <p>商户订单号 : {orderNo}</p>
                                 <p>订单金额 : {payOrderInfo.totalAmount}</p>
                                 <p>支付金额 : {payOrderInfo.cash}</p>
-                                <p>本金金额 : {payOrderInfo.stbPrice}</p>
+                                <p>联盟积分 : {payOrderInfo.stbPrice}</p>
                                 <p>积分币金额 : {payOrderInfo.benbiPrice}</p>
                             </div>
-                            <div>
+                            <div className={StyleData.tabDiv}>
                                 <p style={{ fontSize: '16px', fontWeight: '600' }}>订单金额流向信息</p>
                                 <Table
+                                    className={StyleData.tab}
                                     columns={columns_tk}
                                     dataSource={orderSplitInfo}
+                                    pagination={false}
+                                    scroll={{ y: 200 }}
                                     locale={{ emptyText: '暂无数据' }}
                                 />
                             </div>

+ 5 - 2
src/component/Finance-orderQuery/Finance-orderQuery.scss

@@ -14,7 +14,7 @@
 .tables{
     width: 100%;
     height: calc(100% - 180px);
-    padding: 20px;
+    padding: 10px;
 }
 .query_table{
     width: 100%;
@@ -32,4 +32,7 @@
         line-height: 60px;
         padding-left: 20px;
     }
-}
+}
+// .ant-table-body {
+//     height: calc(100% - 55px) !important;
+// }

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

@@ -0,0 +1,41 @@
+
+.wrap_table{
+    width: 100%;
+    height: 100%;
+}
+.header_center{
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    text-indent: 20px;
+    font-size: 15px;
+    font-weight: 600;
+    border-bottom: 1px solid #ccc;
+}
+.tables{
+    width: 100%;
+    height: calc(100% - 180px);
+    padding: 10px;
+}
+.query_table{
+    width: 100%;
+    height: 120px;
+    .top_div{
+        width: 100%;
+        height: 50%;
+        line-height: 60px;
+        padding-left: 20px;
+        // background-color: #f60;
+    }
+    .btm_div{
+        width: 100%;
+        height: 50%;
+        line-height: 60px;
+        padding-left: 20px;
+    }
+}
+
+.tabDiv{
+    width: 100%;
+    height: 300px;
+}

+ 3 - 2
src/component/Income-record/Income-record.jsx

@@ -110,8 +110,9 @@ export default class IncomeRecord extends React.Component {
         let that_ = this;
         let url = '/payment/spare.bill.list.groovy';
         let params = {
-            userId: JSON.parse(localStorage.getItem('userData')).userId,//当前登陆用户userid
-            ownerId:document.getElementById("fzsh").value,//关联分账商户
+            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
+            ownerName:document.getElementById("fzsh").value,//关联分账商户
             status: this.state.status,//分账状态,1:分账成功2:分账中3:分账撤回
             createTimeStart : '',//创建开始时间
             createTimeEnd : '',//创建结束时间

+ 14 - 37
src/component/Layout/Layout.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { Button, Breadcrumb  } from 'antd';
 import { $Axios } from '../../common/publish';
 import '../Layout/Layout.scss'
+import styleData from '../moduleCss/style.module.scss';
 import CenterO from '../center-o/centerO.jsx'
 import CenterW from '../center-w/centerW.jsx'
 import CenterS from '../center-s/centerS.jsx'
@@ -15,13 +16,13 @@ export default class Layout extends React.Component {
             initHtmls : 1,
             Params_o : {},
             Params_w : {},
-            Params_S : {}
+            Params_S : {},
         }
         
     }
 	
 	componentDidMount() {
-        
+        console.log(styleData)
     }
 
     handleChange(value) {
@@ -30,32 +31,9 @@ export default class Layout extends React.Component {
     bindRef_o = ref => { this.CenterO = ref }
     bindRef_w = ref => { this.CenterW = ref }
     bindRef_s = ref => { this.CenterS = ref }
-    // this.CenterW.childMethod().
-    // this.CenterO.childMethod()
-    // btnClick_1(e,n){
-    //     console.log(e,'------------',n)
-    //     let headTxt = '';
-    //     if(e == 1){
-    //         headTxt = '商户入网 > 商户基本信息'
-    //         if( n == 1){   //第一个页面往第二个页面跳转回填数据
-                
-    //         }
-    //     }else if(e == 2){
-    //         headTxt = '商户入网 > 商户资质信息'
-            
-    //     }else if(e == 3){
-    //         headTxt = '商户入网 > 结算信息'
-    //     }
-    //     this.setState({	
-    //         htmls : e,
-    //         headTxt : headTxt,
-    //         initHtmls : n
-    //     });
-        
-    // }
+
 
     btnClick_1(){
-        console.log(this.Params_o)
         let headTxt = '商户入网 > 商户资质信息'
         let that_ = this;
         that_.CenterO.childMethod()  //第一页跳第二页保存第一页数据
@@ -144,7 +122,6 @@ export default class Layout extends React.Component {
             merchantNo : '249',
             merchantType : '3',
             merchantInfo : {     //原首易信接口参数
-                // merchantId : '', //商户在首信易系统的唯一身份标识,商户完成首信易系统注册后可登录商户后台商户服务查看
                 requestId : '', //订单号为商户自行拟定,提交的订单号必须在自身平台交易中唯一。商户平台不能以相同的订单号再次提交。
                 operationType : 'CREATE', // :1:CREATE创建即入网,2:MODIFY更新即修改(审核通过前)
                 notifyUrl : '',//服务器通知:当订单状态发生变更后会向该地址发送五次通知,该地址可以带参数,如:“https://www.5upay.com/callback.action?test=test”.注意:如不填notifyUrl的参数值成功后您的服务器将得不到通知。
@@ -170,22 +147,22 @@ export default class Layout extends React.Component {
     render() {
         const { headTxt, htmls } = this.state;
         return(
-            <div className='rootDom'>
-               <div className='header_center'>
+            <div className={styleData.rootDom}>
+               <div className={styleData.header_center}>
                    { headTxt }
                </div>
-               <div className='main_center'>
-                    <div className='center_ups'>
+               <div className={styleData.main_center}>
+                    <div className={styleData.center_ups}>
                         {htmls === 1 && (<CenterO arr={this.state.Params_o}  parent={ this }  onRef={this.bindRef_o}></CenterO>)}
                         {htmls === 2 && (<CenterW arr={this.state.Params_w}  parent={ this }  onRef={this.bindRef_w}></CenterW>)}
                         {htmls === 3 && (<CenterS arr={this.state.Params_S}  parent={ this }  onRef={this.bindRef_s}></CenterS>)}
                     </div>
-                    <div className='center_bottom'>
-                            {htmls === 1 && <Button className='btn btn_next' type="primary" onClick={() =>this.btnClick_1()} >下一步</Button>}
-                            {htmls === 2 && <Button className='btn btn_xg' onClick={() =>this.btnClick_2()} >上一步</Button>}
-                            {htmls === 2 && <Button className='btn btn_next' type="primary" onClick={() =>this.btnClick_3()} >下一步</Button>}
-                            {htmls === 3 && <Button className='btn btn_xg' onClick={() =>this.btnClick_4()} >上一步</Button>}
-                            {htmls === 3 && <Button className='btn btn_next' type="primary" onClick={() =>this.btnClick('ok')} >提交</Button>}
+                    <div className={styleData.center_bottom}>
+                            {htmls === 1 && <Button className={styleData.btn , styleData.btn_next} type="primary" onClick={() =>this.btnClick_1()} >下一步</Button>}
+                            {htmls === 2 && <Button className={styleData.btn , styleData.btn_xg} onClick={() =>this.btnClick_2()} >上一步</Button>}
+                            {htmls === 2 && <Button className={styleData.btn , styleData.btn_next} type="primary" onClick={() =>this.btnClick_3()} >下一步</Button>}
+                            {htmls === 3 && <Button className={styleData.btn , styleData.btn_xg} onClick={() =>this.btnClick_4()} >上一步</Button>}
+                            {htmls === 3 && <Button className={styleData.btn , styleData.btn_next} type="primary" onClick={() =>this.btnClick('ok')} >提交</Button>}
                     </div>
                </div>
             </div>

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

@@ -35,7 +35,7 @@ export default class RefundInquiry extends React.Component {
                     key: 'cash',
                 },
                 {
-                    title: '本金金额',
+                    title: '联盟积分',
                     dataIndex: 'stbPrice',
                     key: 'stbPrice',
                 },
@@ -78,7 +78,8 @@ export default class RefundInquiry extends React.Component {
             ],
             params: {
                 action: "refundList",   //查询订单退款记录
-                appName: JSON.parse(localStorage.getItem('userData')).appName,//当前商户的appName
+                merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+                merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
                 pSize: 10, //每页条数
                 pNo: 1,//第几页,起始值从1开始
                 orderStatus: '', //退款状态:1 处理中PROCESS, 2 成功SUCCESS, 3 失败FAIL 
@@ -336,6 +337,7 @@ export default class RefundInquiry extends React.Component {
                     <div className='top_div'>
                         <div style={{ display: 'inline-block', }}> 退款状态 : </div>
                         <Select size='default' placeholder="请选择" onChange={this.handleChange_1.bind(this)} style={{ width: 200, marginRight: '20px' }}>
+                            <Option key={0} value=''>全部</Option>
                             <Option key={1} value='2'>成功</Option>
                             <Option key={2} value='3'>失败</Option>
                             <Option key={3} value='1'>处理中</Option>

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

@@ -117,8 +117,8 @@ export default class WithdrawalRecord extends React.Component {
         let url = '/payment/merchant.order.query.groovy'
         let params = {
             action: "pickupList",//查询商户提现记录
-            appName : JSON.parse(localStorage.getItem('userData')).appName,
-            // appName: 'testPickUpList',
+            merchantNo : JSON.parse(localStorage.getItem('userData')).merchantNo,//入网的appname、社群name、商户号等(香香或者嘉旺提供)
+            merchantType : JSON.parse(localStorage.getItem('userData')).merchantType, //入网来源,2:app或社群 3:商户或店铺(香香或者嘉旺提供)
             tradeStatus: this.state.tradeStatus, //提现状态:1处理中PROCESS,2成功SUCCESS,3失败FAIL(inithecancle不统计)
             timeType: this.state.timeType,//为0或不提供此字段,表示不限制,1创建时间,2完成时间
             begTime: this.state.starTime,//"2021-06-3000:00:00",为空或不提供此字段,表示不限制

+ 2 - 1
src/component/center-o/centerO.jsx

@@ -16,7 +16,8 @@ export default class centerO extends React.Component {
             Params : this.props.arr,
             cityTxt : 1,
             regionTxt : 2,
-            datas : null
+            datas : null,
+            lodings : false
         }
         
     }

+ 46 - 47
src/component/center-w/centerW.jsx

@@ -2,9 +2,8 @@ import React from 'react';
 import { Radio, Select, Input, Upload, Button , Checkbox } from 'antd';
 import { UploadOutlined } from '@ant-design/icons';
 import axios from "axios";
-// import { $Axios } from '../../common/publish';
 import select_data from '../../common/ssq';
-import '../center-w/centerW.scss'
+import styleData from '../moduleCss/style.module.scss';
 
 export default class centerW extends React.Component {
     constructor(props) {
@@ -162,47 +161,47 @@ export default class centerW extends React.Component {
         const { Option } = Select;
         
         return(
-            <div className='center_up'>
-                <div className='center_left'>
-                    <div className='c-l'>
-                        <div className='titles'> 法人姓名<i className='label_x'>*</i> : </div>
-                        <div className='inputs'><Input id='legalPersonName' placeholder="请输入法人姓名" defaultValue={Params.legalPersonName} /></div>
+            <div className={styleData.center_up}>
+                <div className={styleData.center_left}>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 法人姓名<i className='label_x'>*</i> : </div>
+                        <div className={styleData.inputs}><Input id='legalPersonName' placeholder="请输入法人姓名" defaultValue={Params.legalPersonName} /></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 法人职业 : </div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 法人职业 : </div>
                         <Select size='default' placeholder="请选择法人职业" defaultValue={Params.profession}   onChange={ this.selectChange_1.bind(this)  } style={{ width: 200 }}>
                                             {selectData.contractW.map((item,index) => (
                                                 <Option key={index} value={item.value}>{item.txt}</Option>
                                             ))}
                                         </Select>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 法人证件类型<i className='label_x'>*</i> : </div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 法人证件类型<i className='label_x'>*</i> : </div>
                         <Select size='default' placeholder="请选择证件类型" defaultValue={Params.legalPersonIdType}   onChange={ this.selectChange_2.bind(this)  } style={{ width: 200 }}>
                                             {selectData.certificateW.map((item,index) => (
                                                 <Option key={index} value={item.value}>{item.txt}</Option>
                                             ))}
                                         </Select>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 法人证件号码<i className='label_x'>*</i> : </div>
-                        <div className='inputs'><Input id='legalPersonIdNo' placeholder="请输入证件号码" defaultValue={Params.legalPersonIdNo}  /></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 法人证件号码<i className='label_x'>*</i> : </div>
+                        <div className={styleData.inputs}><Input id='legalPersonIdNo' placeholder="请输入证件号码" defaultValue={Params.legalPersonIdNo}  /></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 企业证件类型 : </div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 企业证件类型 : </div>
                         <Select size='default' placeholder="请选择证件类型" defaultValue={Params.cerNoType}  onChange={ this.selectChange_3.bind(this) } style={{ width: 200 }}>
                                             {selectData.cerNoTypeW.map((item,index) => (
                                                 <Option key={index} value={item.value}>{item.txt}</Option>
                                             ))}
                                         </Select>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 资质证书编号 : </div>
-                        <div className='inputs'><Input id='cerNo' placeholder="请输入证书编号" defaultValue={Params.cerNo}/></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 资质证书编号 : </div>
+                        <div className={styleData.inputs}><Input id='cerNo' placeholder="请输入证书编号" defaultValue={Params.cerNo}/></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 营业面积 : </div>
-                        <div className='inputs'>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 营业面积 : </div>
+                        <div className={styleData.inputs}>
                             <Select size='default' placeholder="请选择营业面积" defaultValue={Params.sellingArea}  onChange={ this.selectChange_4.bind(this) } style={{ width: 200 }}>
                                 <Option key={1} value='A'>500平米以上</Option>
                                 <Option key={2} value='B'>200-500平米(含)</Option>
@@ -210,9 +209,9 @@ export default class centerW extends React.Component {
                             </Select>
                         </div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 公司员工规模 : </div>
-                        <div className='inputs'>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 公司员工规模 : </div>
+                        <div className={styleData.inputs}>
                             <Select size='default' placeholder="请选择营业面积" defaultValue={Params.staffSize}  onChange={ this.selectChange_5.bind(this) } style={{ width: 200 }}>
                                 <Option key={4} value='A'>100人以上</Option>
                                 <Option key={5} value='B'>50-100人(含)</Option>
@@ -220,36 +219,36 @@ export default class centerW extends React.Component {
                             </Select>
                         </div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 交易场景说明 : </div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 交易场景说明 : </div>
                         <Checkbox.Group options={selectData.options} defaultValue={['WEBSITE']} onChange={this.CheckChange.bind(this)} />
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 网站网址 : </div>
-                        <div className='inputs'><Input id='webSite' placeholder="请输入网站网址"  defaultValue={Params.webSite}/></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 网站网址 : </div>
+                        <div className={styleData.inputs}><Input id='webSite' placeholder="请输入网站网址"  defaultValue={Params.webSite}/></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 网站名称 : </div>
-                        <div className='inputs'><Input id='webSiteName' placeholder="请输入网站名称" defaultValue={Params.webSiteName} /></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 网站名称 : </div>
+                        <div className={styleData.inputs}><Input id='webSiteName' placeholder="请输入网站名称" defaultValue={Params.webSiteName} /></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> ICP备案号 : </div>
-                        <div className='inputs'><Input id='icp' placeholder="请输入ICP备案号"  defaultValue={Params.icp}/></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> ICP备案号 : </div>
+                        <div className={styleData.inputs}><Input id='icp' placeholder="请输入ICP备案号"  defaultValue={Params.icp}/></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> APP名称 : </div>
-                        <div className='inputs'><Input id='appName' placeholder="请输入APP名称" defaultValue={Params.appName}/></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> APP名称 : </div>
+                        <div className={styleData.inputs}><Input id='appName' placeholder="请输入APP名称" defaultValue={Params.appName}/></div>
                     </div>
-                    <div className='c-l'>
-                        <div className='titles'> 公众号/小程序/生活号 : </div>
-                        <div className='inputs'><Input id='wechatAppletName' placeholder="请输入名称" defaultValue={Params.wechatAppletName}/></div>
+                    <div className={styleData.cl}>
+                        <div className={styleData.titles}> 公众号/小程序/生活号 : </div>
+                        <div className={styleData.inputs}><Input id='wechatAppletName' placeholder="请输入名称" defaultValue={Params.wechatAppletName}/></div>
                     </div>
                 </div>
-                <div className='center_right'>
+                <div className={styleData.center_right}>
                     {selectData.rightArray.map((item,index) => (
-                         <div className='c-l' key = {index}>
-                         <div className='titles'> {item.txt} : </div>
-                         <div className='Upload_wrap'>
+                         <div className={styleData.cl} key = {index}>
+                         <div className={styleData.titles}> {item.txt} : </div>
+                         <div className={styleData.Upload_wrap}>
                              <Upload 
                                 //  {...headerProps}
                                 name="files"
@@ -262,7 +261,7 @@ export default class centerW extends React.Component {
                                  >
                                  <Button icon={<UploadOutlined />} onClick={() =>this.btnClick(index)}>选择文件</Button>
                              </Upload>
-                             {fileList[index].length === 0 && <div className='title_tips'>格式限制为{item.type},最大不超过50M</div>}
+                             {fileList[index].length === 0 && <div className={styleData.title_tips}>格式限制为{item.type},最大不超过50M</div>}
                          </div>
                      </div>
                     ))}

+ 45 - 5
src/component/center-w/centerW.scss

@@ -1,8 +1,48 @@
+.rootDom{
+    width: 100%;
+    height: 100%;
+    .header_center{
+        width: 100%;
+        height: 60px;
+        line-height: 60px;
+        text-indent: 20px;
+        font-size: 15px;
+        font-weight: 600;
+        border-bottom: 1px solid #ccc;
+    }
+    .main_center{
+        width: 100%;
+        height: calc(100% - 60px);
+        padding: 20px;
+        .center_ups{
+            width: 100%;
+            height: 93%;
+            // background-color: #ccc;
+        }
+        .center_bottom{
+            width: 100%;
+            // height: %;
+        }
+    }
+    .center_bottom{
+        width: 100%;
+        text-indent: 40%;
+        .btnwrap{
+            display: inline-block;
+        }
+        .btn{
+            width: 80px;
+        }
+        .btn_next{
+            margin-left: 20px;
+        }
+    }
+}
 .center_up{
     width: 100%;
     height: 100%;
     .center_left{
-        width: 50%;
+        width: 40%;
         height: 100%;
         float: left;
         .titles{
@@ -15,18 +55,18 @@
             width: 200px;
             display: inline-block;
         }
-        .c-l{
+        .cl{
             width: 100%;
             height: 50px;
             line-height: 50px;
         }
     }
     .center_right{
-        width: 50%;
+        width: 60%;
         height: 100%;
         float: left;
         .titles{
-            width: 250px;
+            width: 240px;
             height: 50px;
             line-height: 50px;
             text-align: right;
@@ -60,7 +100,7 @@
             margin-left: 20px;
         }
         .Upload_wrap{
-            width: 580px;
+            width: 500px;
             height: 50px;
             display: inline-block;
             position: relative;