From 3bda7753057325dd036227dc821c9f1627cbfe52 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Tue, 13 Dec 2022 15:57:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E7=BE=8E=E9=A3=9F?=
 =?UTF-8?q?=E3=80=81=E6=8E=A8=E8=8D=90=E8=BD=AE=E6=92=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/ScrollView/ScrollView.vue                   |  2 --
 .../CarouselWithIntro/CarouselWithIntro.vue          |  6 +-----
 src/components/PublicComponent/Tabs.vue              |  4 ++--
 src/composables/useTime.js                           |  6 +++++-
 src/views/Guide/Guide.vue                            |  8 +++-----
 src/views/Index/Index.vue                            | 12 +++++++-----
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/base/ScrollView/ScrollView.vue b/src/base/ScrollView/ScrollView.vue
index 25f06a0..4a773be 100644
--- a/src/base/ScrollView/ScrollView.vue
+++ b/src/base/ScrollView/ScrollView.vue
@@ -49,8 +49,6 @@ const scrollDOMRef = ref(null)
 const store = useStore()
 const languageRef = computed(() => store.language)
 
-const emits = defineEmits(['scroll'])
-
 function _initScroll() {
   if (!scrollDOMRef.value) {
     return
diff --git a/src/components/CarouselWithIntro/CarouselWithIntro.vue b/src/components/CarouselWithIntro/CarouselWithIntro.vue
index 19096ac..8b37f86 100644
--- a/src/components/CarouselWithIntro/CarouselWithIntro.vue
+++ b/src/components/CarouselWithIntro/CarouselWithIntro.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { computed } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useStore } from '@/store/root'
 import EffectFade from '@/components/EffectFade/EffectFade.vue'
@@ -38,10 +38,6 @@ const props = defineProps({
 const store = useStore()
 const { config } = storeToRefs(store)
 const qr = computed(() => props.data.qrFileList ?? [])
-
-const showLoginDialog = ref(false)
-
-const showLoginError = ref(false)
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/PublicComponent/Tabs.vue b/src/components/PublicComponent/Tabs.vue
index f386a20..af9e39d 100644
--- a/src/components/PublicComponent/Tabs.vue
+++ b/src/components/PublicComponent/Tabs.vue
@@ -20,7 +20,7 @@ const goPage = item => {
 }
 </script>
 
-<style  lang="scss" scoped>
+<style lang="scss" scoped>
 .tabs {
   position: fixed;
   top: 400px;
@@ -79,4 +79,4 @@ const goPage = item => {
     margin-left: 24px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/composables/useTime.js b/src/composables/useTime.js
index 118ad40..dbbb77a 100644
--- a/src/composables/useTime.js
+++ b/src/composables/useTime.js
@@ -7,6 +7,8 @@ export const useTime = () => {
   const currentTime = computed(() => {
     return `${date.value.getHours().toString().padStart(2, '0')}:${date.value.getMinutes().toString().padStart(2, '0')}`
   })
+  const currentHour = computed(() => date.value.getHours())
+  const currentTimeMinute = computed(() => date.value.getMinutes())
   const getDate = () => {
     timer.value = setInterval(() => {
       date.value = new Date()
@@ -17,6 +19,8 @@ export const useTime = () => {
   onBeforeUnmount(() => clearInterval(timer.value))
 
   return {
-    currentTime
+    currentTime,
+    currentHour,
+    currentTimeMinute
   }
 }
diff --git a/src/views/Guide/Guide.vue b/src/views/Guide/Guide.vue
index 29ee8a3..6607522 100644
--- a/src/views/Guide/Guide.vue
+++ b/src/views/Guide/Guide.vue
@@ -64,10 +64,10 @@
 </template>
 
 <script setup>
-import { ref, watch, onBeforeUnmount, onMounted } from 'vue'
+import { ref, watch, onBeforeUnmount } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useStore } from '@/store/root'
-import { list, RESET, DIRECTION, ACTIVITY_BRAND } from './list'
+import { RESET, DIRECTION, ACTIVITY_BRAND } from './list'
 import View from '@/layouts/View.vue'
 import { hideMapDialog } from '@/composables/useInitMap'
 import { getBrandListByFormat, getBrandListByFloor } from '@/http/brand/api'
@@ -97,7 +97,7 @@ try {
 }
 getBrandListByFloor().then(({ data }) => {
   formatMap.value = data.list
-    .map(({ name, shopList }) => ({ name, format: Object.keys(shopList.reduce((acc, nxt) => ({ ...acc, [nxt.industryFatherName]: true }), {})).join('/') }))
+    .map(({ name, shopList: list }) => ({ name, format: Object.keys(list.reduce((acc, nxt) => ({ ...acc, [nxt.industryFatherName]: true }), {})).join('/') }))
     .reduce((acc, nxt) => ({ ...acc, [nxt.name]: nxt.format }), {})
 })
 getBrandListByFormat().then(({ data }) => {
@@ -195,8 +195,6 @@ onBeforeUnmount(() => {
   clearTimeout(mapIconTimer.value)
 })
 
-onMounted(() => {})
-
 watch(
   [shopList, currentFloor],
   ([_shopList, _currentFloor]) => {
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index 9be5836..2a084b7 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -26,7 +26,7 @@
             <div class="meta2">{{ bf }}</div>
             <div class="bottom-right"></div>
           </div>
-          <!-- <div class="food" @click="goPage({ title: '推荐美食', path: '/foods' })">
+          <div v-if="showFood" class="food" @click="goPage({ title: '推荐美食', path: '/foods' })">
             <div class="title">
               <h1>推荐美食</h1>
               <h2>此时此刻，美食正在等你</h2>
@@ -34,8 +34,8 @@
             <div class="grid">
               <img class="item" v-for="shop of foodList" :key="shop.id" :src="config.sourceUrl + shop.logoUrl" alt="" />
             </div>
-          </div> -->
-          <div class="rec" @click="goPage({ title: '品牌列表', path: '/brand' })">
+          </div>
+          <div v-else class="rec" @click="goPage({ title: '品牌列表', path: '/brand' })">
             <div class="title">
               <h1>推荐品牌</h1>
               <h2>心动之选，拥抱美好生活</h2>
@@ -77,16 +77,18 @@ import { getBrandList } from '@/http/brand/api'
 import { getActivityList } from '@/http/api'
 import View from '@/layouts/View.vue'
 import EffectFade from '@/components/EffectFade/EffectFade.vue'
+import { useTime } from '@/composables/useTime'
 
 const router = useRouter()
 const store = useStore()
-const { indexList, currentFloor, buildingList, shopList, sidebarList, selectedModule, config } = storeToRefs(store)
+const { indexList, currentFloor, buildingList, shopList, sidebarList, config } = storeToRefs(store)
 const guideDesc = ref('')
 const foodList = computed(() => shopList.value.filter(({ isSpecial }) => isSpecial).slice(0, 12) ?? [])
 const hotRecommend = computed(() => indexList.value.hotSearch.slice(0, 5) ?? [])
-const cardsList = computed(() => indexList.value.columnList ?? [])
 const bf = computed(() => (buildingList.length > 1 ? currentFloor.value.building + '-' : '') + currentFloor.value.floor)
 const activityList = ref([])
+const { currentHour } = useTime()
+const showFood = computed(() => (currentHour.value >= 11 && currentHour.value < 13) || (currentHour.value >= 17 && currentHour.value < 20))
 
 getBrandList().then(({ data: { allShopNum, industryFatherList } }) => {
   const spFormat = industryFatherList.find(({ isSpecial }) => isSpecial)