From 8ba2752f10796b9ad62826953d426e3d5bf9ed9c Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Sat, 17 Jun 2023 14:42:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=A5=E6=94=B6=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pile/merchant/components/revenue.vue      | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/jsowell-ui/src/views/pile/merchant/components/revenue.vue b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
index 3f16c0372..7ac0cca25 100644
--- a/jsowell-ui/src/views/pile/merchant/components/revenue.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/revenue.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
-      <h2>营收总报</h2>
+         <h2>营收总报</h2>
+     <el-card shadow="hover" style="margin-bottom:10px;padding:10px">
         <el-descriptions >
     <el-descriptions-item label="用电度数">{{merchantOrderReport.useElectricity}}度</el-descriptions-item>
     <el-descriptions-item label="充电次数">{{merchantOrderReport.chargeNum}}次</el-descriptions-item>
@@ -12,6 +13,7 @@
     <el-descriptions-item label="交易手续费">{{merchantOrderReport.tradeFee}}</el-descriptions-item>
     <el-descriptions-item label="虚拟金额">{{merchantOrderReport.virtualAmount}}元</el-descriptions-item>
 </el-descriptions>
+     </el-card>
         <h2>营收日报</h2>
         <el-form
             :model="queryParams"
@@ -22,9 +24,9 @@
         >
             <el-form-item label="日期" prop="tradeDate">
                 <el-date-picker
-                    v-model="value"
+                    v-model="createTimeRange"
                     style="width: 240px"
-                    value-format="yyyy-MM-dd HH:mm:ss"
+                    value-format="yyyy-MM-dd"
                     :default-time="['00:00:00', '23:59:59']"
                     type="daterange"
                     range-separator="至"
@@ -108,11 +110,12 @@
 
 <script>
 import { getMerchantOrderReport } from "@/api/adapayMember/adapayMember";
+import { getDay } from "@/utils/common";
 export default {
     props: ["merchantId"],
     data() {
         return {
-            value: "",
+            createTimeRange: [],
             reportList: [],
             merchantOrderReport: {},
             total:0,
@@ -131,19 +134,20 @@ export default {
             getMerchantOrderReport(this.queryParams).then(
                 (response) => {
                     // console.log("查询报表", reportList, merchantOrderReport);
-                    // console.log('getMerchantOrderReport',response)
-                    this.reportList = response.data.pageResponse.list;
+                    console.log('getMerchantOrderReport',response)
+                   if(response.data){
+                     this.reportList = response.data.pageResponse.list;
                     this.merchantOrderReport = response.data.merchantOrderReport;
-                    // console.log("查询报表", this.merchantOrderReport, this.reportList);
                     this.total = response.data.pageResponse.total
+                   } else{
+                    this.reportList =[]
+                   }
                 }
             );
         },
         handleQuery() {
-            console.log("this.value 日期", this.value);
-            let arr = this.value[0].split(' ')[0]
-            let str = this.value[1].split(' ')[0]
-            console.log('arr,str',arr,str)
+            let arr = this.createTimeRange[0]
+            let str = this.createTimeRange[1]
             this.queryParams.startTime = arr
             this.queryParams.endTime = str
             this.queryParams.pageNum = 1;
@@ -151,7 +155,7 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            this.value = ''
+            this.createTimeRange = []
              this.queryParams.startTime = ''
             this.queryParams.endTime =''
             this.resetForm("queryForm");
@@ -163,8 +167,19 @@ export default {
             // this.single = selection.length!==1
             // this.multiple = !selection.length
         },
+          defaultDate() {
+            //字符串拼接，开始时间，结束时间
+            let beg = getDay(-7); //当月第一天
+            let end = getDay(0); //当天
+            this.createTimeRange = [beg, end]; //将值设置给插件绑定的数据
+            // return this.createTimeRange;
+            this.queryParams.startTime = beg
+            this.queryParams.endTime = end
+        },
+        
     },
-    created() {
+    async created() {
+        await this.defaultDate()
         this.getList();
     },
 };