更新

pages/main/index/balance_change.vue

@@ -4,18 +4,18 @@
       <el-row :gutter="20">
         <el-col :span="3">
           <el-form-item label="用户">
-            <el-input placeholder="UID/昵称"></el-input>
+            <el-input placeholder="UID" v-model="user"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="3">
           <el-form-item label="编号">
-            <el-input placeholder="订单编号"></el-input>
+            <el-input placeholder="订单编号" v-model="order_no"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="7">
           <el-form-item label="时间范围" label-width="80px">
             <el-date-picker
-              v-model="value1"
+              v-model="timeRange"
               type="daterange"
               range-separator="至"
               start-placeholder="开始时间"
@@ -23,7 +23,7 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-button type="primary" plain>筛选</el-button>
+        <el-button type="primary" plain @click="getFinanceList">筛选</el-button>
         <el-button plain>导出报表</el-button>
       </el-row>
     </el-form>
@@ -113,13 +113,13 @@
     <div class="order-footer">
       <el-pagination
         background
-        @current-change="getTableData"
+        @current-change="getFinanceList"
         @size-change="changePageSize"
         :current-page.sync="currentPage"
         :page-sizes="[10, 20, 30, 40]"
         :page-size="20"
         layout="total, sizes, prev, pager, next, jumper"
-        :total="totalCount"
+        :total="count"
       ></el-pagination>
     </div>
   </div>
@@ -132,6 +132,10 @@ export default {
       currentPage:1,
       currentPageSize:20,
       coins:[],
+      count:1,
+      user:'',
+      order_no:'',
+      timeRange:[],
     }
   },
   mounted() {
@@ -143,13 +147,23 @@ export default {
     },
 
     async getFinanceList() {
+      this.user=this.$route.query.user;
       let body = {
         page: this.currentPage,
         size: this.currentPageSize,
-        user:this.$route.query.user,
+        user:this.user,
       };
+      if (this.order_no){
+        body.order_no=this.order_no;
+      }
+      if (this.timeRange.length>0){
+        console.log(this.timeRange);
+        body.start_time=this.timeRange[0]/1000;
+        body.end_time=this.timeRange[1]/1000;
+      }
       const res = await this.$post("/api/admin/order/get_coins", body);
-      this.coins = res.data;
+      this.coins = res.data.list;
+      this.count=Number(res.data.count);
     },
     async downFinanceList() {
       let body = {

pages/main/index/user_bills.vue

@@ -1,7 +1,7 @@
 <template>
-  <div>
-    <div>
-    <div class="user-name">用户：开发者大汪(123132)</div>
+  <div id="mainBody">
+    <div v-if="user">
+    <div class="user-name">用户：{{user.nickname}}({{user.uid}})</div>
     <div class="user-info">订单数量：{{totalCount}}（支付成功 {{successCount}}），收入金额：{{income_sum}}元（成功 {{income_success_sum}}元），支出金额：{{expense_sum}}元（成功 {{expense_success_sum}}元），当前余额 {{balance}}元</div>
     <el-table
       :data="finaceList" border
@@ -90,6 +90,7 @@
   export default {
     data() {
       return {
+        user:{},
         tradeList: [
           {
             id: 0,
@@ -127,9 +128,6 @@
         currentPageSize: 20,
         // 列表数据
         tableData: [],
-        localData: {
-          env: "test"
-        }
       };
     },
     computed: {
@@ -148,48 +146,6 @@
       changePageSize(val) {
         this.getFinanceList();
       },
-      // 格式化列表数据
-      formatTableData(data) {
-        return data.map(i => ({
-          ...i,
-          payAround: `${i.start_time}<br>${i.end_time}`,
-          pre_send_salary_timeShow: new Date(
-            i.pre_send_salary_time * 1000
-          ).toLocaleDateString()
-        }));
-      },
-      formatDate(time) {
-        var now = new Date(time * 1000);
-        var year = now.getFullYear();
-        var month = now.getMonth() + 1;
-        var date = now.getDate();
-        var hour = now.getHours();
-        var minute = now.getMinutes();
-        var second = now.getSeconds();
-        if (hour < 10) {
-          hour = "0" + hour;
-        }
-        if (minute < 10) {
-          minute = "0" + minute;
-        }
-        if (second < 10) {
-          second = "0" + second;
-        }
-        return (
-          year +
-          "-" +
-          month +
-          "-" +
-          date +
-          " " +
-          hour +
-          ":" +
-          minute +
-          ":" +
-          second
-        );
-      },
-
       // 获取列表数据
 
       async getFinanceList() {
@@ -209,6 +165,8 @@
         this.expense_sum=Number(data.expense_sum);
         this.expense_success_sum=Number(data.expense_success_sum);
         this.balance=data.total_balance.total_balance;
+        this.user=data.user;
+        //console.log(this.user.nickname);
       },
       async downFinanceList() {
         let body = {
@@ -223,14 +181,6 @@
         console.log(url);
         window.location.href = "http://" + url;
       },
-      createOrder() {
-        this.$router.push({
-          path: "artificial_order/",
-          query: {
-            type: "create"
-          }
-        });
-      }
     }
   };
 </script>
@@ -257,4 +207,9 @@
     display: -webkit-box;
     -webkit-box-orient: vertical;
   }
+  #mainBody {
+    white-space: nowrap;
+    overflow-x: scroll;
+    height: calc(100% - 40px);
+  }
 </style>