增加部分功能

package-lock.json

@@ -6847,61 +6847,6 @@
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.2.0.tgz",
       "integrity": "sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw=="
     },
-    "dotenv-cli": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-4.0.0.tgz",
-      "integrity": "sha512-ByKEec+ashePEXthZaA1fif9XDtcaRnkN7eGdBDx3HHRjwZ/rA1go83Cbs4yRrx3JshsCf96FjAyIA2M672+CQ==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^7.0.1",
-        "dotenv": "^8.1.0",
-        "dotenv-expand": "^5.1.0",
-        "minimist": "^1.1.3"
-      },
-      "dependencies": {
-        "cross-spawn": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-          "dev": true,
-          "requires": {
-            "path-key": "^3.1.0",
-            "shebang-command": "^2.0.0",
-            "which": "^2.0.1"
-          }
-        },
-        "path-key": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-          "dev": true
-        },
-        "shebang-command": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-          "dev": true,
-          "requires": {
-            "shebang-regex": "^3.0.0"
-          }
-        },
-        "shebang-regex": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-          "dev": true
-        },
-        "which": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          }
-        }
-      }
-    },
     "dotenv-expand": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
@@ -14530,6 +14475,24 @@
         "whatwg-fetch": "^3.4.1"
       }
     },
+    "react-cookies": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/react-cookies/-/react-cookies-0.1.1.tgz",
+      "integrity": "sha512-PP75kJ4vtoHuuTdq0TAD3RmlAv7vuDQh9fkC4oDlhntgs9vX1DmREomO0Y1mcQKR9nMZ6/zxoflaMJ3MAmF5KQ==",
+      "dev": true,
+      "requires": {
+        "cookie": "^0.3.1",
+        "object-assign": "^4.1.1"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+          "dev": true
+        }
+      }
+    },
     "react-dev-utils": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",

package.json

@@ -110,11 +110,12 @@
     "babel-cli": "^6.26.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
+    "react-cookies": "^0.1.1",
     "react-hot-loader": "^4.13.0",
     "webpack": "^4.44.2",
     "webpack-cli": "^4.7.2"
   },
-  "homepage": ".", 
+  "homepage": ".",
   "jest": {
     "roots": [
       "<rootDir>/src"

src/App.css

@@ -111,3 +111,9 @@
   height: 100%;
   float: left;
 }
+.ant-table-thead > tr > th{
+  white-space:nowrap;
+  }
+  .ant-table-row td{
+  white-space:nowrap;
+  }

src/App.js

@@ -5,6 +5,7 @@ import { Menu, Button,Result } from 'antd';
 import { $Axios } from './common/publish';
 import { SettingOutlined, DollarCircleOutlined, } from '@ant-design/icons';
 import * as Icons from "@ant-design/icons";
+import cookie from 'react-cookies'
 import {
   MenuUnfoldOutlined,
   MenuFoldOutlined,
@@ -41,8 +42,19 @@ export default class App extends React.Component {
 
   componentDidMount() {
     let isSignout = localStorage.getItem('isSignout');
-    let userData = localStorage.getItem('userInformation');
-    // if(isSignout == 'yes' && userData == null){ //拦截是否为刷新页面
+    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);
+    
+    // if(isSignout == 'yes' && userData == undefined){ //拦截是否为刷新页面
     //   this.setState({
     //     signout : true
     //   })
@@ -54,7 +66,8 @@ export default class App extends React.Component {
     console.log('----------初始化用户权限---------');
     console.log(process.env.NODE_ENV == 'development' ? '----------开发测试环境----------' : '----------线上生产环境----------')
     // this.autoLogin() //登录查询用户信息
-    let userData = JSON.parse(localStorage.getItem('userInformation '));
+    let userData = cookie.load('userInformation');
+    // console.log(userData)
     let obj = {   //默认信息
       userName: '测试用户',
       appName: 'com.smrongshengtianxia',
@@ -64,7 +77,7 @@ export default class App extends React.Component {
       Jur : 1,//用户权限
       pages : '2-0' 
     }
-    if (userData !== null) {  //能获取用户信息 改变存储信息
+    if (userData !== undefined) {  //能获取用户信息 改变存储信息
       obj = {
         userName: userData.userName, //用户名
         appName: userData.appName,  //appName
@@ -153,8 +166,8 @@ export default class App extends React.Component {
 
   signout() {
     localStorage.setItem('isSignout', 'yes')
-    localStorage.removeItem('userInformation') //退出清除用户本地数据
     localStorage.removeItem('userData') //退出清除用户本地数据
+    cookie.remove('userInformation')
     this.setState({
       signout: true
     });

src/common/publish.js

@@ -158,4 +158,29 @@ export function $Axios_form (method, url, param, fn, err) {
 			if (err) err()
 			console.log(e)
 		})
+}
+
+export function $payTxt (e) {
+    let txt = '';
+    switch (e) {
+        case 1:
+            txt = "支付宝";
+            break;
+        case 2:
+            txt = "微信";
+             break;
+        case 3:
+            txt = "联盟币";
+             break;
+        case 4:
+            txt = "积分币";
+             break;
+        case 5:
+            txt = "余额";
+             break;
+        case 6:
+            txt = "微包银行卡";
+             break;
+    } 
+    return txt
 }

src/common/ssq.js

@@ -14112,6 +14112,7 @@ const ssq = {
         {txt:'农村信用社',value:'NCXYS'},
     ],
     'OrderType': [
+        { label: '全部', value: '' },
         { label: '未付款', value: '1' },
         { label: '已付待入账', value: '2' },
         { label: '已付已入账', value: '3' },

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

@@ -86,7 +86,6 @@ export default class AccountOverview extends React.Component {
         this.initData(); //重置后重新刷新可提现金额
         let zTimeBegin = new Date();                                                                                       
         let keys = zTimeBegin.getTime()  // 时间转成时间戳
-        console.log(keys)
         this.setState({
             je : keys,
             pwd : keys

src/component/Finance-orderQuery/Finance-orderQuery.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
-import { Button, Table, Select, Input, DatePicker, Space, Modal, message , Spin } from 'antd';
+import { Button, Table, Select, Input, DatePicker, Space, Modal, message, Spin } from 'antd';
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
-import { $Axios, format } from '../../common/publish';
+import { $Axios, format, $payTxt } from '../../common/publish';
 import '../Finance-orderQuery/Finance-orderQuery.scss'
 import select_data from '../../common/ssq';
 const { Column, ColumnGroup } = Table;
@@ -133,12 +133,21 @@ export default class FinanceoRderQuery extends React.Component {
             spinning: true,
             keys: 1,
             keye: 2,
-            tklodings: false
+            tklodings: false,
+            tablesW : '',
+            tablesH : ''
         }
 
     }
 
     componentDidMount() {
+        let tables = document.getElementById('tables');
+        if (tables) { //此处在加一层判断，更加严密，如果box存在的情况下获取
+            this.setState({
+                tablesW : tables.offsetWidth,
+                tablesH : tables.offsetHeight
+            })
+        }
         this.initData();
     }
 
@@ -206,10 +215,10 @@ export default class FinanceoRderQuery extends React.Component {
 
     endTime = (value, dateString) => {
         if (dateString !== '') {
-            dateString = new Date(value).formats('yyyy-MM-dd 00:00:00')
-            let time = new Date(dateString).getTime() / 1000;
+            dateString = new Date(value).formats('yyyy-MM-dd 00:00:00'); //格式化时间
+            let time = new Date(dateString).getTime() / 1000; //格式化时间戳为秒
             this.setState({
-                endTime: time
+                endTime: Number(time) + 86400  //加24小时
             })
         } else {
             this.setState({
@@ -296,7 +305,7 @@ export default class FinanceoRderQuery extends React.Component {
                         benbiPrice: item.benbiPrice, //订单支付本币抵扣的现金价格
                         spareAmount: item.spareAmount, //分账金额
                         refundAmount: item.refundAmount,//退款金额
-                        payType: that_.payTypeList(item.payType),//支付方式：1支付宝2微信5微包
+                        payType: $payTxt(item.payType),//支付方式：1支付宝2微信5微包
                         orderStatus: that_.orderStatus(item.orderStatus),//订单状态：1：未付款2：已付待入账3：已付已入账4：支付失败
                         createTime: item.createTime == '' ? '--' : format(Number(item.createTime)), //:创建时间
                         finishTime: item.finishTime == '' ? '--' : format(Number(item.finishTime))  //:完成时间
@@ -315,17 +324,6 @@ export default class FinanceoRderQuery extends React.Component {
         })
     }
 
-    payTypeList(e) {
-        let txt;
-        if (e == 1) {
-            txt = '支付宝'
-        } else if (e == 2) {
-            txt = '微信'
-        } else if (e == 5) {
-            txt = '余额'
-        }
-        return txt
-    }
 
     orderStatus(e) {
         let txt;
@@ -344,7 +342,7 @@ export default class FinanceoRderQuery extends React.Component {
     }
 
     render() {
-        const { data, columns, headTxt, keys, keye, select_data, timeType, paginationProps, isModalVisible, columns_tk, payOrderInfo, orderSplitInfo, orderNo, lodings, tklodings } = this.state;
+        const { data, columns, headTxt, keys, keye, select_data, timeType, paginationProps, isModalVisible, columns_tk, payOrderInfo, orderSplitInfo, orderNo, lodings, tklodings, tablesW, tablesH } = this.state;
         const { Option } = Select;
         return (
             <div className='wrap_table'>
@@ -363,18 +361,21 @@ export default class FinanceoRderQuery extends React.Component {
                         <div style={{ width: '200px', display: 'inline-block', marginLeft: '20px' }}><Input id='orderNo' placeholder="请输入订单号" /></div>
                     </div>
                     <div className='btm_div'>
-                        <div style={{ display: 'inline-block', }}> 发起人 ： </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>
                         <Select size='default' placeholder="请选择" onChange={this.handleChange_2.bind(this)} style={{ width: 200, marginRight: '20px' }}>
                             <Option key={1} value={2}>微信</Option>
                             <Option key={2} value={1}>支付宝</Option>
                             <Option key={3} value={5}>钱包余额</Option>
+                            <Option key={4} value={3}>联盟币</Option>
+                            <Option key={5} value={4}>积分币</Option>
+                            <Option key={6} value={6}>微包银行卡</Option>
                         </Select>
                         <Select size='default' placeholder="请选择时间类型" onChange={this.handleChange_3.bind(this)} style={{ width: 200, marginRight: '20px' }}>
                             <Option key={0} value={0}>不限时间类型</Option>
-                            <Option key={1} value={1}>完成时间</Option>
-                            <Option key={2} value={2}>下单时间</Option>
+                            <Option key={1} value={2}>完成时间</Option>
+                            <Option key={2} value={1}>下单时间</Option>
                         </Select>
                         <Space direction="vertical">
                             <DatePicker key={keys} onChange={this.starTime} locale={locale} disabled={timeType == null ? true : false || timeType == 0 ? true : false} placeholder='请选择开始时间' />
@@ -394,12 +395,13 @@ export default class FinanceoRderQuery extends React.Component {
 
                     </div>
                 </div>
-                <div className='tables'>
+                <div className='tables' id='tables'>
                     <Table
                         columns={columns}
                         dataSource={data}
                         pagination={paginationProps}
                         loading={lodings}
+                        locale={{ emptyText: '暂无数据' }}
                     />
                 </div>
                 <Modal title="订单金额流向"
@@ -425,25 +427,26 @@ export default class FinanceoRderQuery extends React.Component {
                             <Spin tip="加载中请稍后..."></Spin>
                         </div>
                     }
-                  {
+                    {
                         tklodings == true && <div>
-                        <div>
-                            <p style={{ fontSize: '16px', fontWeight: '600' }}>订单信息</p>
-                            <p>商户订单号 : {orderNo}</p>
-                            <p>订单金额 : {payOrderInfo.totalAmount}</p>
-                            <p>支付金额 : {payOrderInfo.cash}</p>
-                            <p>本金金额 : {payOrderInfo.stbPrice}</p>
-                            <p>积分币金额 : {payOrderInfo.benbiPrice}</p>
-                        </div>
-                        <div>
-                            <p style={{ fontSize: '16px', fontWeight: '600' }}>订单金额流向信息</p>
-                            <Table
-                                columns={columns_tk}
-                                dataSource={orderSplitInfo}
-                            />
+                            <div>
+                                <p style={{ fontSize: '16px', fontWeight: '600' }}>订单信息</p>
+                                <p>商户订单号 : {orderNo}</p>
+                                <p>订单金额 : {payOrderInfo.totalAmount}</p>
+                                <p>支付金额 : {payOrderInfo.cash}</p>
+                                <p>本金金额 : {payOrderInfo.stbPrice}</p>
+                                <p>积分币金额 : {payOrderInfo.benbiPrice}</p>
+                            </div>
+                            <div>
+                                <p style={{ fontSize: '16px', fontWeight: '600' }}>订单金额流向信息</p>
+                                <Table
+                                    columns={columns_tk}
+                                    dataSource={orderSplitInfo}
+                                    locale={{ emptyText: '暂无数据' }}
+                                />
+                            </div>
                         </div>
-                    </div>
-                  }
+                    }
                 </Modal>
             </div>
         )

src/component/Finance-orderQuery/Finance-orderQuery.scss

@@ -13,7 +13,7 @@
 }
 .tables{
     width: 100%;
-    // height: calc(100% - 180px);
+    height: calc(100% - 180px);
     padding: 20px;
 }
 .query_table{

src/component/Income-record/Income-record.jsx

@@ -206,7 +206,7 @@ export default class IncomeRecord extends React.Component {
             dateString = new Date(value).formats('yyyy-MM-dd 00:00:00')
             let time = new Date(dateString).getTime()/1000;
             this.setState({
-                endTime: time
+                endTime: Number(time) + 86400  //加24小时
             })
         }else{
             this.setState({
@@ -258,6 +258,7 @@ export default class IncomeRecord extends React.Component {
                         dataSource={data} 
                         pagination={paginationProps}
                         loading = {lodings}
+                        locale={{ emptyText: '暂无数据' }}
                     />
                </div>
             </div>

src/component/Refund-inquiry/Refund-inquiry.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button, Table, Select, Input, DatePicker, Space, message, Modal, Steps, Spin } from 'antd';
 import 'moment/locale/zh-cn';
 import locale from 'antd/es/date-picker/locale/zh_CN';
-import { $Axios, format } from '../../common/publish';
+import { $Axios, format ,$payTxt } from '../../common/publish';
 import '../Refund-inquiry/Refund-inquiry.scss'
 const { Column, ColumnGroup } = Table;
 const { Step } = Steps;
@@ -152,8 +152,8 @@ export default class RefundInquiry extends React.Component {
                         finishTime: item.finishTime == '' ? '--' : format(Number(item.finishTime)),  //:完成时间
                         id: item.id,
                         orderNo: item.orderNo,
-                        orderStatus: that_.orderStatus(item.payType),
-                        payType: that_.payTypeList(item.payType),
+                        orderStatus: that_.orderStatus(item.orderStatus),
+                        payType: $payTxt(item.payType),
                         refundAmount: item.refundAmount,
                         requestId: item.requestId,
                         stbPrice: item.stbPrice,
@@ -217,19 +217,6 @@ export default class RefundInquiry extends React.Component {
         })
     }
 
-
-    payTypeList(e) {
-        let txt;
-        if (e == 1) {
-            txt = '支付宝'
-        } else if (e == 2) {
-            txt = '微信'
-        } else if (e == 5) {
-            txt = '余额'
-        }
-        return txt
-    }
-
     orderStatus(e) {
         let txt;
         if (e == 2) {
@@ -326,7 +313,7 @@ export default class RefundInquiry extends React.Component {
             dateString = new Date(value).formats('yyyy-MM-dd 00:00:00')
             let time = new Date(dateString).getTime() / 1000;
             this.setState({
-                endTime: time
+                endTime: Number(time) + 86400  //加24小时
             })
         } else {
             this.setState({
@@ -394,6 +381,7 @@ export default class RefundInquiry extends React.Component {
                         dataSource={data}
                         pagination={paginationProps}
                         loading={lodings}
+                        locale={{ emptyText: '暂无数据' }}
                     />
                 </div>
                 <Modal title="退款详情"
@@ -432,7 +420,7 @@ export default class RefundInquiry extends React.Component {
                                     <p>用户人 : {userInfo.nickname}</p>
                                     <p>电话 : {userInfo.mobile}</p>
                                     <p>邮箱 : {userInfo.email == '' ? '--' : userInfo.email}</p>
-                                    <p>支付时间 : {userInfo.nickname}</p>
+                                    <p>支付时间 : {format(Number(userInfo.payTime))}</p>
                                 </div>
                                 <div style={{
                                     width: '50%',

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

@@ -190,7 +190,7 @@ export default class WithdrawalRecord extends React.Component {
             dateString = new Date(value).formats('yyyy-MM-dd 00:00:00')
             let time = new Date(dateString).getTime() / 1000;
             this.setState({
-                endTime: time
+                endTime: Number(time) + 86400  //加24小时
             })
         } else {
             this.setState({
@@ -282,6 +282,7 @@ export default class WithdrawalRecord extends React.Component {
                         dataSource={data}
                         pagination={paginationProps}
                         loading={lodings}
+                        locale={{ emptyText: '暂无数据' }}
                     />
                 </div>
                 <Modal title="提现详情"

src/component/center-tab/center-tab.jsx

@@ -16,7 +16,6 @@ export default class centerTab extends React.Component {
                     title: '序号',
                     dataIndex: 'num',
                     key: 'num',
-
                 },
                 {
                     title: '签约名称',
@@ -389,6 +388,7 @@ export default class centerTab extends React.Component {
                     dataSource={data} 
                     pagination={paginationProps}
                     loading={lodings}
+                    locale={{ emptyText: '暂无数据' }}
                     />
                 </div>
                 <Modal title="详细信息"