Browse Source

feat: 🚀 修改返回触点和导航界面整体修改以及增加弹框,去掉中英繁按钮

pull/32/head
张耀 3 years ago
parent
commit
17462c5793
  1. 4
      public/static/qm/MainMap_QM.js
  2. 88
      src/assets/images/nav/bg_closeTip.svg
  3. 4
      src/assets/images/nav/down_thumb.svg
  4. 4
      src/assets/images/nav/icon_closeTip.svg
  5. 4
      src/assets/images/nav/left_thumb.svg
  6. 4
      src/assets/images/nav/right_thumb.svg
  7. 4
      src/assets/images/nav/up_thumb.svg
  8. 124
      src/components/CloseNavTipDialog/CloseNavTipDialog.vue
  9. 2
      src/components/Header/Header.vue
  10. 47
      src/components/PathGroup/PathGroup.vue
  11. 4
      src/http/http.ts
  12. 5
      src/i18n/lang/en.json
  13. 5
      src/i18n/lang/tw.json
  14. 5
      src/i18n/lang/zh.json
  15. 11
      src/views/Nav/Nav.vue

4
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
});
}
});

88
src/assets/images/nav/bg_closeTip.svg

@ -0,0 +1,88 @@
<svg width="800" height="678" viewBox="0 0 800 678" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_963_22843)">
<g opacity="0.46">
<path d="M158 149L240.5 100L331 152.5L248 201L158 149Z" fill="url(#paint0_linear_963_22843)"/>
<path d="M158 149L248 201V636H158V149Z" fill="url(#paint1_linear_963_22843)"/>
<path d="M248 201L331 152.5V695H248V201Z" fill="url(#paint2_linear_963_22843)"/>
<path opacity="0.56" d="M-98.998 249.827L-6.68698 195L94.5755 253.743L1.70493 308.011L-98.998 249.827Z" fill="url(#paint3_linear_963_22843)"/>
<path opacity="0.56" d="M-99 249.827L1.70298 308.011L1.70377 800.5H-98.9992L-99 249.827Z" fill="url(#paint4_linear_963_22843)"/>
<path opacity="0.56" d="M1.70508 308.011L94.5756 254.303V614.611H1.70508L1.70508 308.011Z" fill="url(#paint5_linear_963_22843)"/>
<path d="M-2 246.951L110.723 180L234.378 251.733L120.971 318.001L-2 246.951Z" fill="url(#paint6_linear_963_22843)"/>
<g filter="url(#filter0_f_963_22843)">
<path d="M135.042 257.493L77.0566 278.767C76.7565 278.877 76.4942 279.085 76.3054 279.364C76.1165 279.643 76.0101 279.98 76.0007 280.328C75.9913 280.676 76.0792 281.018 76.2527 281.309C76.4261 281.6 76.6766 281.825 76.9703 281.954L103.897 293.81L117.541 323.849C117.68 324.155 117.899 324.407 118.171 324.573C118.442 324.739 118.753 324.811 119.062 324.78C119.371 324.748 119.665 324.615 119.904 324.396C120.143 324.178 120.317 323.886 120.402 323.557L137.012 259.567C137.089 259.269 137.091 258.954 137.017 258.656C136.943 258.358 136.797 258.087 136.594 257.874C136.391 257.661 136.139 257.512 135.865 257.445C135.59 257.378 135.305 257.394 135.039 257.493H135.042Z" fill="url(#paint7_linear_963_22843)" fill-opacity="0.28"/>
</g>
<path d="M141.952 212.092L83.9668 231.418C83.6667 231.518 83.4044 231.707 83.2155 231.961C83.0266 232.214 82.9203 232.52 82.9108 232.836C82.9014 233.152 82.9894 233.463 83.1628 233.727C83.3363 233.992 83.5868 234.196 83.8804 234.313L110.807 245.084L124.451 272.371C124.59 272.649 124.809 272.878 125.081 273.029C125.352 273.18 125.663 273.246 125.972 273.217C126.282 273.188 126.575 273.067 126.814 272.869C127.053 272.67 127.227 272.405 127.312 272.106L143.922 213.976C143.999 213.706 144.001 213.42 143.927 213.149C143.853 212.878 143.707 212.632 143.504 212.438C143.301 212.244 143.049 212.11 142.775 212.049C142.501 211.988 142.215 212.003 141.949 212.092H141.952Z" fill="url(#paint8_linear_963_22843)"/>
<mask id="mask0_963_22843" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="82" y="212" width="62" height="62">
<path d="M141.951 212.092L83.9658 231.418C83.6657 231.518 83.4034 231.707 83.2145 231.961C83.0256 232.214 82.9193 232.52 82.9099 232.836C82.9004 233.152 82.9884 233.463 83.1619 233.727C83.3353 233.992 83.5858 234.196 83.8795 234.313L110.806 245.084L124.45 272.371C124.589 272.649 124.808 272.878 125.08 273.029C125.351 273.18 125.662 273.246 125.971 273.217C126.281 273.188 126.574 273.067 126.813 272.869C127.052 272.67 127.226 272.405 127.311 272.106L143.921 213.976C143.998 213.706 144 213.42 143.926 213.149C143.853 212.878 143.706 212.632 143.503 212.438C143.3 212.244 143.048 212.11 142.774 212.049C142.5 211.988 142.214 212.003 141.948 212.092H141.951Z" fill="url(#paint9_linear_963_22843)"/>
</mask>
<g mask="url(#mask0_963_22843)">
<path d="M147.533 208.7L109.916 245.7L132.116 291.95L147.533 208.7Z" fill="url(#paint10_linear_963_22843)"/>
</g>
<path d="M-2 246.951L120.971 318.001L120.972 792H-1.99902L-2 246.951Z" fill="url(#paint11_linear_963_22843)"/>
<path d="M120.973 318.001L234.379 252.416V798H120.973V318.001Z" fill="url(#paint12_linear_963_22843)"/>
</g>
</g>
<defs>
<filter id="filter0_f_963_22843" x="65" y="246.404" width="83.071" height="89.3828" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
<feFlood flood-opacity="0" result="BackgroundImageFix"/>
<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
<feGaussianBlur stdDeviation="5.5" result="effect1_foregroundBlur_963_22843"/>
</filter>
<linearGradient id="paint0_linear_963_22843" x1="157.621" y1="150" x2="330.621" y2="158.5" gradientUnits="userSpaceOnUse">
<stop stop-color="#F7F7F7"/>
<stop offset="1" stop-color="#F3F2F0" stop-opacity="0"/>
</linearGradient>
<linearGradient id="paint1_linear_963_22843" x1="231.121" y1="705.5" x2="137.099" y2="192.322" gradientUnits="userSpaceOnUse">
<stop stop-color="#F2F2F2"/>
<stop offset="1" stop-color="#ECECEC" stop-opacity="0.57"/>
</linearGradient>
<linearGradient id="paint2_linear_963_22843" x1="247.818" y1="241.856" x2="468.322" y2="600.142" gradientUnits="userSpaceOnUse">
<stop stop-color="#EAE8E3"/>
<stop offset="1" stop-color="#EAE8E3" stop-opacity="0.23"/>
</linearGradient>
<linearGradient id="paint3_linear_963_22843" x1="-13" y1="229.5" x2="94.1515" y2="260.457" gradientUnits="userSpaceOnUse">
<stop stop-color="#F3F3F3"/>
<stop offset="1" stop-color="#CAC7BE"/>
</linearGradient>
<linearGradient id="paint4_linear_963_22843" x1="-14.5" y1="790" x2="-127.403" y2="339.023" gradientUnits="userSpaceOnUse">
<stop stop-color="#F9F9F9"/>
<stop offset="0.0001" stop-color="#EBEBEB" stop-opacity="0"/>
<stop offset="1" stop-color="white" stop-opacity="0.6"/>
</linearGradient>
<linearGradient id="paint5_linear_963_22843" x1="48.1953" y1="574.5" x2="-37.9422" y2="303.922" gradientUnits="userSpaceOnUse">
<stop stop-color="#F2F2F2"/>
<stop offset="1" stop-color="#EAEAEA"/>
</linearGradient>
<linearGradient id="paint6_linear_963_22843" x1="-2.51772" y1="248.317" x2="233.86" y2="259.931" gradientUnits="userSpaceOnUse">
<stop stop-color="#DDD5C0"/>
<stop offset="1" stop-color="#EFE5CB" stop-opacity="0.28"/>
</linearGradient>
<linearGradient id="paint7_linear_963_22843" x1="131.99" y1="257.832" x2="98.2045" y2="288.524" gradientUnits="userSpaceOnUse">
<stop stop-color="#DFD1B3"/>
<stop offset="1" stop-color="#B6A175"/>
</linearGradient>
<linearGradient id="paint8_linear_963_22843" x1="138.9" y1="212.4" x2="108.067" y2="243.234" gradientUnits="userSpaceOnUse">
<stop stop-color="#DFD1B3"/>
<stop offset="1" stop-color="#B6A175"/>
</linearGradient>
<linearGradient id="paint9_linear_963_22843" x1="138.899" y1="212.4" x2="108.066" y2="243.234" gradientUnits="userSpaceOnUse">
<stop stop-color="#DFD1B3"/>
<stop offset="1" stop-color="#B6A175"/>
</linearGradient>
<linearGradient id="paint10_linear_963_22843" x1="120.399" y1="233.367" x2="132.733" y2="259.267" gradientUnits="userSpaceOnUse">
<stop stop-color="#AC9971"/>
<stop offset="1" stop-color="#C2B28F"/>
</linearGradient>
<linearGradient id="paint11_linear_963_22843" x1="-2.26933" y1="467.964" x2="120.992" y2="468.938" gradientUnits="userSpaceOnUse">
<stop stop-color="#E1DCCF"/>
<stop offset="1" stop-color="#EBE2CC" stop-opacity="0.53"/>
</linearGradient>
<linearGradient id="paint12_linear_963_22843" x1="121" y1="385" x2="261.034" y2="469.92" gradientUnits="userSpaceOnUse">
<stop stop-color="#D8D0BD"/>
<stop offset="1" stop-color="#F8F2E5"/>
</linearGradient>
<clipPath id="clip0_963_22843">
<rect width="800" height="678" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 6.9 KiB

4
src/assets/images/nav/down_thumb.svg

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.00017 12.172L1.63617 6.808L0.222168 8.222L8.00017 16L15.7782 8.222L14.3642 6.808L9.00017 12.172L9.00017 3.83699e-07L7.00017 2.96276e-07L7.00017 12.172Z" fill="#84754E"/>
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.2349 27.5156L0.422365 14.7031L0.422364 9.39983L11.3599 20.3373L11.3599 0.48517L15.1099 0.48517L15.1099 20.3373L26.0474 9.39983L26.0474 14.7031L13.2349 27.5156Z" fill="black" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 311 B

4
src/assets/images/nav/icon_closeTip.svg

@ -0,0 +1,4 @@
<svg width="220" height="220" viewBox="0 0 220 220" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.7812 91.7004C25.7812 138.208 85.9375 184.715 110 207.969C134.062 184.715 194.219 138.208 194.219 91.7004C194.219 33.5662 146.094 10.3125 110 10.3125C73.9062 10.3125 25.7812 33.5662 25.7812 91.7004Z" stroke="#A6976F" stroke-width="12.2222"/>
<circle cx="110" cy="91.0938" r="27.5" stroke="#A6976F" stroke-width="12.2222"/>
</svg>

After

Width:  |  Height:  |  Size: 442 B

4
src/assets/images/nav/left_thumb.svg

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3.828 6.99998L9.192 1.63598L7.778 0.221985L0 7.99998L7.778 15.778L9.192 14.364L3.828 8.99998H16V6.99998H3.828Z" fill="#84754E"/>
<svg width="28" height="26" viewBox="0 0 28 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0.719726 13L13.5322 0.187502L18.8355 0.187502L7.89803 11.125L27.7502 11.125L27.7502 14.875L7.89803 14.875L18.8355 25.8125L13.5322 25.8125L0.719726 13Z" fill="black" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 299 B

4
src/assets/images/nav/right_thumb.svg

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12.172 6.99998L6.808 1.63598L8.222 0.221985L16 7.99998L8.222 15.778L6.808 14.364L12.172 8.99998H0V6.99998H12.172Z" fill="#84754E"/>
<svg width="28" height="26" viewBox="0 0 28 26" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.75 13L14.9375 25.8125L9.63421 25.8125L20.5717 14.875L0.719545 14.875L0.719545 11.125L20.5717 11.125L9.6342 0.187501L14.9375 0.187501L27.75 13Z" fill="black" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 294 B

4
src/assets/images/nav/up_thumb.svg

@ -1,3 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.00017 3.828L1.63617 9.192L0.222168 7.778L8.00017 -3.39987e-07L15.7782 7.778L14.3642 9.192L9.00017 3.828L9.00017 16L7.00017 16L7.00017 3.828Z" fill="#84754E"/>
<svg width="27" height="28" viewBox="0 0 27 28" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M13.2349 0.484375L26.0474 13.2969V18.6002L15.1099 7.66268L15.1099 27.5148H11.3599L11.3599 7.66268L0.422363 18.6002L0.422363 13.2969L13.2349 0.484375Z" fill="black" fill-opacity="0.9"/>
</svg>

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 297 B

124
src/components/CloseNavTipDialog/CloseNavTipDialog.vue

@ -0,0 +1,124 @@
<template>
<transition appear enter-active-class="animate__animated animate__fadeIn" leave-active-class="animate__animated animate__fadeOut">
<masker @click="close">
<transition appear enter-active-class="animate__animated animate__fadeInUp" leave-active-class="animate__animated animate__zoomOut">
<div class="close-nav-wrapper">
<img class="icon-close" src="@/assets/images/nav/icon_closeTip.svg" alt="" />
<h4 class="icon-tip">{{ $t('shop.icontip') }}</h4>
<div class="btn-group">
<!-- 重播按钮 -->
<div class="replay-btn" @click="emits('replay')">
<h5>{{ $t('shop.replayTip') }}</h5>
</div>
<!-- 结束按钮 -->
<div class="back-btn" @click="emits('back')">
<h5>{{ $t('shop.closeTip') }}</h5>
</div>
</div>
<!-- 关闭按钮 -->
<div class="exit" @click="close">
<img src="@/assets/images/shopDetail/close.svg" class="go_bg" alt="" />
</div>
</div>
</transition>
</masker>
</transition>
</template>
<script setup lang="ts">
import masker from '@/base/Masker/Masker.vue'
const emits = defineEmits(['close', 'replay', 'back'])
function close() {
emits('close')
}
</script>
<style scoped lang="scss">
:deep(.bscroll-vertical-scrollbar) {
background: rgb(0 0 0 / 1%);
border-radius: 4px;
opacity: 1 !important;
.bscroll-indicator {
background: #b7a475 !important;
border: none !important;
border-radius: 4px !important;
box-shadow: 0 8px 20px rgb(0 0 0 / 10%);
}
}
.close-nav-wrapper {
position: relative;
z-index: 9003;
display: inline-block;
width: 800px;
height: 880px;
margin-top: 126px;
margin-left: 560px;
background-color: #efeeea;
background-image: url('@/assets/images/nav/bg_closeTip.svg');
border-radius: 16px;
.icon-close {
position: absolute;
right: 0;
left: 0;
margin: 140px auto 0;
}
.icon-tip {
position: absolute;
right: 0;
left: 0;
margin: 416px auto 0;
font-size: 48px;
font-family: 'font_bold';
text-align: center;
color: rgb(0 0 0 / 80%);
}
.btn-group {
position: absolute;
bottom: 0;
left: 0;
display: inline-flex;
justify-content: space-between;
align-items: center;
width: 100%;
height: 240px;
padding: 72px 104px;
background: rgb(255 255 255 / 60%);
.replay-btn {
width: 280px;
height: 96px;
font-size: 24px;
font-family: 'font_bold';
text-align: center;
color: #a6976f;
border: 1px solid #a6976f;
border-radius: 122px;
line-height: 96px;
}
.back-btn {
width: 280px;
height: 96px;
font-size: 24px;
font-family: 'font_bold';
text-align: center;
color: #fff;
background: linear-gradient(230deg, #c4b280 0%, #a89866 100%);
border-radius: 122px;
box-shadow: 0 8px 20px 0 rgb(119 106 65 / 31%);
font-style: normal;
font-weight: 700;
line-height: 32px;
line-height: 96px;
}
}
.exit {
position: absolute;
top: -50px;
right: -50px;
img {
width: 100px;
}
}
}
</style>

2
src/components/Header/Header.vue

@ -12,7 +12,7 @@
<div class="week">{{ whichWeek }}</div>
</div>
</div>
<div class="language-items">
<div v-if="false" class="language-items">
<div class="language-item" :class="{ active: language === 'zh' }" @click="changeLang('zh')"></div>
<div class="language-item" :class="{ active: language === 'en' }" @click="changeLang('en')">EN</div>
<div class="language-item" :class="{ active: language === 'tw' }" @click="changeLang('tw')"></div>

47
src/components/PathGroup/PathGroup.vue

@ -14,7 +14,7 @@
</div>
<span class="pass-name">{{ yourpos }} </span>
</li>
<li v-for="(item, idx) of pathshop" :key="item.code" class="pass-item" :class="{ last: playIdx === idx }">
<li v-for="(item, idx) of pathshop" :id="item.shopNum" :key="item.code" class="pass-item" :class="{ last: playIdx === idx }">
<div class="lefts">
<img :src="item.isAddPrefix ? item.logoPath : config.sourceUrl + item.logoUrl" class="way-icon" alt="" />
</div>
@ -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();
}

4
src/http/http.ts

@ -57,7 +57,7 @@ class Request {
this.instance
.request<any, T>(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)
})
})

5
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"

5
src/i18n/lang/tw.json

@ -10,7 +10,10 @@
"search_home": "搜索",
"shop": {
"goBtn": "導航到店",
"like": "喜歡"
"like": "喜歡",
"replayTip": "重放導航動畫",
"closeTip": "結束",
"icontip": "是否結束導航 ?"
},
"art": {
"go": "導航"

5
src/i18n/lang/zh.json

@ -10,7 +10,10 @@
"search_home": "搜索",
"shop": {
"goBtn": "导航到店",
"like": "喜欢"
"like": "喜欢",
"replayTip": "重放导航动画",
"closeTip": "结束",
"icontip": "是否结束导航?"
},
"art": {
"go": "导航"

11
src/views/Nav/Nav.vue

@ -153,8 +153,9 @@
</li>
</ul>
<!-- 经过列表 -->
<pathGroup ref="pathGroupRef" :direction="directionInfo" :pathshop="pathShopList" />
<pathGroup ref="pathGroupRef" :direction="directionInfo" :pathshop="pathShopList" @over="showCloseNavTip = true" />
</div>
<closeNavTip v-if="showCloseNavTip" @replay="replayBtn.fun" @close="showCloseNavTip = false" @back="backModule"></closeNavTip>
</div>
</template>
@ -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;

Loading…
Cancel
Save