diff --git a/CHANGELOG.md b/CHANGELOG.md index 631a3c9..330cb88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,20 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.0.0-B.7](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.6...v1.0.0-B.7) (2023-05-15) + + +### Features + +* 🚀 修改导航页面 ([fd8f908](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/fd8f90802b1452f80d19ef82e815d1277d313a4d)) + + +### Bug Fixes + +* 🧩 停车输入框选中态优化 ([be5699f](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/be5699f4d8fde6f521406e43bc24bbd4f25b3b6f)) +* 🧩 修改导航页面 ([d708270](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d7082709c930e8523f5cdd7838e7da022a5b7cb6)) +* 修改冲突 ([6c23324](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/6c233249b6e723d086a83fed99940e3e5ccba5b0)) + ## [1.0.0-B.6](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.5...v1.0.0-B.6) (2023-05-12) diff --git a/package-lock.json b/package-lock.json index 0afc367..73f3cc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.6", + "version": "1.0.0-B.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.6", + "version": "1.0.0-B.7", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index f7c92a8..35bcac0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.6", + "version": "1.0.0-B.7", "private": true, "scripts": { "serve": "vue-cli-service serve", diff --git a/public/static/offline/JSON/getArtData.json b/public/static/offline/JSON/getArtData.json index 07a3ad6..bfd96ba 100644 --- a/public/static/offline/JSON/getArtData.json +++ b/public/static/offline/JSON/getArtData.json @@ -1 +1,171 @@ -{"code":200,"msg":"操作成功"} \ No newline at end of file +{ + "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" + ] + }] + } +} diff --git a/public/static/offline/JSON/getBackTime.json b/public/static/offline/JSON/getBackTime.json index 36a899f..5df7d65 100644 --- a/public/static/offline/JSON/getBackTime.json +++ b/public/static/offline/JSON/getBackTime.json @@ -1,5 +1,5 @@ { "code": 200, "msg": "操作成功", - "data": [60, null] + "data": [600, null] } diff --git a/src/assets/images/shopDetail/close.svg b/src/assets/images/shopDetail/close.svg index 7f3cc20..5987292 100644 --- a/src/assets/images/shopDetail/close.svg +++ b/src/assets/images/shopDetail/close.svg @@ -1,4 +1,4 @@ - - - + + + diff --git a/src/components/PlateInput/PlateInput.vue b/src/components/PlateInput/PlateInput.vue index 0e565ec..52e22a2 100644 --- a/src/components/PlateInput/PlateInput.vue +++ b/src/components/PlateInput/PlateInput.vue @@ -4,7 +4,10 @@
diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue index dfa0fb7..b41de49 100644 --- a/src/components/PublicComponent/PublicComponent.vue +++ b/src/components/PublicComponent/PublicComponent.vue @@ -56,6 +56,7 @@ onMounted(() => { window.leaveScreenSave = () => { checkHandleScreen(new TouchEvent('touchstart')) + console.log('Android调用成功 :>>>>>>>>> ') } }) onBeforeUnmount(() => { diff --git a/src/components/Search/Hot.vue b/src/components/Search/Hot.vue index bdd4639..d447561 100644 --- a/src/components/Search/Hot.vue +++ b/src/components/Search/Hot.vue @@ -31,7 +31,7 @@ import { useStatistics } from '@/composables/useStatistics' import ScrollView from '@/base/ScrollView/ScrollView.vue' const list = ref([]) getIndexJson().then(({ data }) => { - list.value = [] + list.value = data.hotSearch }) const store = useRootStore() diff --git a/src/components/ShopDetail/ShopDetail.vue b/src/components/ShopDetail/ShopDetail.vue index fe5c311..e71655e 100644 --- a/src/components/ShopDetail/ShopDetail.vue +++ b/src/components/ShopDetail/ShopDetail.vue @@ -330,10 +330,10 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode }) } .exit { position: absolute; - top: -60px; - right: 0; + top: -50px; + right: -50px; img { - width: 60px; + width: 100px; } } } diff --git a/src/components/ShopItem/ShopItem.vue b/src/components/ShopItem/ShopItem.vue index 3dd1147..4d3ba8d 100644 --- a/src/components/ShopItem/ShopItem.vue +++ b/src/components/ShopItem/ShopItem.vue @@ -4,7 +4,7 @@
@@ -50,6 +50,9 @@ defineProps<{ shop: any }>() width: 180px; height: 180px; transform: translate(-50%, -50%); + &.no-data { + padding: 20px; + } } } .bottom { @@ -84,6 +87,11 @@ defineProps<{ shop: any }>() width: 18px; margin-right: 4px; } + span { + line-height: 120%; + + @include more-wrap(); + } } .likes { display: flex; diff --git a/src/views/Art/Art.vue b/src/views/Art/Art.vue index 2b211bb..9ec387c 100644 --- a/src/views/Art/Art.vue +++ b/src/views/Art/Art.vue @@ -512,7 +512,7 @@ function clickGo(item: ArtItem) { top: 85px; left: 580px; li { - margin-bottom: -70px; + margin-bottom: -80px; img { height: 205px; } diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue index 145427d..274f911 100644 --- a/src/views/Nav/Nav.vue +++ b/src/views/Nav/Nav.vue @@ -315,7 +315,7 @@ watch(shop, newVal => { } &.art-model { - top: 478px; + top: 537px; right: 48px; width: 504px; height: 72px; @@ -341,7 +341,7 @@ watch(shop, newVal => { .line { position: absolute; - top: 456px; + top: 515px; left: 48px; width: 727px; height: 1px; @@ -379,7 +379,7 @@ watch(shop, newVal => { left: 406px; z-index: 1; overflow: hidden; - width: 350px; + width: 395px; height: 240px; padding: 0; padding-right: 20px; @@ -406,6 +406,7 @@ watch(shop, newVal => { } .go-container { max-width: 180px; + margin-top: 75px; font-size: 36px; font-family: 'font_bold'; color: rgb(0 0 0 / 60%); @@ -416,7 +417,7 @@ watch(shop, newVal => { } .art-images { position: absolute; - bottom: 106.5px; + bottom: 48px; left: 48px; z-index: 1; width: 728px; @@ -427,8 +428,8 @@ watch(shop, newVal => { border-radius: 13.2364px; } &.stay-tuned { - top: 750px; - left: 417px; + top: 826px; + left: 411px; } } }