diff --git a/public/static/offline/JSON/getBackTime.json b/public/static/offline/JSON/getBackTime.json index 059ae4c..55b1208 100644 --- a/public/static/offline/JSON/getBackTime.json +++ b/public/static/offline/JSON/getBackTime.json @@ -1 +1 @@ -{"code":200,"msg":"操作成功","data":[60,5]} \ No newline at end of file +{"code":200,"msg":"操作成功","data":[60,15]} diff --git a/src/composables/useInitConfigAndMallInfo.ts b/src/composables/useInitConfigAndMallInfo.ts index 6c835fd..e550733 100644 --- a/src/composables/useInitConfigAndMallInfo.ts +++ b/src/composables/useInitConfigAndMallInfo.ts @@ -22,7 +22,7 @@ export const useInitConfigAndMallInfo = async () => { ]) const { shopList, buildingList } = _shopAndBuilding.data - store.SET_CURRENT_FLOOR(_DeviceInfo.data) + store.SET_DEVICE(_DeviceInfo.data) store.SET_SHOP_LIST(shopList) store.SET_BUILDING_LIST(buildingList) store.SET_BRAND_INFO(_brandInfo.data) diff --git a/src/composables/useInitMap.ts b/src/composables/useInitMap.ts index a803538..c45299d 100644 --- a/src/composables/useInitMap.ts +++ b/src/composables/useInitMap.ts @@ -14,22 +14,22 @@ export const useInitMap = async function () { })) //初始化地图 - window.MainMap_QM.init( - () => { - store.SET_MAP_STATUS(true) - window.Map_QM.addEventListener('shop', onClickShop, false) - window.Map_QM.renderer.domElement.addEventListener('webglcontextlost', onContextLost) - }, - { - build: device.value?.buildingOrder ?? 0, - floor: device.value.floorOrder, - navPoint: device.value.location, - angle: device.value.angle, - iconUrl: delPrefixOfFacilityList, - mapData: data, - shopData: shopList.value.slice() - } - ) + // window.MainMap_QM.init( + // () => { + // store.SET_MAP_STATUS(true) + // window.Map_QM.addEventListener('shop', onClickShop, false) + // window.Map_QM.renderer.domElement.addEventListener('webglcontextlost', onContextLost) + // }, + // { + // build: device.value?.buildingOrder ?? 0, + // floor: device.value.floorOrder, + // navPoint: device.value.location, + // angle: device.value.angle, + // iconUrl: delPrefixOfFacilityList, + // mapData: data, + // shopData: shopList.value.slice() + // } + // ) } catch (error) { Message({ text: '获取地图数据失败', type: 'success' }) } diff --git a/src/http/api/base/index.ts b/src/http/api/base/index.ts index b176dc8..1cce37a 100644 --- a/src/http/api/base/index.ts +++ b/src/http/api/base/index.ts @@ -8,7 +8,7 @@ export const getConfig = () => request({ url: '/static/offline/JSON/conf export const getWeather = () => request({ url: `/JSON/GetWeather.json` }) //获取设施列表 -export const getFacilitiesList = () => request({ url: `/JSON/GetFacilitiesList.json` }) +export const getFacilitiesList = () => request({ url: `/JSON/getFacilityList.json` }) //地图模型数据 export const getMapData = () => request({ url: `/JSON/getMap.json` })