From 6c4d066538b132c42b047f47a2f54ad1e87dd50d Mon Sep 17 00:00:00 2001 From: zhangyao Date: Fri, 21 Jul 2023 20:58:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E8=80=81=E5=85=AC=E5=85=B1=E8=AE=BE=E6=96=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A5=E6=AD=A4=E5=8C=B9=E9=85=8D=E6=9C=8D=E5=8A=A1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E8=AE=BE=E6=96=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/offline/JSON/getServeList.json | 2 +- .../ActivityDetail/ActivityDetail.vue | 19 +++++++++++++++---- src/http/api/base/index.ts | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/public/static/offline/JSON/getServeList.json b/public/static/offline/JSON/getServeList.json index 95eefd7..a8b11d4 100644 --- a/public/static/offline/JSON/getServeList.json +++ b/public/static/offline/JSON/getServeList.json @@ -18,7 +18,7 @@ "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/Ema4b9Ef8BIk_AFkGbrpU.jpg", "/iotFile/project-ey_fpaur6s6fkgvszywana/20230713/69XuZLu78NcJNZ6Kuelna.jpg" ], - "facilityCode": "wvbKjHPqqnbjxsXTlSfc1" + "facilityCode": "_Lw1JgBlHcHmHIhDffWDX" } }, { diff --git a/src/components/ActivityDetail/ActivityDetail.vue b/src/components/ActivityDetail/ActivityDetail.vue index cf5dc31..e08f405 100644 --- a/src/components/ActivityDetail/ActivityDetail.vue +++ b/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) } diff --git a/src/http/api/base/index.ts b/src/http/api/base/index.ts index 248154f..55f4f69 100644 --- a/src/http/api/base/index.ts +++ b/src/http/api/base/index.ts @@ -12,6 +12,9 @@ export const getWeather = () => request({ url: `${PREFIX.STATIC_URL}/JS //获取设施列表 export const getFacilitiesList = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getFacilityList.json` }) +//获取设施列表基础数据 +export const getFacilitiesListBase = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getFacilityList.json` }) + //地图模型数据 export const getMapData = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getMap.json` })