From 011117d3187850c6fd80f2b0d57b313ed48d21e9 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Thu, 19 Sep 2024 14:32:51 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=E3=80=90=E5=95=86=E5=9F=8E=E5=B0=8F?=
 =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E3=80=91=E5=95=86=E5=93=81=E8=B6=B3=E8=BF=B9?=
 =?UTF-8?q?=E2=80=94=E7=82=B9=E5=87=BB=E9=A1=B6=E9=83=A8=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E6=95=B0=E6=8D=AE=E6=97=A0=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/History/index.vue | 67 +++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
index f9a9f0e..3533c37 100644
--- a/pages/user/History/index.vue
+++ b/pages/user/History/index.vue
@@ -1,13 +1,13 @@
 <template>
-  <view>
-    <view class="v12-justify-around v12-pa-2 v12-white">
+  <view class="v12-pb-10">
+    <view class="v12-justify-around v12-pa-2 v12-white data-nav">
       <view
         v-for="(day, i) in currentWeek"
         :key="i"
         class="v12-font-26"
       >
         <view style="color:#BCBCBC" class="day-wrap">{{ getDate(day) }}</view>
-        <view class="v12-dark-text day-wrap" :class="{'active': actived === i}">{{ getDay(day) }}</view>
+        <view class="v12-dark-text day-wrap" :class="{'active': actived === i, 'disabled': disabled(day)}" @click="handle(day, i)">{{ getDay(day) }}</view>
       </view>
     </view>
     <view v-if="isLoad" class="history-wrap">
@@ -15,8 +15,10 @@
         v-for="(item, index) in items"
         :key="index"
         class="v12-mt-3"
+        :id="`history-${item.historyDate}`"
       >
-        <view>
+        <view class="" style="height: 56px; width: 100%" v-if="isSrcoll"></view>
+        <view >
           <text class="v12-font-bold v12-font-32">{{ item.historyDate }}</text>
           <view class="wrapper">
             <view
@@ -83,17 +85,28 @@ export default {
       actived: 0,
       webUrl: this.$VUE_APP_RESOURCES_URL,
       isLoad: false,
-      items: []
+      items: [],
+      isSrcoll: false
     }
   },
   onLoad() {
     this.queryHistory()
   },
-  mounted() {
-    this.currentWeek = this.getWeek()
-    this.actived = this.getActived()
+  onShow() {
+    this.$nextTick(() => {
+      this.currentWeek = this.getWeek()
+      this.actived = this.getActived()
+    })
   },
   methods: {
+    disabled(day) {
+      const dayItems = this.items.filter(item => {
+        return item.historyDate === day
+      }).map(e => {
+        return e.histories
+      }).flat()
+      return dayItems.length === 0
+    },
     getActived() {
       const weekMap = this.currentWeek.map(e => new Date(e).getDay())
       const today = new Date().getDay()
@@ -137,8 +150,20 @@ export default {
       return dateMap[d]
     },
     handle(day, i) {
+      if(this.disabled(day)) return
       this.actived = i
-      
+      this.isSrcoll = true
+      uni.pageScrollTo({
+        selector:`#history-${day}`,
+        duration:200,
+        success:(success)=>{
+          this.isSrcoll = false
+        },
+      })
+    },
+    formatStr(str) {
+      const regx = /-/g
+      return str.replace(regx, '')
     },
     goodsDetail (item) {
       this.$yrouter.push({
@@ -154,13 +179,14 @@ export default {
       getHistory().then(res => {
         const { data = [] } = res
         if (data.length > 0) {
-          data.map(item => {
-            if (item.histories) {
-              if (item.histories.length > 0) {
-                this.items.push(item)
-              }
-            }
-          })
+          this.items = data.filter(e => e.histories && e.histories.length > 0).reverse()
+          // data.map(item => {
+          //   if (item.histories) {
+          //     if (item.histories.length > 0) {
+          //       this.items.push(item)
+          //     }
+          //   }
+          // })
         }
       }).finally(() => {
         this.isLoad = true
@@ -172,6 +198,15 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.data-nav{
+  position: sticky;
+  width: 100%;
+  top: 0;
+  z-index: 9;
+}
+.disabled{
+  color: #CBCBCB !important;
+}
 .history-wrap {
   padding: 0 20rpx;
   .img-nodata {