README.md

@@ -1 +1,3 @@
-# TopFans
+# TopFans
+密码：R251Y>Y8inL_BM=W
+https://testflight.apple.com/join/znR5FGdG

frontend/pages/square/components/WaterfallGrid.vue

@@ -5,14 +5,12 @@
     scroll-x
     :show-scrollbar="false"
     :scroll-left="isIOS ? undefined : scrollLeft"
-    :bounce="false"
     @scroll="onScroll"
     @touchstart="onTouchStart"
     @touchend="onTouchEnd"
     @touchcancel="onTouchEnd"
   >
     <view
-      ref="waterfallInnerRef"
       class="waterfall-inner ios-css-animate"
       :style="innerStyle"
     >
@@ -116,23 +114,23 @@ const cafFn = (id) => {
 
 // ========== iOS CSS 动画自动滚动 ==========
 // iOS 使用 CSS @keyframes 动画实现流畅滚动，不再用 setInterval + scroll-left
-const iosScrollPaused = ref(true)
+let iosScrollPaused = false
 
 const startIOSAutoScroll = () => {
   if (!isComponentMounted || !isIOS) return
-  iosScrollPaused.value = false
+  iosScrollPaused = false
 }
 
 const stopIOSAutoScroll = () => {
-  iosScrollPaused.value = true
+  iosScrollPaused = true
 }
 
 const pauseIOSAutoScroll = () => {
-  iosScrollPaused.value = true
+  iosScrollPaused = true
 }
 
 const resumeIOSAutoScroll = () => {
-  iosScrollPaused.value = false
+  iosScrollPaused = false
 }
 let rafId = null
 let userInteracting = false
@@ -225,8 +223,8 @@ let isManualScrolling = false  // 是否正在手动滚动
 
 const onTouchStart = (e) => {
   if (isIOS) {
-    // iOS 设备：暂停 CSS 动画，让用户可以自由滚动
-    pauseIOSAutoScroll()
+    // iOS 设备：完全停止自动滚动
+    stopIOSAutoScroll()
     isManualScrolling = true
     clearTimeout(momentumTimer)
   } else {
@@ -245,12 +243,13 @@ const onTouchEnd = () => {
     const tick = () => {
       momentumTimer = setTimeout(() => {
         if (Math.abs(currentScrollLeft - lastTouchEndPos) < 2) {
-          // 惯性真正结束，等 500ms 确保惯性完全停止后再恢复
+          // 惯性真正结束，延迟 300ms 再恢复自动滚动（确保惯性完全停止）
           clearTimeout(momentumTimer)
           momentumTimer = setTimeout(() => {
             isManualScrolling = false
-            resumeIOSAutoScroll()
-          }, 1500)
+            autoScrollPos = currentScrollLeft
+            startIOSAutoScroll()
+          }, 300)
         } else {
           // 惯性中，更新快照继续检测
           lastTouchEndPos = currentScrollLeft
@@ -306,9 +305,7 @@ const innerStyle = computed(() => {
     height: '100%',
     '--scroll-dist': -scrollDist + 'px',
     '--anim-duration': duration + 'ms',
-    '--play-state': iosScrollPaused.value ? 'paused' : 'running',
-    // 强制内联样式控制 animation-play-state
-    animationPlayState: iosScrollPaused.value ? 'paused' : 'running',
+    '--play-state': iosScrollPaused ? 'paused' : 'running',
   }
 })
 
@@ -540,7 +537,7 @@ const batchGetPresignedUrls = async (urls) => {
 }
 
 const loadUsers = async () => {
-  if (!isComponentMounted) return Promise.resolve()
+  if (!isComponentMounted) return
 
   // 切换分类时重置偏移量
   mockDataOffset = 0
@@ -761,11 +758,13 @@ onMounted(() => {
   // 获取设备平台信息，iOS 不使用自动滚动
   const sysInfo = uni.getSystemInfoSync()
   isIOS = sysInfo.platform === 'ios'
+  console.log('[WaterfallGrid] onMounted, platform:', sysInfo.platform, 'isIOS:', isIOS)
   const containerH = props.screenHeight - props.bannerBottom
   layout = new WaterfallLayout(containerH, props.category)
   loadUsers().then(() => {
     isInitialLoading = false
     nextTick(() => {
+      console.log('[WaterfallGrid] loadUsers done, calling auto scroll, isIOS:', isIOS)
       if (isIOS) {
         startIOSAutoScroll()
       } else {
@@ -926,32 +925,22 @@ watch(() => props.category, (newCategory) => {
       rafId = null
     }
 
-    // 父组件通过 key 变化来重置组件，这里不需要额外处理
-    // 延迟加载数据
-    setTimeout(() => {
-      loadUsersAndStartScroll()
-    }, 0)
+    loadUsers().then(() => {
+      nextTick(() => {
+        if (isIOS) {
+          startIOSAutoScroll()
+        } else {
+          startAutoScroll()
+        }
+      })
+    })
   }
 })
-
-const loadUsersAndStartScroll = () => {
-  loadUsers().then(() => {
-    nextTick(() => {
-      if (isIOS) {
-        // iOS 启动自动滚动
-        iosScrollPaused.value = false
-      } else {
-        startAutoScroll()
-      }
-    })
-  })
-}
 </script>
 
 <style scoped>
 .waterfall-scroll {
   white-space: nowrap;
-  overflow: hidden;
 }
 
 .waterfall-inner {
@@ -963,6 +952,7 @@ const loadUsersAndStartScroll = () => {
 
 .ios-css-animate {
   animation: iosAutoScroll var(--anim-duration) linear infinite;
+  animation-play-state: var(--play-state, running);
 }
 
 @keyframes iosAutoScroll {

frontend/pages/square/square.vue

@@ -5,7 +5,6 @@
 
     <!-- 横向瀑布流卡片层（内部自带横向滚动） -->
     <WaterfallGrid
-      :key="waterfallKey"
       :screenWidth="screenWidth"
       :screenHeight="screenHeight"
       :bannerBottom="bannerBottomPx"
@@ -60,7 +59,7 @@
 </template>
 
 <script setup>
-import { ref, computed, watch, onMounted, onUnmounted } from 'vue'
+import { ref, computed, onMounted, onUnmounted } from 'vue'
 import { onLoad, onShow, onHide } from '@dcloudio/uni-app'
 import { useStore } from 'vuex'
 import Header from '../components/Header.vue'
@@ -81,17 +80,10 @@ const currentStarId = ref(uni.getStorageSync('star_id') || null)
 
 // ========== UI State ==========
 const activeContentTab = ref('random')
-const waterfallKey = ref(0)  // 用于重新加载 WaterfallGrid
 const navExpanded = ref(false)
 const showRankingModal = ref(false)
 const isActive = ref(true)
 
-// ========== Watch activeContentTab ==========
-watch(activeContentTab, () => {
-  // 切换标签时重置 WaterfallGrid（iOS 需要重新挂载才能重置 CSS 动画）
-  waterfallKey.value++
-})
-
 // ========== Screen Info ==========
 const screenWidth = ref(375)
 const screenHeight = ref(812)