From 4002777d40caafcddbc39a97e258615bb64dc691 Mon Sep 17 00:00:00 2001
From: Fox-33 <1466778434@qq.com>
Date: Tue, 9 Sep 2025 20:41:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/home/productSwiper.vue    | 26 ++++++++++++++------
 pages/index/index.vue                | 47 +++---------------------------------
 pages_order/home/recommendSwiper.vue | 24 +++++++++++++-----
 pages_order/report/test/answer.vue   |  5 ++--
 4 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/components/home/productSwiper.vue b/components/home/productSwiper.vue
index 978b576..57813c3 100644
--- a/components/home/productSwiper.vue
+++ b/components/home/productSwiper.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="product-swiper__view">
+  <view>
     <swiper 
       class="swiper" 
       :current="current"
@@ -49,17 +49,13 @@
 	export default {
 		components: {
       indicator,
-    },
-    props: {
-      autoplay: {
-        type: Boolean,
-        default: false,
-      },
     },
 		data() {
 			return {
         current: 0,
         list: [],
+        last: null,
+        autoplay: true,
 			}
 		},
 		created() {
@@ -85,6 +81,22 @@
       },
       onChange(e) {
         this.current = e.detail.current
+        const currentTime = this.$dayjs()
+
+        if (this.last) {
+          const diff = currentTime.diff(this.last, 'millisecond')
+          console.log('diff', diff, e.detail.source)
+          if (diff < 2500 && e.detail.source === 'autoplay') {
+            console.log('autoplay abnormal')
+            this.autoplay = false
+            setTimeout(() => {
+              console.log('autoplay restart')
+              this.autoplay = true
+            }, 3000 - diff)
+          }
+        }
+
+        this.last = currentTime
       },
 		},
   }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 91d5e56..a1c69a4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,15 +6,11 @@
 		</navbar>
 
 		<view class="content">
-			<view id="productSwiper" class="swiper">
-				<productSwiper :autoplay="autoplay.productSwiper"></productSwiper>
-			</view>
+			<productSwiper></productSwiper>
 
 			<view class="section">
 				<sectionHeader title="个性推荐" desc="Personal Recommendation"></sectionHeader>
-				<view id="recommendSwiper" class="swiper">
-					<recommend-swiper :autoplay="autoplay.recommendSwiper"></recommend-swiper>
-				</view>
+				<recommend-swiper></recommend-swiper>
 				<health-records-intro></health-records-intro>
 			</view>
 
@@ -66,12 +62,6 @@
 		},
 		data() {
 			return {
-				isMounted: false,
-        observer: null,
-				autoplay: {
-					productSwiper: false,
-					recommendSwiper: false,
-				},
 			}
 		},
 		onLoad() {
@@ -81,37 +71,7 @@
 			}
 
 		},
-		onShow() {
-			if (this.isMounted) {
-				this.observeElement()
-			}
-		},
-    mounted() {
-      this.observeElement()
-			this.isMounted = true
-    },
-    unmounted() {
-      this.observer.disconnect()
-    },
-		onHide() {
-      this.observer.disconnect()
-			this.observer = null
-			this.autoplay.productSwiper = false
-			this.autoplay.recommendSwiper = false
-		},
 		methods: {
-      observeElement() {
-        this.observer = uni.createIntersectionObserver(this, { observeAll: true, thresholds: [0, 1] });
-
-        this.observer.relativeTo('.content').observe('.swiper', res => {
-					if (res.intersectionRatio === 0) {
-						this.autoplay[res.id] = false
-					} else if (res.intersectionRatio === 1) {
-						this.autoplay[res.id] = true
-					}
-        })
- 
-      },
 		},
 	}
 </script>
@@ -131,10 +91,9 @@
 	}
 
 	.content {
+		// padding: 80rpx 32rpx 182rpx 32rpx;
 		width: 100vw;
-		height: calc(100vh - (var(--status-bar-height) + 120rpx) - (env(safe-area-inset-bottom) + 120rpx));
 		padding: 70rpx 0 182rpx 0;
-		// padding-bottom: calc(env(safe-area-inset-bottom) + 120rpx + 182rpx);
 		box-sizing: border-box;
 		overflow-x: hidden;
 		overflow-y: auto;
diff --git a/pages_order/home/recommendSwiper.vue b/pages_order/home/recommendSwiper.vue
index dfdb294..8ed0b96 100644
--- a/pages_order/home/recommendSwiper.vue
+++ b/pages_order/home/recommendSwiper.vue
@@ -46,17 +46,13 @@
   export default {
 		components: {
       indicator,
-    },
-    props: {
-      autoplay: {
-        type: Boolean,
-        default: false,
-      },
     },
 		data() {
 			return {
         current: 0,
         list: [],
+        last: null,
+        autoplay: true,
 			}
 		},
 		created() {
@@ -91,6 +87,22 @@
       },
       onChange(e) {
         this.current = e.detail.current
+        const currentTime = this.$dayjs()
+
+        if (this.last) {
+          const diff = currentTime.diff(this.last, 'millisecond')
+          console.log('diff', diff, e.detail.source)
+          if (diff < 2500 && e.detail.source === 'autoplay') {
+            console.log('autoplay abnormal')
+            this.autoplay = false
+            setTimeout(() => {
+              console.log('autoplay restart')
+              this.autoplay = true
+            }, 3000 - diff)
+          }
+        }
+
+        this.last = currentTime
       }
 		},
   }
diff --git a/pages_order/report/test/answer.vue b/pages_order/report/test/answer.vue
index c059b68..18b2dff 100644
--- a/pages_order/report/test/answer.vue
+++ b/pages_order/report/test/answer.vue
@@ -225,7 +225,8 @@
       switchQuestion(current) {
         let { needTag } = this.questionsList[current]
         
-        if (!needTag) {
+        console.log('needTag length', needTag?.length)
+        if (!needTag?.length) {
           this.current = current
           this.tabs.push(this.current)
           return
@@ -299,7 +300,7 @@
             answer = options.reduce((obj, option, oIdx) => {
               const { id: optionsId } = option
               
-              obj[optionsId] = this.value[oIdx]
+              obj[optionsId] = Array.isArray(this.value) ? this.value[oIdx] : this.value
 
               return obj
             }, {})