Browse Source

fix: 修改导航页面

pull/2/head
deepblues 3 years ago
parent
commit
e717a967f2
  1. 8
      src/assets/images/nav/floorTofloor.svg
  2. 2
      src/components/PathGroup/PathGroup.vue
  3. 58
      src/views/Nav/Nav.vue

8
src/assets/images/nav/floorTofloor.svg

@ -1,5 +1,5 @@
<svg width="32" height="40" viewBox="0 0 32 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5647 35.9769C31.3477 36.7282 31.3477 37.9802 30.5647 38.7316C29.8261 39.4404 28.6598 39.4404 27.9212 38.7316L17.3848 28.6204C16.6109 27.8778 15.3891 27.8778 14.6152 28.6204L4.07882 38.7316C3.34019 39.4404 2.17392 39.4404 1.43529 38.7316C0.652344 37.9802 0.652346 36.7282 1.43529 35.9769L14.6152 23.3289C15.3891 22.5863 16.6109 22.5863 17.3848 23.3289L30.5647 35.9769Z" fill="white" fill-opacity="0.4"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5647 24.9769C31.3477 25.7282 31.3477 26.9802 30.5647 27.7316C29.8261 28.4404 28.6598 28.4404 27.9212 27.7316L17.3848 17.6204C16.6109 16.8778 15.3891 16.8778 14.6152 17.6204L4.07882 27.7316C3.34019 28.4404 2.17392 28.4404 1.43529 27.7316C0.652344 26.9802 0.652346 25.7282 1.43529 24.9769L14.6152 12.3289C15.3891 11.5863 16.6109 11.5863 17.3848 12.3289L30.5647 24.9769Z" fill="white" fill-opacity="0.7"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M30.5647 13.9769C31.3477 14.7282 31.3477 15.9802 30.5647 16.7316C29.8261 17.4404 28.6598 17.4404 27.9212 16.7316L17.3848 6.62045C16.6109 5.87783 15.3891 5.87783 14.6152 6.62045L4.07882 16.7316C3.34019 17.4404 2.17392 17.4404 1.43529 16.7316C0.652344 15.9802 0.652346 14.7282 1.43529 13.9769L14.6152 1.3289C15.3891 0.586279 16.6109 0.586281 17.3848 1.3289L30.5647 13.9769Z" fill="white"/>
<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.2726 22.4307L15.2726 11.3806L27.9999 0.675907L40.7272 11.3806L40.7272 22.4307L27.9999 11.7259L15.2726 22.4307Z" fill="#9B8C85"/>
<path opacity="0.8" fill-rule="evenodd" clip-rule="evenodd" d="M15.2726 39.0059L15.2726 27.9558L27.9999 17.2511L40.7272 27.9558L40.7272 39.0059L27.9999 28.3011L15.2726 39.0059Z" fill="#9B8C85"/>
<path opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M15.2726 55.5762L15.2726 44.5261L27.9999 33.8214L40.7272 44.5261L40.7272 55.5762L27.9999 44.8715L15.2726 55.5762Z" fill="#9B8C85"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 675 B

2
src/components/PathGroup/PathGroup.vue

@ -113,7 +113,7 @@ defineExpose({
top: 495px;
left: 64px;
z-index: 1;
width: 653px;
width: 340px;
height: 348px;
animation-duration: 0.3s;
animation-delay: 0.9s;

58
src/views/Nav/Nav.vue

@ -13,7 +13,7 @@
alt=""
/>
<!-- 起始结束楼层 -->
<div class="floor-container">
<div class="floor-container" :class="{ 'art-model': route.query?.type }">
<div class="start-floor floor" :class="{ 'blue-mode': dirFloor.start.txt === '起点' }">
<span class="name" v-text="dirFloor.start.floor"></span>
<p class="pos">
@ -78,12 +78,7 @@
<!-- logo -->
<div class="logo-wrapper">
<img
v-if="shop.logoUrl"
class="shop-logo"
:src="shop.logoUrl.search(config.sourceUrl) >= 0 ? shop.logoUrl : config.sourceUrl + shop.logoUrl"
alt=""
/>
<img v-if="shop.logoUrl" class="shop-logo" :src="shop.logoUrl" alt="" />
<img v-else class="shop-logo" src="@/assets/images/header/logo.svg" alt="" />
</div>
<!-- 名称和属性 -->
@ -201,12 +196,13 @@ function backModule() {
//
const dirFloor = computed(() => {
const isT2B = device.value.floorOrder >= shop.value.floorOrder
const model = route.query?.type
return {
start: {
floor: isT2B ? device.value.floor : shop.value.floor,
// icon: isT2B ? require('../../assets/images/nav/icon_start.svg') : require('../../assets/images/nav/icon_end.svg'),
txt: isT2B ? i18n.global.t('go.start') : i18n.global.t('go.end'),
rotate: isT2B ? 'rotate(180deg)' : 'rotate(0deg)'
rotate: model ? (isT2B ? 'rotate(90deg)' : 'rotate(-90deg)') : isT2B ? 'rotate(180deg)' : 'rotate(0deg)'
},
end: {
floor: isT2B ? shop.value.floor : device.value.floor,
@ -277,28 +273,32 @@ watch(shop, newVal => {
}
.floor-container {
position: absolute;
top: 312px;
left: 80px;
z-index: 1;
top: 495px;
right: 48px;
z-index: 2;
display: flex;
align-items: center;
width: 56px;
height: 196px;
width: 260px;
height: 348px;
text-align: center;
background: rgb(0 0 0 / 3%);
border-radius: 8px;
flex-direction: column;
.floor {
display: flex;
justify-content: center;
align-items: center;
width: 56px;
height: 56px;
background-color: #fff;
border-radius: 4px;
width: 228px;
height: 96px;
background: #b7a475;
border-radius: 8px;
.name {
margin-right: 0;
font-size: 28px;
font-family: 'font_bold';
color: #9b8c85;
color: #fff;
@include no-wrap();
}
// &.blue-mode {
@ -306,9 +306,25 @@ watch(shop, newVal => {
}
.dir {
flex-shrink: 0;
width: 18px;
margin-top: 32px;
margin-bottom: 32px;
width: 56px;
margin-top: 34px;
margin-bottom: 34px;
}
&.art-model {
top: 478px;
right: 48px;
width: 504px;
height: 72px;
background: transparent;
flex-direction: row;
.floor {
width: 200px;
height: 72px;
}
.dir {
margin: 0 24px;
}
}
}
.nav-art {

Loading…
Cancel
Save