From a708abec873464a8ed23a48a6c7711b2675f5614 Mon Sep 17 00:00:00 2001
From: jiangx <jiangx@1000mu.com>
Date: Fri, 5 Jan 2024 15:28:19 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=F0=9F=9A=80=20=E9=97=B4=E9=9A=945?=
 =?UTF-8?q?=E5=88=86=E9=92=9F=E5=88=B7=E6=96=B0=E4=B8=80=E6=AC=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                              | 36 +++++++++++++++++-----
 src/components/ScrollList/ScrollList.vue | 39 +++++-------------------
 src/composables/useAutoBack.ts           | 33 --------------------
 3 files changed, 36 insertions(+), 72 deletions(-)
 delete mode 100644 src/composables/useAutoBack.ts

diff --git a/src/App.vue b/src/App.vue
index 0d0f941..c8162f8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,28 +1,48 @@
 <template>
   <WeatherAndTime :mall-code="mallCode" />
-  <ScrollList ref="scrollList" :mall-code="mallCode" />
+  <ScrollList ref="scrollList" :customer-list="customerList" :mall-code="mallCode" />
 </template>
 <script setup lang="ts">
-import { onMounted, onBeforeUnmount, ref } from 'vue'
-import { useAutoBack } from '@/composables/useAutoBack'
+import { onMounted, onBeforeUnmount, ref, toRefs, shallowRef } from 'vue'
+import { useRootStore } from '@/store/root'
+import { getCustomerList } from '@/http/api/base'
+import { HTTP_CODE } from '@/enums'
 import WeatherAndTime from '@/components/WeatherAndTime/WeatherAndTime.vue'
 import ScrollList from '@/components/ScrollList/ScrollList.vue'
 
+const store = useRootStore()
+const { config } = toRefs(store)
+
 const scrollList = ref<InstanceType<typeof ScrollList> | null>(null)
 const mallCode = ref<string>('')
 
-const { checkHandleScreen } = useAutoBack(_checkHandleScreen)
-function _checkHandleScreen() {
-  scrollList.value?.start()
+const pageIndex = ref(1)
+const customerList = shallowRef<Customer[]>([])
+function _getCustomerList() {
+  const params = {
+    pageIndex: pageIndex.value,
+    pageSize: 1000,
+    mallCode: mallCode.value
+  }
+  getCustomerList(config.value.smallUrl, params).then(({ code, data }) => {
+    if (code === HTTP_CODE.ERR_OK) {
+      customerList.value = [...data.list, ...customerList.value]
+    }
+  })
 }
 
+let timer: any
 onMounted(() => {
   const href = window.location.href
   mallCode.value = href.split('=')[1]
-  window.addEventListener('touchend', checkHandleScreen)
+  _getCustomerList()
+  timer = setInterval(() => {
+    _getCustomerList()
+    scrollList.value?.start()
+  }, 60000 * 5)
 })
 onBeforeUnmount(() => {
-  window.removeEventListener('touchend', checkHandleScreen)
+  clearInterval(timer)
 })
 </script>
 
diff --git a/src/components/ScrollList/ScrollList.vue b/src/components/ScrollList/ScrollList.vue
index 9f1b6e6..736e783 100644
--- a/src/components/ScrollList/ScrollList.vue
+++ b/src/components/ScrollList/ScrollList.vue
@@ -5,6 +5,9 @@
         v-if="chunkList.length"
         rewind
         :autoplay="chunkList.length > 1 ? { delay: 15000 } : false"
+        observer
+        observe-parents
+        observe-slide-children
         :modules="modules"
         style="height: 879px"
         @swiper="swiperInit"
@@ -25,10 +28,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, toRefs, watch, computed, onMounted, onBeforeUnmount } from 'vue'
-import { useRootStore } from '@/store/root'
-import { getCustomerList } from '@/http/api/base'
-import { HTTP_CODE } from '@/enums'
+import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
 import { chunk } from 'lodash-es'
 import ScrollListItem from '@/components/ScrollListItem/ScrollListItem.vue'
 import SwiperCore, { Autoplay } from 'swiper'
@@ -41,38 +41,15 @@ SwiperCore.use(modules)
 
 type Props = {
   mallCode: string
+  customerList: Customer[]
 }
 
 const props = withDefaults(defineProps<Props>(), {
-  mallCode: ''
+  mallCode: '',
+  customerList: () => []
 })
 
-watch(
-  () => props.mallCode,
-  () => {
-    _getCustomerList()
-  }
-)
-
-const store = useRootStore()
-const { config } = toRefs(store)
-
-const customerList = ref<Customer[]>([])
-const pageIndex = ref(1)
-const chunkList = computed(() => chunk(customerList.value, 6))
-
-function _getCustomerList() {
-  const params = {
-    pageIndex: pageIndex.value,
-    pageSize: 1000,
-    mallCode: props.mallCode
-  }
-  getCustomerList(config.value.smallUrl, params).then(({ code, data }) => {
-    if (code === HTTP_CODE.ERR_OK) {
-      customerList.value.push(...data.list)
-    }
-  })
-}
+const chunkList = computed(() => chunk(props.customerList, 6))
 
 const swiper = ref()
 
diff --git a/src/composables/useAutoBack.ts b/src/composables/useAutoBack.ts
deleted file mode 100644
index bdc75fe..0000000
--- a/src/composables/useAutoBack.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ref } from 'vue'
-
-export const useAutoBack = (callback: () => void) => {
-  const MIN_TIME = 0
-  const CHECK_TIME = 1000
-  const TO_INDEX_TIME = 15
-  const toIndexTime = ref(TO_INDEX_TIME) //回首页的时间
-
-  const toIndexInterval = ref()
-
-  function sleepToIndex() {
-    return new Promise<void>(resolve => {
-      toIndexInterval.value = setInterval(() => {
-        toIndexTime.value--
-        if (toIndexTime.value <= MIN_TIME) {
-          clearInterval(toIndexInterval.value)
-          resolve()
-        }
-      }, CHECK_TIME)
-    })
-  }
-
-  async function checkHandleScreen() {
-    toIndexTime.value = TO_INDEX_TIME
-    clearInterval(toIndexInterval.value)
-    await sleepToIndex()
-    callback()
-  }
-
-  return {
-    checkHandleScreen
-  }
-}