From 705b4980c6c78f3f588d04a68c11c952e5a5b941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 15 Oct 2024 15:27:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/shopowner.vue | 45 ++++++++++++++++++++++++++----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index 1ae19c065..431beba16 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -158,7 +158,7 @@
           </div>
           <div style="margin-right: 40px">
             <el-date-picker
-              v-model="value1"
+              v-model="showValue"
               type="daterange"
               value-format="yyyy-MM-dd HH:mm:ss"
               range-separator="至"
@@ -230,7 +230,7 @@
         </div>
         <div style="margin-right: 40px">
           <el-date-picker
-            v-model="value1"
+            v-model="countValue"
             type="daterange"
             value-format="yyyy-MM-dd HH:mm:ss"
             range-separator="至"
@@ -293,6 +293,8 @@ export default {
       }],
       value: '',
       value1: [],
+      showValue:[],
+      countValue:[],
       value2: [],
       imagePath: process.env.VUE_APP_SERVER_URL,
       queryParams: {},
@@ -359,19 +361,52 @@ export default {
         start.setMinutes(0)
         start.setSeconds(0)
         start.setMilliseconds(0)
-        this.value1 = [start,new Date()];
+        if (index == "1"){
+          this.countValue = [start,new Date()]
+        }else if (index == "2") {
+          this.showValue = [start,new Date()]
+        }else if (index == "3") {
+          this.value2 = [start,new Date()]
+        }else if (index == "4") {
+          this.value1 = [start,new Date()];
+        }
       } else if (command=='近一周'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 6 * 24 * 60 * 60 * 1000)
-        this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        if (index == "1"){
+          this.countValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "2") {
+          this.showValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "3") {
+          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "4") {
+          this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }
       } else if (command=='近一月'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getTime() - 30 * 24 * 60 * 60 * 1000)
-        this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        if (index == "1"){
+          this.countValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "2") {
+          this.showValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "3") {
+          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "4") {
+          this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }
       } else if (command=='近一年'){
         let nowDate = new Date();
         let oneWeekAgo = new Date(nowDate.getFullYear() - 1, nowDate.getMonth(), nowDate.getDate())
         this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        if (index == "1"){
+          this.countValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "2") {
+          this.showValue = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "3") {
+          this.value2 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }else if (index == "4") {
+          this.value1 = [parseTime(oneWeekAgo),parseTime(nowDate)]
+        }
       }else if (command=='自定义'){
         this.disabled = false
       }