project-shenyangk11
/
sy_k11_H_base_daoshi_vue_ts
forked from common/base_daoshi_vue_ts
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: 🚀 修改导航页面

pull/7/head
deepblues 3 years ago
parent
77421f927a
commit
fd8f90802b
7 changed files with 197 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 172
      public/static/offline/JSON/getArtData.json
  2. 2
      public/static/offline/JSON/getBackTime.json
  3. 6
      src/assets/images/shopDetail/close.svg
  4. 6
      src/components/ShopDetail/ShopDetail.vue
  5. 10
      src/components/ShopItem/ShopItem.vue
  6. 4
      src/composables/useHandleScreen.ts
  7. 13
      src/views/Nav/Nav.vue

172
public/static/offline/JSON/getArtData.json
View File

@ -1 +1,171 @@
{"code":200,"msg":"操作成功"}
{
"code": 200,
"msg": "操作成功",
"data": {
"artFloorList": [{
"id": 12,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "0hXz9crzolz3Hlpy6peoZ",
"fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/0hXz9crzolz3Hlpy6peoZ.png",
"artFloorCode": "7dCSyeNbPUofRt-jn7KMt",
"artFloorName": "艺术品4层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "1Lj_Ebm8Dnao5ggE1cRtM",
"floorName": "L4",
"status": 0,
"artworkNumber": 0,
"floorOrder": 6
}, {
"id": 4,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "GoSWiNRkK_IPAZvtiI14-",
"fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/GoSWiNRkK_IPAZvtiI14-.png",
"artFloorCode": "EU1istWPoXZ9f7bgcSaeg",
"artFloorName": "艺术楼3层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "cun6nT_Ehbwlz1QvugH7d",
"floorName": "L3",
"status": 0,
"artworkNumber": 2,
"floorOrder": 5
}, {
"id": 3,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "Lh7nSu5Ptxt-e7zOvSp48",
"fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Lh7nSu5Ptxt-e7zOvSp48.png",
"artFloorCode": "nCR9zGt2HDWgtFGOKyf6t",
"artFloorName": "艺术楼2层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "AmNQY2Cv9pmuMvBlOPqcs",
"floorName": "L2",
"status": 0,
"artworkNumber": 1,
"floorOrder": 4
}, {
"id": 2,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "YY9WlOQ5xiRloaL2LUQS9",
"fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/YY9WlOQ5xiRloaL2LUQS9.png",
"artFloorCode": "EnHgskSGDk2R6RM14Bow-",
"artFloorName": "艺术楼1层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "p6U4SCkoJf9Xq5gBGpa3L",
"floorName": "L1",
"status": 0,
"artworkNumber": 2,
"floorOrder": 3
}],
"artworkList": [{
"id": 3,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "C1NkJDjPChYJZrRIkhEea",
"artFloorName": "艺术楼1层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "p6U4SCkoJf9Xq5gBGpa3L",
"artworkCode": "zBMuBD-nBUWHBxupN-iF8",
"artworkName": "长置日思1",
"artworkNameEn": "hahaha",
"author": "王赢",
"material": "陶瓷",
"dimension": "100x100",
"introduce": "K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。\nK11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合。",
"introduceEn": "sunt",
"point": 31,
"ord": 0,
"tag": 1,
"creationYear": 2023,
"floorOrder": 3,
"urlList": ["/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/C1NkJDjPChYJZrRIkhEea.png"]
}, {
"id": 5,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "L4tKFqOgu8u9wg38TP5R1",
"artFloorName": "艺术楼3层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "cun6nT_Ehbwlz1QvugH7d",
"artworkCode": "FTckVC_UDaKCdB5JD1Lmd",
"artworkName": "长置日思3",
"artworkNameEn": "hahaha",
"author": "王赢",
"material": "塑料",
"dimension": "100x100",
"introduce": "K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合。",
"introduceEn": "sunt",
"point": 31,
"ord": 1,
"tag": 8,
"creationYear": 2023,
"floorOrder": 5,
"urlList": ["/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/L4tKFqOgu8u9wg38TP5R1.png",
"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/H6DdgKR41V-KGg7E51YoZ.png"
]
}, {
"id": 4,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "jgbi6AU8OjlKmyzfX0GK3",
"artFloorName": "艺术楼2层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "AmNQY2Cv9pmuMvBlOPqcs",
"artworkCode": "FxIFTBGRGa5OK4yxvGF61",
"artworkName": "长置日思2",
"artworkNameEn": "hahaha",
"author": "王赢",
"material": "玻璃",
"dimension": "100x100",
"introduce": "K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。\nK11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合。",
"introduceEn": "sunt",
"point": 31,
"ord": 2,
"tag": 4,
"creationYear": 2023,
"floorOrder": 4,
"urlList": ["/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/jgbi6AU8OjlKmyzfX0GK3.png",
"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/voV12sKo627eJYuiF1Yda.png"
]
}, {
"id": 10,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "AVIS_TGAn2843RBJf3Nbd",
"artFloorName": "艺术楼1层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "p6U4SCkoJf9Xq5gBGpa3L",
"artworkCode": "jFGd5AzYV6YYLxmEf7hTr",
"artworkName": "测试艺术品",
"artworkNameEn": "ssssss",
"author": "艺术家",
"material": "雕塑",
"dimension": "200*300*90",
"introduce": "K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合。",
"introduceEn": "yishup",
"point": 72,
"ord": 4,
"tag": 2,
"creationYear": 1989,
"floorOrder": 3,
"urlList": ["/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/AVIS_TGAn2843RBJf3Nbd.png"]
}, {
"id": 9,
"projectCode": "project-n-ww5jvpwnu0ads70lbkda",
"fileCode": "vK3OrfVq_TbReiu8EEf-v",
"artFloorName": "艺术楼3层",
"buildingCode": "h-8eWvLqbPZP5cuWHY-vA",
"floorCode": "cun6nT_Ehbwlz1QvugH7d",
"artworkCode": "W4wx8d42koi7bzD_bde9D",
"artworkName": "K11艺术品",
"artworkNameEn": "111",
"author": "测试",
"material": "不锈钢",
"dimension": "",
"introduce": "K11是全球首个品牌率先把艺术·人文·自然三大核心元素融合，将艺术欣赏、人文体验、自然环保完美结合和互动，带出无限创意、自由及个性化的生活品牌，并为大众带来前所未有的感官体验。",
"introduceEn": "yishupjieshao",
"point": 58,
"ord": 5,
"tag": 7,
"creationYear": 2020,
"floorOrder": 5,
"urlList": ["/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/vK3OrfVq_TbReiu8EEf-v.png",
"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/47eeQnWsrIZ1cnYc6-_OO.png"
]
}]
}
}

2
public/static/offline/JSON/getBackTime.json
View File

@ -1,5 +1,5 @@
{ {
"code": 200, "code": 200,
"msg": "操作成功", "msg": "操作成功",
"data": [60, null]
"data": [600, null]
} }

6
src/assets/images/shopDetail/close.svg
View File

@ -1,4 +1,4 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="60" height="60" fill="black" fill-opacity="0.9"/>
<path d="M30 27.6436L38.25 19.3936L40.6067 21.7502L32.3567 30.0002L40.6067 38.2502L38.25 40.6069L30 32.3569L21.75 40.6069L19.3934 38.2502L27.6434 30.0002L19.3934 21.7502L21.75 19.3936L30 27.6436Z" fill="#84754E"/>
<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="100" height="100" rx="50" fill="#C7C2B7"/>
<path d="M50 47.172L59.9 37.272L62.728 40.1L52.828 50L62.728 59.9L59.9 62.728L50 52.828L40.1 62.728L37.272 59.9L47.172 50L37.272 40.1L40.1 37.272L50 47.172Z" fill="white"/>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 380 B

After

Width:  |  Height:  |  Size: 336 B

6
src/components/ShopDetail/ShopDetail.vue
View File

@ -330,10 +330,10 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
} }
.exit { .exit {
position: absolute; position: absolute;
top: -60px;
right: 0;
top: -50px;
right: -50px;
img { img {
width: 60px;
width: 100px;
} }
} }
} }

10
src/components/ShopItem/ShopItem.vue
View File

@ -4,7 +4,7 @@
<!-- 图片 --> <!-- 图片 -->
<div class="banner-wrapper"> <div class="banner-wrapper">
<img v-if="shop.logoUrl" :src="shop.logoUrl" alt="" /> <img v-if="shop.logoUrl" :src="shop.logoUrl" alt="" />
<img v-else src="@/assets/images/header/logo.svg" alt="" />
<img v-else class="no-data" src="@/assets/images/header/logo.svg" alt="" />
</div> </div>
<!-- 文字 --> <!-- 文字 -->
<div class="bottom"> <div class="bottom">
@ -50,6 +50,9 @@ defineProps<{ shop: any }>()
width: 180px; width: 180px;
height: 180px; height: 180px;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
&.no-data {
padding: 20px;
}
} }
} }
.bottom { .bottom {
@ -84,6 +87,11 @@ defineProps<{ shop: any }>()
width: 18px; width: 18px;
margin-right: 4px; margin-right: 4px;
} }
span {
line-height: 120%;
@include more-wrap();
}
} }
.likes { .likes {
display: flex; display: flex;

4
src/composables/useHandleScreen.ts
View File

@ -69,7 +69,9 @@ export const useHandleScreen = (callback: () => void) => {
callback() callback()
} }
await sleepToWallpaper() await sleepToWallpaper()
window?.android?.goScreenSave() //进入屏保
if (window.android) {
window.android.goScreenSave() //进入屏保
}
callback() callback()
}, DELAY_CHECK_TIME) }, DELAY_CHECK_TIME)
} }

13
src/views/Nav/Nav.vue
View File

@ -315,7 +315,7 @@ watch(shop, newVal => {
} }
&.art-model { &.art-model {
top: 478px;
top: 537px;
right: 48px; right: 48px;
width: 504px; width: 504px;
height: 72px; height: 72px;
@ -341,7 +341,7 @@ watch(shop, newVal => {
.line { .line {
position: absolute; position: absolute;
top: 456px;
top: 515px;
left: 48px; left: 48px;
width: 727px; width: 727px;
height: 1px; height: 1px;
@ -379,7 +379,7 @@ watch(shop, newVal => {
left: 406px; left: 406px;
z-index: 1; z-index: 1;
overflow: hidden; overflow: hidden;
width: 350px;
width: 395px;
height: 240px; height: 240px;
padding: 0; padding: 0;
padding-right: 20px; padding-right: 20px;
@ -406,6 +406,7 @@ watch(shop, newVal => {
} }
.go-container { .go-container {
max-width: 180px; max-width: 180px;
margin-top: 75px;
font-size: 36px; font-size: 36px;
font-family: 'font_bold'; font-family: 'font_bold';
color: rgb(0 0 0 / 60%); color: rgb(0 0 0 / 60%);
@ -416,7 +417,7 @@ watch(shop, newVal => {
} }
.art-images { .art-images {
position: absolute; position: absolute;
bottom: 106.5px;
bottom: 48px;
left: 48px; left: 48px;
z-index: 1; z-index: 1;
width: 728px; width: 728px;
@ -427,8 +428,8 @@ watch(shop, newVal => {
border-radius: 13.2364px; border-radius: 13.2364px;
} }
&.stay-tuned { &.stay-tuned {
top: 750px;
left: 417px;
top: 826px;
left: 411px;
} }
} }
} }

Write Preview
Loading…
Cancel
Save