From b2c286f0f53024c5ab1ce980aa2eca0fddd68319 Mon Sep 17 00:00:00 2001
From: Yer <17633066053@163.com>
Date: Mon, 9 Oct 2023 13:27:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=9B=BE=E4=B8=AD=E5=8F=AF=E8=83=BD=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/components/affix-time.vue         | 73 +++++++++++++------
 .../src/views/lili-components/affix-time.vue  | 72 +++++++++++++-----
 2 files changed, 101 insertions(+), 44 deletions(-)

diff --git a/manager/src/components/affix-time.vue b/manager/src/components/affix-time.vue
index 7bc48c0f..54a2fc87 100644
--- a/manager/src/components/affix-time.vue
+++ b/manager/src/components/affix-time.vue
@@ -1,20 +1,20 @@
 <template>
   <div>
     <div class="breadcrumb">
-      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList"
-        :key="index"> {{item.title}}</span>
+      <span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
+        :key="index"> {{ item.title }}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" clearable
+        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询" clearable
           style="width:200px;margin-left:10px;">
-          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index" clearable>
-            {{ item.year+'年'+item.month+'月' }}</Option>
+          <Option v-for="(item, i) in dates" :value="item.year + '-' + item.month" :key="i" clearable>
+            {{ item.year + '年' + item.month + '月' }}</Option>
         </Select>
       </div>
       <div class="shop-list" v-if="!closeShop">
         <Select clearable @on-change="changeshop(selectedWay)" v-model="storeId" placeholder="店铺查询"
           style="width:200px;margin-left:10px;">
           <Scroll :on-reach-bottom="handleReachBottom">
-            <Option v-for="(item,index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
+            <Option v-for="(item, index) in shopsData" :value="item.id" :key="index">{{ item.storeName }}</Option>
           </Scroll>
         </Select>
       </div>
@@ -31,7 +31,7 @@ export default {
 
       selectedWay: {
         // 可选时间项
-        title: "最近7天",
+        title: "过去7天",
         selected: true,
         searchType: "LAST_SEVEN",
       },
@@ -56,12 +56,35 @@ export default {
           searchType: "YESTERDAY",
         },
         {
-          title: "最近7天",
+          title: "过去7天",
           selected: true,
           searchType: "LAST_SEVEN",
         },
         {
-          title: "最近30天",
+          title: "过去30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
+      originDateList: [
+        // 筛选条件
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "过去7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "过去30天",
           selected: false,
           searchType: "LAST_THIRTY",
         },
@@ -126,8 +149,8 @@ export default {
       this.dates = dates.reverse();
     },
     // 改变已选店铺
-    changeSelect() {
-      console.log(this.month);
+    changeSelect(e) {
+      this.month = e
       if (this.month) {
         this.dateList.forEach((res) => {
           res.selected = false;
@@ -138,34 +161,36 @@ export default {
 
         this.$emit("selected", this.selectedWay);
       } else {
-        const current = this.dateList.find(item=>{return item.selected})
+
+        const current = this.dateList.find(item => { return item.selected })
         this.selectedWay = current
+        this.clickBreadcrumb(current)
         this.$emit("selected", this.selectedWay);
+
+
       }
     },
     // 变更时间
     clickBreadcrumb(item) {
-      this.dateList.forEach((res) => {
+
+      let currentIndex;
+      this.dateList.forEach((res,index) => {
         res.selected = false;
+        if(res.title === item.title){
+          currentIndex = index
+        }
       });
       item.selected = true;
       item.storeId = this.storeId;
       this.month = "";
-      const dateList = this.dateList
-      let currentDate
       if (item.searchType == "") {
-        if (
-          dateList.some((date) => {
-            currentDate = date
-            return date.title == item.title;
-          })
-        ) {
-          item.searchType = currentDate.searchType;
+       let currentDate = this.originDateList[currentIndex].searchType
+        if (currentDate) {
+          item.searchType = currentDate
         } else {
           item.searchType = "LAST_SEVEN";
         }
       }
-
       this.selectedWay = item;
       this.selectedWay.year = new Date().getFullYear();
       this.selectedWay.month = "";
@@ -179,7 +204,7 @@ export default {
 .breadcrumb {
   display: flex;
   align-items: center;
-  > span {
+  >span {
     margin-right: 15px;
     cursor: pointer;
   }
diff --git a/seller/src/views/lili-components/affix-time.vue b/seller/src/views/lili-components/affix-time.vue
index 98a75806..0507f5aa 100644
--- a/seller/src/views/lili-components/affix-time.vue
+++ b/seller/src/views/lili-components/affix-time.vue
@@ -1,10 +1,13 @@
 <template>
   <div>
     <div class="breadcrumb">
-      <span @click="clickBreadcrumb(item,index)" :class="{'active':item.selected}" v-for="(item,index) in dateList" :key="index"> {{item.title}}</span>
+      <span @click="clickBreadcrumb(item, index)" :class="{ 'active': item.selected }" v-for="(item, index) in dateList"
+        :key="index"> {{ item.title }}</span>
       <div class="date-picker">
-        <Select @on-change="changeSelect(selectedWay)" v-model="month" placeholder="年月查询" style="width:200px;margin-left:10px;">
-          <Option v-for="(item,index) in dates" :value="item.year+'-'+item.month" :key="index">{{ item.year+'年'+item.month+'月' }}</Option>
+        <Select @on-change="changeSelect($event, selectedWay)" :value="month" placeholder="年月查询"
+          style="width:200px;margin-left:10px;">
+          <Option v-for="(item, index) in dates" :value="item.year + '-' + item.month" :key="index">{{
+            item.year + '年' + item.month + '月' }}</Option>
         </Select>
       </div>
 
@@ -61,10 +64,32 @@ export default {
           searchType: "LAST_THIRTY",
         },
       ],
+      originDateList: [
+        {
+          title: "今天",
+          selected: false,
+          searchType: "TODAY",
+        },
+        {
+          title: "昨天",
+          selected: false,
+          searchType: "YESTERDAY",
+        },
+        {
+          title: "最近7天",
+          selected: true,
+          searchType: "LAST_SEVEN",
+        },
+        {
+          title: "最近30天",
+          selected: false,
+          searchType: "LAST_THIRTY",
+        },
+      ],
     };
   },
   mounted() {
-   this.storeId = JSON.parse(Cookies.get("userInfoSeller")).id;
+    this.storeId = JSON.parse(Cookies.get("userInfoSeller")).id;
     this.getFiveYears();
   },
   methods: {
@@ -90,7 +115,8 @@ export default {
       this.dates = dates.reverse();
     },
     // 选择回调
-    changeSelect() {
+    changeSelect(e) {
+      this.month = e
       if (this.month) {
         this.dateList.forEach((res) => {
           res.selected = false;
@@ -101,33 +127,36 @@ export default {
 
         this.$emit("selected", this.selectedWay);
       } else {
-        const current = this.dateList.find(item=>{return item.selected})
+
+        const current = this.dateList.find(item => { return item.selected })
         this.selectedWay = current
+        this.clickBreadcrumb(current)
         this.$emit("selected", this.selectedWay);
+
+
       }
     },
     // 点击时间筛选
     clickBreadcrumb(item) {
-      this.dateList.forEach((res) => {
+
+      let currentIndex;
+      this.dateList.forEach((res, index) => {
         res.selected = false;
+        if (res.title === item.title) {
+          currentIndex = index
+        }
       });
       item.selected = true;
       item.storeId = this.storeId;
       this.month = "";
-      const dateList = this.dateList
-      let currentDate
-       if (item.searchType == "") {
-        if (
-          dateList.some((date) => {
-            return date.title == item.title;
-          })
-        ) {
-          item.searchType = currentDate.searchType;
+      if (item.searchType == "") {
+        let currentDate = this.originDateList[currentIndex].searchType
+        if (currentDate) {
+          item.searchType = currentDate
         } else {
           item.searchType = "LAST_SEVEN";
         }
       }
-
       this.selectedWay = item;
       this.selectedWay.year = new Date().getFullYear();
       this.selectedWay.month = "";
@@ -141,17 +170,20 @@ export default {
 .breadcrumb {
   display: flex;
   align-items: center;
-  > span {
+
+  >span {
     margin-right: 15px;
     cursor: pointer;
   }
 }
+
 .active {
   color: $theme_color;
   position: relative;
 }
-.date-picker {
-}
+
+.date-picker {}
+
 .active:before {
   content: "";
   position: absolute;