diff --git a/public/static/qm/MainMap_QM.js b/public/static/qm/MainMap_QM.js index 208385d..6d5bd76 100644 --- a/public/static/qm/MainMap_QM.js +++ b/public/static/qm/MainMap_QM.js @@ -3678,8 +3678,8 @@ MainMap_QM.prototype = { } if (item.hasOwnProperty("Facilities") && item.Facilities) { //设施 Map_QM.util.pathStateObj.forShopArr.wayList.push({ - isAddPrefix: true, name: "乘坐 " + item.Facilities.userData.title + "到 " + Map_QM.mapArr[Map_QM.util.selectBuild][parseInt(Map_QM.forShopArr[index + 1].floor)].floorName, - nameEn: "BY " + item.Facilities.userData.title + "TO " + Map_QM.mapArr[Map_QM.util.selectBuild][parseInt(Map_QM.forShopArr[index + 1].floor)].floorName, logoPath: item.Facilities.imgUrl, code: (((Math.random()) * 0x1234567) | 0).toString(16).substring(0), shopNum: item.Facilities.userData.facCode + item.Facilities.userData.no + isAddPrefix: true, name: "乘坐 " + item.Facilities.userData.title +item.Facilities.userData.facCode=="dt"?"电梯":"" + "到 " + Map_QM.mapArr[Map_QM.util.selectBuild][parseInt(Map_QM.forShopArr[index + 1].floor)].floorName, + nameEn: "BY " + item.Facilities.userData.title+item.Facilities.userData.facCode=="dt"?"elevator ":"" + "TO " + Map_QM.mapArr[Map_QM.util.selectBuild][parseInt(Map_QM.forShopArr[index + 1].floor)].floorName, logoPath: item.Facilities.imgUrl, code: (((Math.random()) * 0x1234567) | 0).toString(16).substring(0), shopNum: item.Facilities.userData.facCode + item.Facilities.userData.no }); } }); diff --git a/src/assets/images/nav/bg_closeTip.svg b/src/assets/images/nav/bg_closeTip.svg new file mode 100644 index 0000000..b178f87 --- /dev/null +++ b/src/assets/images/nav/bg_closeTip.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/images/nav/down_thumb.svg b/src/assets/images/nav/down_thumb.svg index 80383cc..0adc888 100644 --- a/src/assets/images/nav/down_thumb.svg +++ b/src/assets/images/nav/down_thumb.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/images/nav/icon_closeTip.svg b/src/assets/images/nav/icon_closeTip.svg new file mode 100644 index 0000000..18830f6 --- /dev/null +++ b/src/assets/images/nav/icon_closeTip.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/images/nav/left_thumb.svg b/src/assets/images/nav/left_thumb.svg index b10cacc..cbd7afe 100644 --- a/src/assets/images/nav/left_thumb.svg +++ b/src/assets/images/nav/left_thumb.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/images/nav/right_thumb.svg b/src/assets/images/nav/right_thumb.svg index 0d3229e..0657663 100644 --- a/src/assets/images/nav/right_thumb.svg +++ b/src/assets/images/nav/right_thumb.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/assets/images/nav/up_thumb.svg b/src/assets/images/nav/up_thumb.svg index aa4222a..aba6054 100644 --- a/src/assets/images/nav/up_thumb.svg +++ b/src/assets/images/nav/up_thumb.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/components/CloseNavTipDialog/CloseNavTipDialog.vue b/src/components/CloseNavTipDialog/CloseNavTipDialog.vue new file mode 100644 index 0000000..48a6cf5 --- /dev/null +++ b/src/components/CloseNavTipDialog/CloseNavTipDialog.vue @@ -0,0 +1,124 @@ +
+ +

{{ $t('shop.icontip') }}

+
+ +
+
{{ $t('shop.replayTip') }}
+
+ +
+
{{ $t('shop.closeTip') }}
+
+
+ +
+ +
+
+ + + + + + + + diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue index 62989f1..90f833e 100644 --- a/src/components/Header/Header.vue +++ b/src/components/Header/Header.vue @@ -12,7 +12,7 @@
{{ whichWeek }}
-
+
中
EN
繁
diff --git a/src/components/PathGroup/PathGroup.vue b/src/components/PathGroup/PathGroup.vue index df01d54..60fbdc5 100644 --- a/src/components/PathGroup/PathGroup.vue +++ b/src/components/PathGroup/PathGroup.vue @@ -14,7 +14,7 @@
{{ yourpos }} -
  • +
  • @@ -50,6 +50,8 @@ const props = defineProps({ default: () => [] } }) +const emits = defineEmits(['over']) +const scroll = ref() const playIdx = ref(-1) onBeforeMount(() => { window.Map_QM && window.Map_QM.addEventListener('PathPlaying', onPathPlaying, false) @@ -62,6 +64,7 @@ onBeforeUnmount(() => { function onPathPlayOver() { playIdx.value = props.pathshop.length + emits('over') } function onPathPlaying(e) { @@ -70,6 +73,9 @@ function onPathPlaying(e) { if (shopNum) { const idx2 = props.pathshop.findIndex(val => val.shopNum === shopNum) playIdx.value = idx2 + if (scroll.value) { + scroll.value.scrollToElement(document.getElementById(e.data.shopNum)) + } } } //重置playIdx @@ -146,13 +152,13 @@ defineExpose({ align-items: center; width: fit-content; max-width: 347px; - height: 40px; - padding: 4px; - padding-right: 16px; + height: 64px; + padding: 0; + padding-right: 5px; margin-bottom: 4px; margin-left: 26px; - background: rgb(0 0 0 / 3%); - border-radius: 8px; + background: rgb(0 0 0 / 0%); + border-radius: 0; opacity: 1; &::before { position: absolute; @@ -160,19 +166,21 @@ defineExpose({ width: 9px; height: 9px; background: #fff; - border: 1px solid #a6976f; + border: 1px solid #8b8371; border-radius: 50%; content: ''; } &.last { - background: #fff; - border: 1px solid #84754e; + // background: #fff; + border: 0 solid #8b8371; .pass-name { font-family: 'font_bold'; + color: #fff; + background-color: #a49466; } &::before { - background: #84754e; + background: #8b8371; } } @@ -181,21 +189,24 @@ defineExpose({ justify-content: center; align-items: center; flex-shrink: 0; - width: 32px; - height: 32px; - margin-right: 16px; + width: 64px; + height: 64px; + margin-right: 8px; background-color: #fff; - border-radius: 6px; + border-radius: 4px; img { - width: 80%; - height: 80%; + width: 87%; + height: 87%; object-fit: scale-down; } } .pass-name { - font-size: 12px; + padding: 4px 8px; + font-size: 14px; font-family: 'font_regular'; - color: #a6976f; + color: rgb(0 0 0 / 60%); + background: rgb(0 0 0 / 6%); + border-radius: 4px; @include no-wrap(); } diff --git a/src/http/http.ts b/src/http/http.ts index 71968fd..d3cd159 100644 --- a/src/http/http.ts +++ b/src/http/http.ts @@ -57,7 +57,7 @@ class Request { this.instance .request(config) .then(res => { - console.log('axios获取数据 :>> ', res) + console.log('axios获取数据 :>> ', JSON.stringify(res)) // 如果为单个响应设置拦截器，使用单个响应的拦截器 if (config.interceptors?.responseInterceptors) { res = config.interceptors.responseInterceptors(res) @@ -66,7 +66,7 @@ class Request { resolve(res) }) .catch((err: any) => { - console.log('axios获取数据失败 :==>> ', err) + console.log('axios获取数据失败 :==>> ', JSON.stringify(err)) reject(err) }) }) diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index c67d19c..a50a37f 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -10,7 +10,10 @@ "search_home": "Search", "shop": { "goBtn": "GO", - "like": "like" + "like": "like", + "replayTip": "Replay", + "closeTip": "Close", + "icontip": "Is the navigation complete?" }, "art": { "go": "GO" diff --git a/src/i18n/lang/tw.json b/src/i18n/lang/tw.json index 18895d3..3ac8999 100644 --- a/src/i18n/lang/tw.json +++ b/src/i18n/lang/tw.json @@ -10,7 +10,10 @@ "search_home": "搜索", "shop": { "goBtn": "導航到店", - "like": "喜歡" + "like": "喜歡", + "replayTip": "重放導航動畫", + "closeTip": "結束", + "icontip": "是否結束導航 ？" }, "art": { "go": "導航" diff --git a/src/i18n/lang/zh.json b/src/i18n/lang/zh.json index d55bf7e..1465eed 100644 --- a/src/i18n/lang/zh.json +++ b/src/i18n/lang/zh.json @@ -10,7 +10,10 @@ "search_home": "搜索", "shop": { "goBtn": "导航到店", - "like": "喜欢" + "like": "喜欢", + "replayTip": "重放导航动画", + "closeTip": "结束", + "icontip": "是否结束导航？" }, "art": { "go": "导航" diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue index c6fb56e..152d139 100644 --- a/src/views/Nav/Nav.vue +++ b/src/views/Nav/Nav.vue @@ -153,8 +153,9 @@
    • - +
    + @@ -173,7 +174,7 @@ import marquees from '@/base/Marquees/Marquees.vue' import pathGroup from '@/components/PathGroup/PathGroup.vue' import effectFade from '@/components/EffectFade/EffectFade.vue' import ScrollView from '@/base/ScrollView/ScrollView.vue' - +import closeNavTip from '@/components/CloseNavTipDialog/CloseNavTipDialog.vue' const store = useRootStore() const { shop, device, language } = storeToRefs(store) @@ -187,6 +188,7 @@ const isBack = ref(false) const router = useRouter() const route = useRoute() const pathGroupRef = ref() +const showCloseNavTip = ref(false) //重播 const replayBtn = { @@ -196,6 +198,7 @@ const replayBtn = { fun: () => { handleReplay() pathGroupRef.value.resetPlayIdx() + showCloseNavTip.value = false } } //返回 @@ -260,11 +263,13 @@ watch(shop, newVal => { } .backcom { position: absolute; - top: 207px; + top: 157px; left: 80px; z-index: 500; display: flex; align-items: center; + width: 150px; + height: 150px; font-size: 28px; font-family: 'font_bold'; color: #b7a475;