Browse Source

fix: 修改读取老公共设施接口以此匹配服务绑定设施

pull/7/head
张耀 3 years ago
parent
commit
6c4d066538
  1. 2
      public/static/offline/JSON/getServeList.json
  2. 19
      src/components/ActivityDetail/ActivityDetail.vue
  3. 3
      src/http/api/base/index.ts

2
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"
}
},
{

19
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)
}

3
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/getFacilityList.json` })
//获取设施列表基础数据
export const getFacilitiesListBase = () => request<Facility[]>({ url: `${PREFIX.STATIC_URL}/JSON/getFacilityList.json` })
//地图模型数据
export const getMapData = () => request({ url: `${PREFIX.STATIC_URL}/JSON/getMap.json` })

Loading…
Cancel
Save