基本布局

.gitignore

@@ -3,6 +3,7 @@ node_modules
 /dist
 /admin
 package-lock.json
+debug.log
 
 # local env files
 .env.local

src/pages/subPages/order.vue

@@ -1,86 +1,105 @@
-<template>
-<el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">订单管理</el-header>
-    <div style="margin:10px 0;">
-        <el-input placeholder="请输入订单号" v-model="searchValue" style="width:200px;margin-left:10px;margin-right:10px;" />
-        <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-        <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
-        <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
-    </div>
-
-    <el-table :data="tableData" border style="width: 100%;">
-        <el-table-column align="center" prop="id" label="订单id"></el-table-column>
-        <el-table-column align="center" prop="order_sn" 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="code" label="取件码"></el-table-column>
-        <el-table-column align="center" prop="order_status" label="订单状态"></el-table-column>
-        <el-table-column align="center" prop="enter_time" label="存件日期"></el-table-column>
-        <el-table-column align="center" prop="out_time" label="取件日期"></el-table-column>
-    </el-table>
-    <el-row style="margin-top:10px;" type="flex" justify="end">
-        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
-    </el-row>
-</el-container>
-</template>
-
-<script>
-import {
-    orderList
-} from "@/api";
-export default {
-    data() {
-        return {
-            tableData: [],
-            pageSize: 10,
-            pageNumber: 1,
-            total: 0,
-            searchValue: "",
-            dataRange: []
-        };
-    },
-    mounted() {
-        this.getOrderList();
-    },
-    methods: {
-        getOrderList() {
-            const _self = this;
-            orderList({
-                pageSize: _self.pageSize,
-                pageNumber: _self.pageNumber,
-                order_sn: _self.searchValue,
-                start_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[0] : '',
-                end_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[1] : ''
-            }).then((res) => {
-                if (res && res.msg == "ok") {
-                    _self.total = res.data.total;
-                    _self.tableData = [...res.data.rows];
-                }
-            });
-        },
-        onPageChange(page) {
-            if (page == this.pageNumber) {
-                return;
-            } else {
-                this.pageNumber = page;
-                setTimeout(() => {
-                    this.getOrderList();
-                }, 0);
-            }
-        },
-        onSearch() {
-            this.pageNumber = 1;
-            this.getOrderList();
-        },
-        onReset() {
-            this.searchValue = "";
-            this.pageNumber = 1;
-            this.dataRange = [];
-            this.getOrderList();
-        },
-    },
-};
-</script>
-
-<style scoped>
-</style>
+<template>
+<el-container direction="vertical">
+    <!-- <el-header height="40px" style="border-bottom: 1px solid #eee">余额充值</el-header> -->
+    <div style="margin:10px 0;">
+        <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-input placeholder="请输入订单ID" v-model="searchValue" style="width:200px;margin-left:10px;margin-right:10px;" />
+        <el-select v-model="value" placeholder="--请选择状态--">
+            <el-option
+                v-for="item in balanceType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+        </el-select>
+        <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
+        <el-button style="margin-left:10px;" type="danger" @click="onReset">重置</el-button>
+    </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="id" label="订单id"></el-table-column>
+        <el-table-column align="center" prop="type" label="类型"></el-table-column>
+        <el-table-column align="center" prop="money" label="金额/元"></el-table-column>
+        <el-table-column align="center" prop="status" label="状态"></el-table-column>
+        <el-table-column align="center" prop="apply_name" label="申请姓名"></el-table-column>
+        <el-table-column align="center" prop="order_status" label="账号"></el-table-column>
+        <el-table-column align="center" prop="bank_name" label="银行名称"></el-table-column>
+        <el-table-column align="center" prop="recharge_type" label="充值方式"></el-table-column>
+        <el-table-column align="center" prop="payment_type" label="支付方式"></el-table-column>
+        <el-table-column align="center" prop="recharge_code" label="充值凭证"></el-table-column>
+        <el-table-column align="center" prop="apply_time" label="申请时间" width="180"></el-table-column>
+        <el-table-column align="center" prop="examine_time" label="审核时间" width="180"></el-table-column>
+    </el-table>
+    <el-row style="margin-top:10px;" type="flex" justify="end">
+        <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
+    </el-row>
+</el-container>
+</template>
+
+<script>
+import {
+    balanceList
+} from "@/api";
+import { balanceType } from '@/utils/constants'
+export default {
+    data() {
+        return {
+            tableData: [
+                {id: 1, type: '预充值', money: '', status: '审核中', apply_name: 'admin', order_status: '', bank_name: '', recharge_type: '银行卡', payment_type: '线下支付', recharge_code: '', apply_time: '2020-12-7 10:55', examine_time: '2020-12-07 10:55'},
+                {id: 2, type: '预充值', money: '', status: '审核中', apply_name: 'admin', order_status: '', bank_name: '', recharge_type: '银行卡', payment_type: '线下支付', recharge_code: '', apply_time: '2020-12-7 11:00', examine_time: '2020-12-07 11:00'},
+            ],
+            pageSize: 10,
+            pageNumber: 1,
+            total: 0,
+            searchValue: "",
+            dataRange: [],
+            // 余额状态
+            balanceType
+        };
+    },
+    mounted() {
+        // this.getOrderList();
+    },
+    methods: {
+        getOrderList() {
+            const _self = this;
+            balanceList({
+                pageSize: _self.pageSize,
+                pageNumber: _self.pageNumber,
+                order_sn: _self.searchValue,
+                start_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[0] : '',
+                end_time: _self.dataRange && _self.dataRange.length == 2 ? _self.dataRange[1] : ''
+            }).then((res) => {
+                if (res && res.msg == "ok") {
+                    _self.total = res.data.total;
+                    _self.tableData = [...res.data.rows];
+                }
+            });
+        },
+        onPageChange(page) {
+            if (page == this.pageNumber) {
+                return;
+            } else {
+                this.pageNumber = page;
+                setTimeout(() => {
+                    this.getOrderList();
+                }, 0);
+            }
+        },
+        onSearch() {
+            this.pageNumber = 1;
+            this.getOrderList();
+        },
+        onReset() {
+            this.searchValue = "";
+            this.pageNumber = 1;
+            this.dataRange = [];
+            this.getOrderList();
+        },
+    },
+};
+</script>
+
+<style scoped>
+</style>

src/pages/subPages/log.vue

@@ -1,18 +1,33 @@
 <template>
 <el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">日志管理</el-header>
-    <!-- <div style="margin:10px 0;">
-      <el-date-picker v-model="selectDate" type="date" placeholder="选择日期"></el-date-picker>
-      <el-button style="margin-left:10px;" type="primary">查询</el-button>
-    </div>
-    -->
-    <el-table :data="tableData" border style="width: 100%">
-        <el-table-column align="center" prop="id" label="记录ID"></el-table-column>
-        <el-table-column align="center" prop="admin_id" label="管理员ID"></el-table-column>
-        <el-table-column align="center" prop="username" label="管理员名称"></el-table-column>
-        <el-table-column align="center" prop="content" label="操作接口地址"></el-table-column>
-        <el-table-column align="center" prop="ip" label="IP地址"></el-table-column>
-        <el-table-column align="center" prop="date" label="记录日期"></el-table-column>
+    <el-header height="40px">
+        <el-date-picker
+            v-model="dataRange"
+            :clearable="false"
+            value-format="yyyy-MM-dd&nbspHH:mm:ss"
+            type="datetimerange"
+            range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-button style="margin-left:10px;" type="primary">查询</el-button>
+    </el-header>
+
+    <!-- 订单总数 -->
+    <el-alert
+        :title="'订单总数 : ' + oderCount +'笔 成功订单数 : ' + successCount + '笔 成功率 : '+ SuccessRate + '订单总金额 : '+ countMoney +'元 成功订单总金额 : '+successMoney +' 元 商户扣款 :'+deduction + '元'"
+        type="info"
+        show-icon
+        style="margin-top:20px"
+        :closable="false">
+    </el-alert>
+   
+    <el-table :data="tableData" border style="width: 100%; margin-top:20px">
+        <el-table-column align="center" type="index" width="50" label="序号" />
+        <el-table-column align="center" prop="name" label="名称"></el-table-column>
+        <el-table-column align="center" prop="admin_id" label="订单总数"></el-table-column>
+        <el-table-column align="center" prop="username" label="成功订单数"></el-table-column>
+        <el-table-column align="center" prop="content" label="成功率"></el-table-column>
+        <el-table-column align="center" prop="ip" label="订单总金额"></el-table-column>
+        <el-table-column align="center" prop="date" label="成功订单总金额"></el-table-column>
+        <el-table-column align="center" prop="date" label="商户扣款"></el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" :current-page="pageNumber" @current-change="onPageChange"></el-pagination>
@@ -31,6 +46,21 @@ export default {
             pageSize: 10,
             pageNumber: 1,
             total: 0,
+            // 筛选时间
+            dataRange: [],
+            // 订单总数
+            oderCount: 0,
+            // 成功订单数
+            successCount: 0,
+            // 成功率
+            SuccessRate: 0,
+            // 订单总金额
+            countMoney: 0,
+            // 成功订单总金额
+            successMoney: 0,
+            // 商户扣款
+            deduction: 0
+
         };
     },
     mounted() {
@@ -65,4 +95,7 @@ export default {
 </script>
 
 <style scoped>
+.el-header {
+    padding: 0;
+}
 </style>

src/pages/subPages/message.vue

@@ -1,7 +1,20 @@
 <template>
 <el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">消息通知</el-header>
     <div style="margin:10px 0;">
+        <el-date-picker v-model="dataRange" :clearable="false" value-format="yyyy-MM-dd&nbspHH:mm:ss" type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="margin-right: 10px"></el-date-picker>
+        <el-input placeholder="业务单号" style="width:182px; margin-right: 10px" v-model="orderNum" ></el-input>
+        <el-select v-model="value" placeholder="变动类型" style="margin-right: 10px">
+            <el-option
+                v-for="item in changeType"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+            </el-option>
+        </el-select>
+        <el-input placeholder="变更内容" style="width:182px;margin-right: 10px" v-model="changeContent"></el-input>
+        <el-button type="primary" style="margin-left:10px;">查询</el-button>
+    </div>
+    <!-- <div style="margin:10px 0;">
         <el-form :inline="true">
             <el-form-item label="选择柜子">
                 <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
@@ -17,15 +30,18 @@
                 <el-button style="margin-left:10px;" type="primary" @click="onSearch">查询</el-button>
             </el-form-item>
         </el-form>
-    </div>
+    </div> -->
     <el-table :data="tableData" border style="width: 100%">
-        <el-table-column align="center" prop="id" label="记录ID"></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" type="index" width="50" label="序号" />
+        <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="datetime" label="操作" />
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" @current-change="onPageChange" :current-page="pageNumber"></el-pagination>
@@ -39,6 +55,8 @@ import {
     cabinetList,
     boxList
 } from "@/api";
+// 常量
+import { changeType } from '@/utils/constants'
 export default {
     data() {
         return {
@@ -50,6 +68,12 @@ export default {
             boxValue: "",
             tableData: [],
             total: 0,
+            // 业务单号
+            orderNum: '',
+            // 变更内容
+            changeContent: '',
+            // 变动类型
+            changeType
         };
     },
     created() {

src/pages/subPages/view.vue

@@ -1,8 +1,7 @@
 <template>
 <el-container direction="vertical">
-    <el-header height="40px" style="border-bottom: 1px solid #eee">操作记录</el-header>
     <div style="margin:10px 0;">
-        <el-form :inline="true">
+        <!-- <el-form :inline="true">
             <el-form-item label="选择柜子">
                 <el-select v-model="cabinetValue" placeholder="请选择" @change="onChangeCabinet">
                     <el-option v-for="item in cabinetOptions" :key="item.id" :label="item.alias" :value="item.id"></el-option>
@@ -16,14 +15,21 @@
             <el-form-item>
                 <el-button style="margin-left:10px;" type="primary" :disabled="disSearch" @click="onSearch">查询</el-button>
             </el-form-item>
-        </el-form>
+        </el-form> -->
+        <el-input placeholder="ip" style="width:182px;margin-right:10px" v-model="ip"></el-input>
+        <el-button type="primary">搜索</el-button>
+        <el-button type="success">新增</el-button>
     </div>
     <el-table :data="tableData" border style="width: 100%">
-        <el-table-column align="center" prop="id" label="ID"></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="status_text" label="操作类型"></el-table-column>
-        <el-table-column align="center" prop="datetime" label="操作日期"></el-table-column>
+        <el-table-column align="center" type="index" width="50" label="序号" />
+        <el-table-column align="center" prop="id" label="IP"></el-table-column>
+        <el-table-column align="center" prop="alias" label="状态">
+            <el-tag type="info" disabled>禁用</el-tag>
+            <el-tag type="success">已启用</el-tag>
+        </el-table-column>
+        <el-table-column align="center" prop="box_number" label="操作">
+            <el-tag type="danger">删除</el-tag>
+        </el-table-column>
     </el-table>
     <el-row style="margin-top:10px;" type="flex" justify="end">
         <el-pagination background layout="prev, pager, next" :total="total" :page-size="pageSize" @current-change="onPageChange" :current-page="pageNumber"></el-pagination>
@@ -48,6 +54,8 @@ export default {
             boxValue: "",
             tableData: [],
             total: 0,
+            // ip
+            ip: null
         };
     },
     created() {

src/router/index.js

@@ -4,8 +4,9 @@ import VueRouter from 'vue-router'
 const Index = () => import('@/pages/index');
 const Login = () => import('@/pages/login');
 const Log = () => import('@/pages/subPages/log');
-const Express = () => import('@/pages/subPages/express');
-const Order = () => import('@/pages/subPages/order');
+// 柜体控制
+// const Express = () => import('@/pages/subPages/express');
+const balance = () => import('@/pages/subPages/balance');
 const Message = () => import('@/pages/subPages/message');
 const Status = () => import('@/pages/subPages/status');
 const View = () => import('@/pages/subPages/view');
@@ -17,22 +18,22 @@ Vue.use(VueRouter)
     path: '/',
     name: 'Index',
     component: Index,
-    redirect:'/express',
+    // redirect:'/express',
     children:[
       {
         path:'/log',
         name:'log',
         component:Log
       },
+      // {
+      //   path:'/express',
+      //   name:'express',
+      //   component:Express
+      // },
       {
-        path:'/express',
-        name:'express',
-        component:Express
-      },
-      {
-        path:'/order',
-        name:'order',
-        component:Order
+        path:'/balance',
+        name:'balance',
+        component:balance
       },
       {
         path:'/message',

src/utils/constants.js

@@ -0,0 +1,13 @@
+// 变动类型
+export const changeType = [
+  {value: 0, label: '手工加款'},
+  {value: 1, label: '手工减款'}
+]
+
+// 余额状态
+export const balanceType = [
+  {value: 0, label: '审核中'},
+  {value: 1, label: '审核通过'},
+  {value: 2, label: '审核失败'},
+  {value: 3, label: '等待确认'},
+]