订单统计获取查询重置

src/api/index.js

@@ -13,6 +13,7 @@ axios.interceptors.request.use(
         // }
         return config;
     }, error => {
+        console.log('error', error);
         // loading.close();
         if (error) {
             context.$alert('网络错误,请稍后再试！','提示',{
@@ -25,22 +26,23 @@ axios.interceptors.request.use(
 
 axios.interceptors.response.use(
     res => {
+        // console.log('响应res', res);
         // loading.close();
         if (res.data.code == 200) {
             return res.data;
+        }else {
+            context.$alert(res.data.message,'提示',{
+                confirmButtonText: '确定'
+            }).then(()=>{
+                // if(res.data.code == '1005') {
+                //     context.$router.replace({path:'/login'});
+                // }
+                context.$router.replace({path:'/login'});
+            });
         }
-        // else {
-        //     context.$alert(res.data.msg,'提示',{
-        //         confirmButtonText: '确定'
-        //     }).then(()=>{
-        //         if(res.data.code == '1005') {
-        //             context.$router.replace({path:'/login'});
-        //         }
-        //     });
-        // }
     },
     err => {
-        console.dir('err', err);
+        console.log('err', err);
         // loading.close();
         // if (err.message.includes('timeout')) {
         //     err.message = '请求超时';
@@ -116,7 +118,7 @@ export const login = (params) => {
 
 //登出
 export const loginOut = () => {
-    return requestLoading(`${Prefix}/LoginOut`, 'get', {})
+    return requestLoading(`${Prefix}act=merchant_login&op=logout&client_type=ajax`, 'post')
 }
 
 // 获取ip列表
@@ -125,8 +127,19 @@ export const getIpList = () => {
 }
 
 // 获取订单统计列表
-export const getOrderList = () => {
-    return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&page=1`, 'post')
+export const getOrderList = (page) => {
+    return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&page=${page}`, 'post')
+}
+
+/**
+ * 查询订单统计列表
+ * @param {*} page 页码
+ * @param {*} start_time 开始时间
+ * @param {*} end_time 结束时间
+ * @param {*} card_type 充值类型
+ */
+export const queryList = (start_time, end_time, card_type) => {
+    return requestLoading(`${Prefix}act=merchant_order&op=list&client_type=ajax&start_time=${start_time}&end_time=${end_time}&card_type=${card_type}`, 'post')
 }
 // 余额列表
 // export const balanceList = (params) => {

src/pages/index.vue

@@ -146,11 +146,12 @@ export default {
         },
         onLoginOut() {
             loginOut().then((res) => {
-                if (res && res.msg == "ok") {
-                    this.$router.replace({
-                        path: "/login",
-                    });
-                }
+                console.log('登出', res);
+                // if (res && res.msg == "ok") {
+                //     this.$router.replace({
+                //         path: "/login",
+                //     });
+                // }
             });
         },
         onEditSubmit(formName) {

src/pages/subPages/message.vue

@@ -33,14 +33,14 @@
     </div> -->
     <el-table :data="tableData" border style="width: 100%">
         <el-table-column align="center" type="index" width="50" label="序号" />
+        <el-table-column align="center" prop="datetime" label="业务订单号"></el-table-column>
         <el-table-column align="center" prop="id" label="资金变动类型"></el-table-column>
         <el-table-column align="center" prop="alias" label="变更内容"></el-table-column>
         <el-table-column align="center" prop="box_number" label="变动金额"></el-table-column>
         <el-table-column align="center" prop="order_sn" label="时间"></el-table-column>
         <el-table-column align="center" prop="msg" 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>
-        <el-table-column align="center" prop="datetime" 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> -->
         <el-table-column align="center" prop="datetime" label="操作" />
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">

src/pages/subPages/order.vue

@@ -4,7 +4,7 @@
         <el-date-picker
             v-model="dataRange"
             :clearable="false"
-            value-format="yyyy-MM-dd&nbspHH:mm:ss"
+            value-format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         <el-select v-model="RechargeType" placeholder="--充值类型--" style="margin-left: 10px">
@@ -15,7 +15,8 @@
                 :value="item.value">
             </el-option>
         </el-select>
-        <el-button style="margin-left:10px;" type="primary">查询</el-button>
+        <el-button style="margin-left:10px;" type="primary" @click="queryList">查询</el-button>
+        <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
     </el-header>
 
     <!-- 订单总数 -->
@@ -32,10 +33,10 @@
         <el-table-column align="center" prop="card_no" label="卡号"></el-table-column>
         <el-table-column align="center" prop="mch_amount" label="充值金额"></el-table-column>
         <!-- TODO -->
-        <el-table-column align="center" prop="admin_id" label="充值类型"></el-table-column>
+        <el-table-column align="center" prop="card_type_name" label="充值类型"></el-table-column>
         <el-table-column align="center" prop="order_time" label="充值时间"></el-table-column>
         <el-table-column align="center" prop="notify_time" label="成功时间"></el-table-column>
-        <el-table-column align="center" prop="content" label="状态"></el-table-column>
+        <el-table-column align="center" prop="notify_state" label="充值状态"></el-table-column>
         <el-table-column align="center" prop="ch_trade_no" label="批次号"></el-table-column>
         <el-table-column align="center" prop="order_sn" label="平台单号"></el-table-column>
         <!-- TODO -->
@@ -50,17 +51,42 @@
 <script>
 import {
     // actionLogList
-    getOrderList
+    getOrderList,
+    queryList
 } from "@/api";
 import { moneyType } from '@/utils/constants'
+// import getIp from '@/utils/ip'
 export default {
     name: 'order',
     data() {
         return {
-            tableData: [],
+            tableData: [
+                // {card_no: 123},
+                // {card_no: 1234},
+                // {card_no: 1235},
+                // {card_no: 1236},
+                // {card_no: 1237},
+                // {card_no: 1238},
+                // {card_no: 1239},
+                // {card_no: 1231},
+                // {card_no: 113},
+                // {card_no: 111},
+                // {card_no: 133},
+                // {card_no: 143},
+                // {card_no: 153},
+                // {card_no: 163},
+                // {card_no: 173},
+                // {card_no: 183},
+                // {card_no: 193},
+                // {card_no: 193},
+                // {card_no: 193},
+                // {card_no: 193},
+                // {card_no: 193},
+                // {card_no: 193},
+            ],
             pageSize: 10,
             pageNumber: 1,
-            total: 0,
+            total: 22,
             // 筛选时间 start_time end_time
             dataRange: [],
             // 订单总数
@@ -89,9 +115,12 @@ export default {
     methods: {
         // 获取订单列表
         async getOrderList () {
-            const res = await getOrderList()
+            const res = await getOrderList(1)
             console.log('订单列表', res);
-            this.tableData = res.datas
+            this.tableData = res.datas.data
+            this.total = res.datas.total
+            // const res = await getIp()
+            // console.log('res', res);
         },
         // getActionLogList() {
         //     const _self = this;
@@ -106,6 +135,22 @@ export default {
         //         }
         //     });
         // },
+        // 查询
+        async queryList() {
+            const startTime = this.dataRange[0]
+            const endTime = this.dataRange[1]
+            const res = await queryList(startTime, endTime, this.RechargeType)
+            console.log('查询订单', res);
+            this.tableData = res.datas.data
+            this.total = res.datas.total
+        },
+        // 重置
+        onReset() {
+            this.pageNumber = 1;
+            this.dataRange = [];
+            this.RechargeType = ''
+            this.getOrderList();
+        },
         // 分页
         onPageChange(page) {
             if (page == this.pageNumber) {
@@ -114,7 +159,7 @@ export default {
                 this.pageNumber = page;
                 setTimeout(() => {
                     // this.getActionLogList();
-                    this.getOrderList()
+                    this.getOrderList(this.pageNumber)
                 }, 0);
             }
         },

src/pages/subPages/view.vue

@@ -68,7 +68,7 @@ export default {
         async getIpList() {
             const res = await getIpList()
             console.log('获取ip列表', res);
-            this.tableData = res.datas
+            // this.tableData = res.datas
 
         },
         // 删除

src/router/index.js

@@ -19,6 +19,7 @@ Vue.use(VueRouter)
     name: 'Index',
     component: Index,
     // redirect:'/express',
+    // redirect:'/balance',
     children:[
       // 订单统计
       {

src/utils/constants.js

@@ -14,6 +14,7 @@ export const balanceType = [
 
 // 充值类型
 export const moneyType = [
-  {value: 0, label: '加油卡'},
-  {value: 1, label: '手机卡'}
+  {value: 1, label: '中石油'},
+  {value: 2, label: '中石化'},
+  {value: 3, label: '手机卡'}
 ]