Merge branch 'dev' of https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts into dev

src/components/ActivityDetail/ActivityDetail.vue

@@ -91,6 +91,7 @@ import { useRootStore } from '@/store/root'
 import { useSwitchLanguage } from '@/composables/useSwitchLanguage'
 import { useStatisticsModel } from '@/composables/useStatistics'
 import { useFacilityNav } from '@/composables/useFacilityNav'
+import { getFacilitiesListBase } from '@/http/api/base'
 
 const store = useRootStore()
 
@@ -155,10 +156,20 @@ function handleGo() {
   if (props.actInfo.point.length) {
     nav(props.actInfo)
   } else if (props.actInfo.facilityCode?.length) {
-    const fac = store.facilityList.find(item => item.code === props.actInfo.facilityCode)
-    if (fac) {
-      handleFacility(toRaw(fac))
-    }
+    getFacilitiesListBase()
+      .then(res => {
+        if (res.code === 200 && res.data) {
+          const facList = res.data
+          console.log('props.actInfo.facilityCode :>> ', props.actInfo.facilityCode)
+          const fac = facList.find(item => item.code === props.actInfo.facilityCode)
+          if (fac) {
+            handleFacility(toRaw(fac))
+          }
+        }
+      })
+      .catch(err => {
+        console.log('err :>> ', err)
+      })
   }
   store.SET_SHOW_SEARCH(false)
 }

src/http/api/base/index.ts

@@ -12,6 +12,9 @@ export const getWeather = () => request<Weather>({ url: `${PREFIX.STATIC_URL}/JS
 //获取设施列表
 export const getFacilitiesList = () => request<Facility[]>({ url: `${PREFIX.STATIC_URL}/JSON/getProjectUsedIconList.json` })
 
+//获取设施列表基础数据
+export const getFacilitiesListBase = () => request<Facility[]>({ url: `${PREFIX.STATIC_URL}/JSON/getFacilityList.json` })
+
 //地图模型数据
 export const getMapData = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getMap.json` })