From 8e5ffc01c59746bb793267829203ceae4367c919 Mon Sep 17 00:00:00 2001
From: jiangx <1457960500@qq.com>
Date: Wed, 17 May 2023 11:25:13 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E2=99=BB=EF=B8=8F=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9ts=E7=B1=BB=E5=9E=8B=20=E6=9B=B4=E5=A5=BD=E7=9A=84?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E4=BB=A3=E7=A0=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useStartNavi.ts | 20 ++++++++++++++------
 src/composables/useWeather.ts   |  9 +++------
 src/types/serve.d.ts            |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/composables/useStartNavi.ts b/src/composables/useStartNavi.ts
index 0dd88e3..c0f4ce1 100644
--- a/src/composables/useStartNavi.ts
+++ b/src/composables/useStartNavi.ts
@@ -1,9 +1,17 @@
 import { onBeforeUnmount, ref } from 'vue'
 import type { Ref } from 'vue'
 
+type DirectionInfoType = {
+  text: string //方向信息
+  textEn: string
+  icon: string //大的方向箭头
+  thumbIcon: string //经过店铺时的那个小箭头
+  class: string //动画样式
+}
+
 export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn?: () => void) => {
   const pathShopList = ref<Shop[]>([])
-  const directionInfo = ref({})
+  const directionInfo = ref<DirectionInfoType>({} as DirectionInfoType)
 
   startNavi(shop.value)
 
@@ -34,7 +42,7 @@ export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn
           text: text, //方向信息
           textEn: 'Move forward',
           icon: require('@/assets/images/nav/big_up.svg'), //大的方向箭头
-          passIcon: require('@/assets/images/nav/up_thumb.svg'), //经过店铺时的那个小箭头
+          thumbIcon: require('@/assets/images/nav/up_thumb.svg'), //经过店铺时的那个小箭头
           class: 'animate__fadeInUp up' //动画样式
         }
 
@@ -43,7 +51,7 @@ export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn
           text: text,
           textEn: 'Departure backwards',
           icon: require('@/assets/images/nav/big_down.svg'),
-          passIcon: require('@/assets/images/nav/down_thumb.svg'),
+          thumbIcon: require('@/assets/images/nav/down_thumb.svg'),
           class: 'animate__fadeInDown down'
         }
 
@@ -52,7 +60,7 @@ export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn
           text: text,
           textEn: 'Departure to the left',
           icon: require('@/assets/images/nav/big_left.svg'),
-          passIcon: require('@/assets/images/nav/left_thumb.svg'),
+          thumbIcon: require('@/assets/images/nav/left_thumb.svg'),
           class: 'animate__fadeInRight left'
         }
 
@@ -61,7 +69,7 @@ export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn
           text: text,
           textEn: 'Departure to the right',
           icon: require('@/assets/images/nav/big_right.svg'),
-          passIcon: require('@/assets/images/nav/right_thumb.svg'),
+          thumbIcon: require('@/assets/images/nav/right_thumb.svg'),
           class: 'animate__fadeInLeft right'
         }
       default:
@@ -70,7 +78,7 @@ export const useStartNavi = (shop: Ref<Shop>, device: Ref<Device>, setPauseRefFn
           textEn: '',
           icon: '',
           class: '',
-          passIcon: ''
+          thumbIcon: ''
         }
     }
   }
diff --git a/src/composables/useWeather.ts b/src/composables/useWeather.ts
index e82498e..3f5f861 100644
--- a/src/composables/useWeather.ts
+++ b/src/composables/useWeather.ts
@@ -1,10 +1,11 @@
 import { ref, toRefs } from 'vue'
 import { useRootStore } from '@/store/root'
 
+type Icon = { icon: string; status: string }
 export const useWeather = () => {
   const store = useRootStore()
   const { weather } = toRefs(store)
-  const icon = ref({})
+  const icon = ref<Icon>({} as Icon)
 
   const status = [
     { icon: 'icon-qingtian', status: '晴' },
@@ -13,11 +14,7 @@ export const useWeather = () => {
     { icon: 'icon-xiaoxue', status: '雪' },
     { icon: 'icon-duoyunzhuanyin', status: '阴' }
   ]
-  icon.value = status.filter(filterStatus)?.[0] ?? status[0]
-
-  function filterStatus(item: { icon: string; status: string }) {
-    return weather.value?.weather?.includes(item.status)
-  }
+  icon.value = status.find((item: Icon) => weather.value.weather?.includes(item.status)) ?? status[0]
 
   return { weather, icon }
 }
diff --git a/src/types/serve.d.ts b/src/types/serve.d.ts
index cff8dbd..760288c 100644
--- a/src/types/serve.d.ts
+++ b/src/types/serve.d.ts
@@ -13,5 +13,5 @@ declare interface ServeItem {
   floor: ''
   floorOrder: number
   buildingOrder: number
-  point: -1
+  point: number
 }