From 2acce82e3f7f77a79f1c56b3a47d63935b4a8035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Wed, 10 Jul 2024 09:26:10 +0800
Subject: [PATCH] 1

---
 src/views/daily-statistics/index.vue |  1 +
 src/views/order/list/index.vue       | 33 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/views/daily-statistics/index.vue b/src/views/daily-statistics/index.vue
index bc3bc10..ccb41cb 100644
--- a/src/views/daily-statistics/index.vue
+++ b/src/views/daily-statistics/index.vue
@@ -30,6 +30,7 @@
         align="center"
       >
         <el-table-column label="id" min-width="130" prop="id"></el-table-column>
+        <el-table-column label="时间" min-width="130" prop="date"></el-table-column>
         <el-table-column label="新增用户(人)" min-width="130" prop="reg_count"></el-table-column>
         <el-table-column label="累计用户(人)" min-width="130" prop="user_count"></el-table-column>
         <el-table-column label="支付人数(人)" min-width="130" prop="pay_count"></el-table-column>
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index c2d0b46..ca08571 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -42,6 +42,20 @@
             @change="onchangeTime"
           />
         </el-form-item>
+        <el-form-item label="完成时间：">
+          <el-date-picker
+            v-model="finishTime"
+            value-format="yyyy/MM/dd HH:mm:ss"
+            format="yyyy/MM/dd HH:mm:ss"
+            size="small"
+            type="datetimerange"
+            placement="bottom-end"
+            placeholder="自定义时间"
+            style="width: 280px;"
+            :picker-options="pickerOptions"
+            @change="onchangeFinishTime"
+          />
+        </el-form-item>
         <el-form-item label="活动类型：" prop="activity_type">
           <el-select
             v-model="tableFrom.activity_type"
@@ -434,6 +448,7 @@ export default {
       ], //商品类型
       orderChartType: {},
       timeVal: [],
+      finishTime: [],
       fromList: fromList,
       selectionList: [],
       ids: "",
@@ -483,7 +498,9 @@ export default {
     /**重置 */
     searchReset(){
       this.timeVal = []
+      this.finishTime = []
       this.tableFrom.date = ""
+      this.tableFrom.finish_time = ""
       this.$refs.searchForm.resetFields()
       this.getList(1)
     },
@@ -699,14 +716,6 @@ export default {
       this.tableFromLog.limit = val;
       this.getList('');
     },
-    // 选择时间
-    selectChange(tab) {
-      this.tableFrom.date = tab;
-      this.tableFrom.page = 1;
-      this.timeVal = [];
-      this.getCardList()
-      this.getList(1);
-    },
     // 具体日期
     onchangeTime(e) {
       this.timeVal = e;
@@ -716,6 +725,14 @@ export default {
       this.getCardList()
       this.getList(1);
     },
+    // 具体日期
+    onchangeFinishTime(e) {
+      this.finishTime = e;
+      this.tableFrom.finish_time = e ? this.finishTime.join("-") : "";
+      this.tableFrom.page = 1;
+      this.getCardList()
+      this.getList(1);
+    },
     // 列表
     getList(num) {
       this.listLoading = true;