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

src/components/Recommend/Recommend.vue

@@ -50,7 +50,7 @@ function close() {
 }
 function clickShop(item: FeaturedList) {
   if (item.content.shopCode) {
-    store.SET_SHOP(shopMap[item.content.shopCode])
+    store.SET_SHOP(shopMap.value[item.content.shopCode])
     store.SET_SHOW_DETAIL(true)
   } else if (item.content.point) {
     // 点位信息

src/composables/useInitMap.ts

@@ -40,6 +40,7 @@ export const useInitMap = async function () {
       }
     )
   } catch (error) {
+    console.log(error)
     Message({ text: '获取地图数据失败', type: 'success' })
   }
 }
@@ -53,9 +54,10 @@ function onClickShop(event: any) {
     !window.shopInfo && document.getElementById('shopInfo')
     window.Map_QM.addElementLabel(window.shopInfo, event.data.xaxis, event.data.yaxis)
     store.SET_SHOP(event.data.shopData)
-  } else {
-    hideMapDialog()
   }
+  // else {
+  //   hideMapDialog()
+  // }
 }
 
 //地图弹框消失

src/views/Nav/Nav.vue

@@ -163,10 +163,13 @@ import Marquees from '@/base/Marquees/Marquees.vue'
 import PathGroup from '@/components/PathGroup/PathGroup.vue'
 const { switchLanguage } = useSwitchLanguage()
 const store = useRootStore()
-const { shop, device, showSearch, config, language } = storeToRefs(store)
+const { shop, device, showSearch, config, language, showColumnList } = storeToRefs(store)
 const router = useRouter()
 const pathGroupRef = ref()
 useStatistics({ tag: 'navigation', shopCode: shop.value.shopCode })
+if (showColumnList.value) {
+  showColumnList.value = false
+}
 
 const { replay, pause, speedUp, handleReplay, togglePause, handleSpeedUp, resetPause } = useMapNavControl()
 const { directionInfo, pathShopList, backPathArray, startNavi } = useStartNavi(shop, device, resetPause)