dujingxian 4 vuotta sitten
vanhempi
commit
4483a4996b

+ 5 - 5
src/api/index.js

@@ -200,7 +200,7 @@ export const queryList = (params) => {
     // return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&curpage=${page}&start_time=${start_time}&end_time=${end_time}&card_type=${card_type}`, 'post')
     return axios({
         method: 'post',
-        url: `${Prefix}act=merchant_order&op=list&client_type=ajax`,
+        url: `${Prefix}act=merchant_order&op=list&client_type=ajax&page=50`,
         withCredentials: true,
         headers: {
             "Content-Type": "application/x-www-form-urlencoded"
@@ -232,7 +232,7 @@ export const getUserInfo = () => {
 
 // 实时动账
 export const getMovingAccount = (page) => {
-    return requestLoading(`${Prefix}act=merchant_info&op=pdlog&client_type=ajax&curpage=${page}`, 'post')
+    return requestLoading(`${Prefix}act=merchant_info&op=pdlog&client_type=ajax&page=50&curpage=${page}`, 'post')
 }
 
 /**
@@ -247,7 +247,7 @@ export const queryMovingAccount = (params) => {
     // return requestLoading(`${Prefix}act=merchant_info&op=pdlog&client_type=ajax&curpage=${page}&start_time=${start_time}&end_time=${end_time}&lg_type=${lg_type}`, 'post')
     return axios({
         method: 'post',
-        url: `${Prefix}act=merchant_info&op=pdlog&client_type=ajax`,
+        url: `${Prefix}act=merchant_info&op=pdlog&client_type=ajax&page=50`,
         withCredentials: true,
         headers: {
             "Content-Type": "application/x-www-form-urlencoded"
@@ -302,7 +302,7 @@ export const updateVoucherList = (params) => {
 
 // 获取充值列表
 export const getVoucherList = () => {
-    return requestLoading(`${Prefix}act=refill_evidence&op=index&client_type=ajax`, 'post')
+    return requestLoading(`${Prefix}act=refill_evidence&op=index&client_type=ajax&page=50`, 'post')
 }
 // 查询充值列表
 // export const queryVoucherList = (page, start_time, end_time) => {
@@ -310,7 +310,7 @@ export const queryVoucherList = (params) => {
     // return requestLoading(`${Prefix}act=refill_evidence&op=index&client_type=ajax&curpage=${page}&start_time=${start_time}&end_time=${end_time}`, 'get')
     return axios({
         method: 'post',
-        url: `${Prefix}act=refill_evidence&op=index&client_type=ajax`,
+        url: `${Prefix}act=refill_evidence&op=index&client_type=ajax&page=50`,
         withCredentials: true,
         headers: {
             "Content-Type": "application/x-www-form-urlencoded"

+ 1 - 1
src/pages/subPages/balance.vue

@@ -150,7 +150,7 @@ export default {
                 // {id: 1, money: '100', recharge_code: ''},
                 // {id: 2, money: '100', recharge_code: ''},
             ],
-            pageSize: 10,
+            pageSize: 50,
             pageNumber: 1,
             total: 0,
             searchValue: "",

+ 5 - 5
src/pages/subPages/message.vue

@@ -31,13 +31,13 @@
             </el-form-item>
         </el-form>
     </div> -->
-    <el-table :data="tableData" border style="width: 100%">
+    <el-table :data="tableData" border>
         <!-- <el-table-column align="center" type="index" width="50" label="序号" /> -->
         <!-- <el-table-column align="center" prop="lg_order_sn" label="业务订单号"></el-table-column> -->
-        <el-table-column align="left" prop="lg_type_text" label="资金变动类型"></el-table-column>
+        <el-table-column align="left" prop="lg_type_text" label="资金变动类型" width="220"></el-table-column>
         <el-table-column align="left" prop="lg_desc" label="变更内容" width="350"></el-table-column>
-        <el-table-column align="right" prop="lg_av_amount" label="变动金额"></el-table-column>
-        <el-table-column align="left" prop="lg_add_time" label="时间"></el-table-column>
+        <el-table-column align="right" prop="lg_av_amount" label="变动金额" width="200"></el-table-column>
+        <el-table-column align="left" prop="lg_add_time" label="时间" width="250"></el-table-column>
         <!-- <el-table-column align="center" prop="lg_av_amount" label="变动后账户余额"></el-table-column> -->
         <!-- <el-table-column align="center" prop="status_text" label="变动后冻结金额"></el-table-column>
         <el-table-column align="center" prop="datetime" label="变动后授权额"></el-table-column> -->
@@ -63,7 +63,7 @@ export default {
     name: 'message',
     data() {
         return {
-            pageSize: 10,
+            pageSize: 50,
             pageNumber: 1,
             cabinetValue: "",
             cabinetOptions: [],

+ 5 - 0
src/pages/subPages/mobileCard.vue

@@ -63,6 +63,11 @@
           v-loading="loading"
           element-loading-text="充值中">
           <el-table-column align="center" prop="card_no" label="手机号"></el-table-column>
+          <el-table-column align="center" label="订单号">
+            <template slot-scope="scope" v-if="scope.row.state == true">
+              {{scope.row.err}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="amount" label="充值金额"></el-table-column>
           <el-table-column align="center" label="充值状态">
             <template slot-scope="scope">

+ 5 - 0
src/pages/subPages/oilCard.vue

@@ -54,6 +54,11 @@
           v-loading="loading"
           element-loading-text="充值中">
           <el-table-column align="center" prop="card_no" label="卡号"></el-table-column>
+          <el-table-column align="center" label="订单号">
+            <template slot-scope="scope" v-if="scope.row.state == true">
+              {{scope.row.err}}
+            </template>
+          </el-table-column>
           <el-table-column align="center" prop="amount" label="充值金额"></el-table-column>
           <el-table-column align="center" label="充值状态">
             <template slot-scope="scope">

+ 12 - 4
src/pages/subPages/order.vue

@@ -25,13 +25,21 @@
         <el-table-column align="left" prop="mch_order" width="200" label="客户单号"></el-table-column>
         <el-table-column align="left" prop="card_no" width="200" label="卡号"></el-table-column>
         <el-table-column align="right" prop="refill_amount" label="充值面额" width="100"></el-table-column>
-        <el-table-column align="right" prop="mch_amount" label="扣款金额" width="100"></el-table-column>
         <el-table-column align="left" prop="card_type_name" label="充值卡类型" width="150"></el-table-column>
         <el-table-column align="left" prop="order_time" width="200" label="充值时间"></el-table-column>
         <el-table-column align="left" prop="notify_time" width="200" label="到账时间"></el-table-column>
-        <el-table-column align="left" prop="order_state_text" label="充值状态" ></el-table-column>
+        <el-table-column align="left" label="充值状态" >
+            <template slot-scope="{row}">
+                <el-tag type = 'success' v-if="row.order_state == '40'">充值成功</el-tag>
+                <el-tag type = 'warning' v-if="row.order_state == '20'">支付成功</el-tag>
+                <el-tag type = '' v-if="row.order_state == '30'">充值中</el-tag>
+                <el-tag type = 'info' v-if="row.order_state == '10'">新订单</el-tag>
+                <el-tag type = 'danger' v-if="row.order_state == '0'">已取消</el-tag>
+            </template>
+        </el-table-column>
         <!-- <el-table-column align="left" prop="ch_trade_no" label="批次号"></el-table-column> -->
         <el-table-column align="left" prop="order_sn" width="200" label="平台单号"></el-table-column>
+        <el-table-column align="right" prop="mch_amount" label="扣款金额" width="100"></el-table-column>
         <!-- <el-table-column align="left" width="200" label="状态查询">
             <template slot-scope="{row}">
                 <el-button type="primary" size="small" v-show="row && row.order_state_text == '充值中'">查询</el-button>
@@ -82,7 +90,7 @@ export default {
                 // {card_no: 193},
                 // {card_no: 193},
             ],
-            pageSize: 10,
+            pageSize: 50,
             pageNumber: 1,
             total: 0,
             // 筛选时间 start_time end_time
@@ -114,7 +122,7 @@ export default {
         // 获取订单列表
         async getOrderList () {
             let param = new URLSearchParams()
-            param.append('page', 10)
+            param.append('page', 50)
             const res = await getOrderList(param)
             console.log('订单列表', res);
             if (res && res.code == 200) {