From 66c82d48c44ef6332db8779d80aeef1c804a2c6a Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Wed, 15 Feb 2023 17:31:18 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=8E=A8=E8=8D=90?= =?UTF-8?q?=E5=93=81=E7=89=8C=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=8B=E5=8A=A8=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Foods/Foods.vue | 2 +- src/views/Index/Index.vue | 157 +++++++++++++++++++++++++++++++------- 2 files changed, 130 insertions(+), 29 deletions(-) diff --git a/src/views/Foods/Foods.vue b/src/views/Foods/Foods.vue index 13b9e7a..2e9099b 100644 --- a/src/views/Foods/Foods.vue +++ b/src/views/Foods/Foods.vue @@ -14,7 +14,7 @@ import BrandScroll from '@/components/BrandScroll/BrandScroll.vue' const store = useStore() const storeRefs = storeToRefs(store) -const { config, shopList, indexList } = storeRefs +const { config, shopList } = storeRefs const shop = ref(null) const selectedList = ref([]) diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue index 56007c4..19a7024 100644 --- a/src/views/Index/Index.vue +++ b/src/views/Index/Index.vue @@ -33,27 +33,79 @@ 扫我导航 -
-
+
+

推荐美食

此时此刻，美食正在等你

-
-
- -
-
+ + +
+ +
+ +
-
-
+
+

推荐品牌

心动之选，拥抱美好生活

-
-
- -
-
+ + +
+ +
+ +
@@ -90,14 +142,42 @@ import View from '@/layouts/View.vue' import EffectFade from '@/components/EffectFade/EffectFade.vue' import { useTime } from '@/composables/useTime' import QRCodeFromText from '@/components/QRCodeFromText/QRCodeFromText.vue' +import { Swiper, SwiperSlide } from 'swiper/vue' +import SwiperCore, { Autoplay } from 'swiper' + +const splitBy = (array, chunkSize = 4) => { + const result = [] + for (let i = 0; i < array.length; i += chunkSize) { + const chunk = array.slice(i, i + chunkSize) + result.push(chunk) + } + return result +} const router = useRouter() const store = useStore() const { indexList, currentFloor, buildingList, shopList, sidebarList, config, theme } = storeToRefs(store) const guideDesc = ref('') -const foodList = computed(() => shopList.value.filter(({ isSpecial }) => isSpecial) ?? []) +const foodList = computed(() => { + const arr = shopList.value.filter(({ isSpecial }) => isSpecial) + if (arr.length > 12) { + while (arr.length % 4 !== 0) { + arr.push(arr[Math.floor(Math.random() * arr.length)]) + } + } + return splitBy(arr) +}) const hotRecommend = computed(() => indexList.value.hotSearch.slice(0, 5) ?? []) -const recommendShops = computed(() => indexList.value.recommendList ?? []) +const recommendShops = computed(() => { + const arr = indexList.value.recommendList + if (arr.length > 12) { + while (arr.length % 4 !== 0) { + arr.push(arr[Math.floor(Math.random() * arr.length)]) + } + } + + return splitBy(arr) +}) const bf = computed(() => (buildingList.length > 1 ? currentFloor.value.building + '-' : '') + currentFloor.value.floor) const activityList = ref([]) const { currentHour } = useTime() @@ -114,7 +194,6 @@ const goPage = item => { } const setShopById = id => { - console.log(id) const shop = shopList.value.find(_shop => _shop.shopId === id) store.SET_SHOP(shop) } @@ -128,19 +207,32 @@ getActivityList(3).then(({ data }) => { activityList.value = data?.activityList ?? [] console.log(data.activityList) }) + +const clearShop = () => { + store.SET_SHOP(null) +} + +const handleRecBrand = id => { + setShopById(id) + goPage({ title: '品牌列表', path: '/brand' }) +} +const handleFood = id => { + setShopById(id) + goPage({ title: '推荐美食', path: '/foods' }) +}