diff --git a/CHANGELOG.md b/CHANGELOG.md index 8487bcd..0b92682 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ 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.3](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.2...v1.0.0-B.3) (2023-05-12) + + +### Bug Fixes + +* 🧩 停车介绍样式优化 ([9002137](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9002137643b1cc586f211d41083303c8fcefef23)) + +## [1.0.0-B.2](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.1...v1.0.0-B.2) (2023-05-12) + + +### Bug Fixes + +* 🧩 修改问题 ([b6f3b66](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/b6f3b66ed9f9bbf6913e3bbd6e12b92373784418)) +* 🧩 颜色分页优化 ([d2af576](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d2af576bc8158e7c2d8212351acf3cfcb86911a6)) +* 修改详情布局 ([a1375a8](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a1375a845b4e2cd65dfd4f965f6a7404ea533f78)) +* 修改详情布局 ([f88d63b](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/f88d63b3237d7da04d1e21c2839c104ffe768001)) + ## 1.0.0-B.1 (2023-05-10) diff --git a/package-lock.json b/package-lock.json index 8fe2c53..7ff8381 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.3", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index e2162a4..7b5748d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.0-B.1", + "version": "1.0.0-B.3", "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 c0b000a..bfd96ba 100644 --- a/public/static/offline/JSON/getArtData.json +++ b/public/static/offline/JSON/getArtData.json @@ -1 +1,171 @@ -{"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"]}]}} \ 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/getArtList.json b/public/static/offline/JSON/getArtList.json index a25f5bc..c0d73fc 100644 --- a/public/static/offline/JSON/getArtList.json +++ b/public/static/offline/JSON/getArtList.json @@ -1 +1,170 @@ -{"code":200,"msg":"操作成功","data":[{"fileCode":"jA2-kvdFAMBJSydN25BEg","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/jA2-kvdFAMBJSydN25BEg.jpg","flag":1,"artType":1},{"fileCode":"5pQeWHTN9dRlXIyuE8Sqr","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg","flag":1,"artType":1},{"fileCode":"_WcayletIXukHgV9Rx3Ya","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg","flag":1,"artType":1},{"fileCode":"Ira19CENuPgm4Ikktgzci","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Ira19CENuPgm4Ikktgzci.jpg","flag":1,"artType":1},{"fileCode":"tlONBF4aAXF9VdKIJ2ri3","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/tlONBF4aAXF9VdKIJ2ri3.jpg","flag":1,"artType":1},{"fileCode":"Rb8lH7lciGt1vNUZIdgQe","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Rb8lH7lciGt1vNUZIdgQe.jpg","flag":2,"artType":1},{"fileCode":"IAERcSDTLeuyCxIWX5YN1","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IAERcSDTLeuyCxIWX5YN1.jpg","flag":2,"artType":1},{"fileCode":"s3pMCKIacVBF3rNS-_W62","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/s3pMCKIacVBF3rNS-_W62.jpg","flag":2,"artType":1},{"fileCode":"eNhVVNUBgSJxM_MxsKbML","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/eNhVVNUBgSJxM_MxsKbML.jpg","flag":2,"artType":1},{"fileCode":"fsOn2GiMRQ_hvnWiVBXsV","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/fsOn2GiMRQ_hvnWiVBXsV.jpg","flag":2,"artType":1},{"fileCode":"H40UUmExfcFpebA2i-Bk6","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/H40UUmExfcFpebA2i-Bk6.jpg","flag":1,"artType":1},{"fileCode":"JfQC8KoD1vGInd2YXOQSl","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/JfQC8KoD1vGInd2YXOQSl.jpg","flag":2,"artType":2},{"fileCode":"yFB0w-HGSiAH3mF3S9VNi","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/yFB0w-HGSiAH3mF3S9VNi.jpg","flag":2,"artType":2},{"fileCode":"IbQ0bamzhOEixOQwuP_Rc","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IbQ0bamzhOEixOQwuP_Rc.jpg","flag":2,"artType":2},{"fileCode":"nUm7hTA1R8Kg5IfaZm2BY","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/nUm7hTA1R8Kg5IfaZm2BY.jpg","flag":2,"artType":2},{"fileCode":"5NkXmpBZ9s-wYh9BDmOFF","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5NkXmpBZ9s-wYh9BDmOFF.jpg","flag":2,"artType":2},{"fileCode":"7EYcvZzHZYODEg97WTCp7","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7EYcvZzHZYODEg97WTCp7.jpg","flag":1,"artType":2},{"fileCode":"LpAEW1Lvc3BLdNJ6XHbc_","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/LpAEW1Lvc3BLdNJ6XHbc_.jpg","flag":1,"artType":2},{"fileCode":"sLED3A_AYzulI-IF9m-b3","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/sLED3A_AYzulI-IF9m-b3.jpg","flag":1,"artType":2},{"fileCode":"QaZFHo6mTlLHvOJGPKl2C","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/QaZFHo6mTlLHvOJGPKl2C.jpg","flag":1,"artType":2},{"fileCode":"7eJGjEg08DyDG1GQuEZHS","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7eJGjEg08DyDG1GQuEZHS.jpg","flag":1,"artType":2},{"fileCode":"G97GPxe7KT-TMvcre2lnx","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/G97GPxe7KT-TMvcre2lnx.jpg","flag":2,"artType":3},{"fileCode":"hzSAiHPb56KAecI8nVCPo","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hzSAiHPb56KAecI8nVCPo.jpg","flag":2,"artType":3},{"fileCode":"ZK0pAC8PdhwGBnynVxRgo","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ZK0pAC8PdhwGBnynVxRgo.jpg","flag":2,"artType":3},{"fileCode":"hi4XfhlASneBc0MX2svS2","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hi4XfhlASneBc0MX2svS2.jpg","flag":1,"artType":3},{"fileCode":"ABTnGXm0pP9FNPngvDRaU","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ABTnGXm0pP9FNPngvDRaU.jpg","flag":1,"artType":3},{"fileCode":"aszyTxdOZzNTNxz5nJwNk","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/aszyTxdOZzNTNxz5nJwNk.jpg","flag":1,"artType":3},{"fileCode":"bkvvG13h76NVlUqNayhFE","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/bkvvG13h76NVlUqNayhFE.jpg","flag":1,"artType":3},{"fileCode":"4AFl7ggDnt56Xa1Adphl9","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/4AFl7ggDnt56Xa1Adphl9.jpg","flag":2,"artType":3},{"fileCode":"3Uh28D-mldlpsgQglStQ_","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/3Uh28D-mldlpsgQglStQ_.png","flag":2,"artType":4},{"fileCode":"Fh3-6ToyKkizMA5HCB04P","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Fh3-6ToyKkizMA5HCB04P.png","flag":2,"artType":4},{"fileCode":"iWIiFMC6V35LjoZocZqWZ","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/iWIiFMC6V35LjoZocZqWZ.png","flag":1,"artType":4},{"fileCode":"pc-DdL_2pDm_3rk9Fo-R5","fileUrl":"/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/pc-DdL_2pDm_3rk9Fo-R5.png","flag":1,"artType":4}]} +{ + "code": 200, + "msg": "操作成功", + "data": [{ + "fileCode": "jA2-kvdFAMBJSydN25BEg", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/jA2-kvdFAMBJSydN25BEg.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "5pQeWHTN9dRlXIyuE8Sqr", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5pQeWHTN9dRlXIyuE8Sqr.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "_WcayletIXukHgV9Rx3Ya", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/_WcayletIXukHgV9Rx3Ya.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "Ira19CENuPgm4Ikktgzci", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Ira19CENuPgm4Ikktgzci.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "tlONBF4aAXF9VdKIJ2ri3", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/tlONBF4aAXF9VdKIJ2ri3.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "Rb8lH7lciGt1vNUZIdgQe", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Rb8lH7lciGt1vNUZIdgQe.jpg", + "flag": 2, + "artType": 1 + }, { + "fileCode": "IAERcSDTLeuyCxIWX5YN1", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IAERcSDTLeuyCxIWX5YN1.jpg", + "flag": 2, + "artType": 1 + }, { + "fileCode": "s3pMCKIacVBF3rNS-_W62", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/s3pMCKIacVBF3rNS-_W62.jpg", + "flag": 2, + "artType": 1 + }, { + "fileCode": "eNhVVNUBgSJxM_MxsKbML", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/eNhVVNUBgSJxM_MxsKbML.jpg", + "flag": 2, + "artType": 1 + }, { + "fileCode": "fsOn2GiMRQ_hvnWiVBXsV", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/fsOn2GiMRQ_hvnWiVBXsV.jpg", + "flag": 2, + "artType": 1 + }, { + "fileCode": "H40UUmExfcFpebA2i-Bk6", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/H40UUmExfcFpebA2i-Bk6.jpg", + "flag": 1, + "artType": 1 + }, { + "fileCode": "JfQC8KoD1vGInd2YXOQSl", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/JfQC8KoD1vGInd2YXOQSl.jpg", + "flag": 2, + "artType": 2 + }, { + "fileCode": "yFB0w-HGSiAH3mF3S9VNi", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/yFB0w-HGSiAH3mF3S9VNi.jpg", + "flag": 2, + "artType": 2 + }, { + "fileCode": "IbQ0bamzhOEixOQwuP_Rc", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/IbQ0bamzhOEixOQwuP_Rc.jpg", + "flag": 2, + "artType": 2 + }, { + "fileCode": "nUm7hTA1R8Kg5IfaZm2BY", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/nUm7hTA1R8Kg5IfaZm2BY.jpg", + "flag": 2, + "artType": 2 + }, { + "fileCode": "5NkXmpBZ9s-wYh9BDmOFF", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/5NkXmpBZ9s-wYh9BDmOFF.jpg", + "flag": 2, + "artType": 2 + }, { + "fileCode": "7EYcvZzHZYODEg97WTCp7", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7EYcvZzHZYODEg97WTCp7.jpg", + "flag": 1, + "artType": 2 + }, { + "fileCode": "LpAEW1Lvc3BLdNJ6XHbc_", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/LpAEW1Lvc3BLdNJ6XHbc_.jpg", + "flag": 1, + "artType": 2 + }, { + "fileCode": "sLED3A_AYzulI-IF9m-b3", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/sLED3A_AYzulI-IF9m-b3.jpg", + "flag": 1, + "artType": 2 + }, { + "fileCode": "QaZFHo6mTlLHvOJGPKl2C", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/QaZFHo6mTlLHvOJGPKl2C.jpg", + "flag": 1, + "artType": 2 + }, { + "fileCode": "7eJGjEg08DyDG1GQuEZHS", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/7eJGjEg08DyDG1GQuEZHS.jpg", + "flag": 1, + "artType": 2 + }, { + "fileCode": "G97GPxe7KT-TMvcre2lnx", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/G97GPxe7KT-TMvcre2lnx.jpg", + "flag": 2, + "artType": 3 + }, { + "fileCode": "hzSAiHPb56KAecI8nVCPo", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hzSAiHPb56KAecI8nVCPo.jpg", + "flag": 2, + "artType": 3 + }, { + "fileCode": "ZK0pAC8PdhwGBnynVxRgo", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ZK0pAC8PdhwGBnynVxRgo.jpg", + "flag": 2, + "artType": 3 + }, { + "fileCode": "hi4XfhlASneBc0MX2svS2", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/hi4XfhlASneBc0MX2svS2.jpg", + "flag": 1, + "artType": 3 + }, { + "fileCode": "ABTnGXm0pP9FNPngvDRaU", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/ABTnGXm0pP9FNPngvDRaU.jpg", + "flag": 1, + "artType": 3 + }, { + "fileCode": "aszyTxdOZzNTNxz5nJwNk", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/aszyTxdOZzNTNxz5nJwNk.jpg", + "flag": 1, + "artType": 3 + }, { + "fileCode": "bkvvG13h76NVlUqNayhFE", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/bkvvG13h76NVlUqNayhFE.jpg", + "flag": 1, + "artType": 3 + }, { + "fileCode": "4AFl7ggDnt56Xa1Adphl9", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/4AFl7ggDnt56Xa1Adphl9.jpg", + "flag": 2, + "artType": 3 + }, { + "fileCode": "3Uh28D-mldlpsgQglStQ_", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/3Uh28D-mldlpsgQglStQ_.png", + "flag": 2, + "artType": 4 + }, { + "fileCode": "Fh3-6ToyKkizMA5HCB04P", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/Fh3-6ToyKkizMA5HCB04P.png", + "flag": 2, + "artType": 4 + }, { + "fileCode": "iWIiFMC6V35LjoZocZqWZ", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/iWIiFMC6V35LjoZocZqWZ.png", + "flag": 1, + "artType": 4 + }, { + "fileCode": "pc-DdL_2pDm_3rk9Fo-R5", + "fileUrl": "/iotFile/project-n-ww5jvpwnu0ads70lbkda/20230509/pc-DdL_2pDm_3rk9Fo-R5.png", + "flag": 1, + "artType": 4 + }] +} diff --git a/src/components/PathGroup/PathGroup.vue b/src/components/PathGroup/PathGroup.vue index f49108a..66a8e9a 100644 --- a/src/components/PathGroup/PathGroup.vue +++ b/src/components/PathGroup/PathGroup.vue @@ -93,14 +93,16 @@ const yourpos = computed(() => { }) //终点图 const lastImage = computed(() => { - console.log(shop.value.logoUrl.search('http')) - return shop.value.logoUrl.search('http') !== -1 || - shop.value.logoUrl.search('/static') !== -1 || - shop.value.logoUrl.search('/base64') !== -1 - ? shop.value.logoUrl - : shop.value.logoUrl - ? config.value.baseUrl + shop.value.logoUrl - : require('@/assets/images/header/logo.svg') + if (shop.logoUrl) { + return shop.value.logoUrl?.search('http') !== -1 || + shop.value.logoUrl?.search('/static') !== -1 || + shop.value.logoUrl?.search('/base64') !== -1 + ? shop.value.logoUrl + : shop.value.logoUrl + ? config.value.sourceUrl + shop.value.logoUrl + : require('@/assets/images/header/logo.svg') + } + return require('@/assets/images/header/logo.svg') }) defineExpose({ resetPlayIdx diff --git a/src/components/ShopItem/ShopItem.vue b/src/components/ShopItem/ShopItem.vue index e815544..3dd1147 100644 --- a/src/components/ShopItem/ShopItem.vue +++ b/src/components/ShopItem/ShopItem.vue @@ -65,6 +65,7 @@ defineProps<{ shop: any }>() flex-direction: column; .name { max-width: 90%; + height: 18px; font-size: 16px; color: #685c3b; diff --git a/src/views/Art/Art.vue b/src/views/Art/Art.vue index a394e65..c2dc2ad 100644 --- a/src/views/Art/Art.vue +++ b/src/views/Art/Art.vue @@ -510,9 +510,9 @@ function clickGo(item: ArtItem) { .map-group { position: absolute; top: 85px; - left: 510px; + left: 580px; li { - margin-bottom: -108px; + margin-bottom: -70px; img { height: 205px; } diff --git a/src/views/Art/ArtMapItem.vue b/src/views/Art/ArtMapItem.vue index e229167..718988f 100644 --- a/src/views/Art/ArtMapItem.vue +++ b/src/views/Art/ArtMapItem.vue @@ -29,7 +29,9 @@ const props = defineProps({ artInfo: { type: Object, // eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function - default: () => {} + default: () => { + return { artworkName: '' } + } } }) function clickGo() { @@ -56,10 +58,11 @@ function clickGo() { .intro-container { display: inline-block; padding-top: 16px; - padding-left: 6px; + padding-left: 12px; .art-title { max-width: 170px; + height: 16px; font-size: 14px; font-family: 'font_bold'; color: #736661; @@ -70,7 +73,8 @@ function clickGo() { } .art-author { max-width: 170px; - margin-top: 6px; + height: 14px; + margin-top: 2px; font-size: 10px; font-family: 'font_bold'; color: #9b8c85; @@ -115,7 +119,7 @@ function clickGo() { bottom: 0; width: 65px; height: 36px; - padding-top: 8px; + padding-top: 12px; padding-left: 29px; font-size: 16px; font-family: 'font_bold'; diff --git a/src/views/Art/ArtRightItem.vue b/src/views/Art/ArtRightItem.vue index 54270bb..5b670f4 100644 --- a/src/views/Art/ArtRightItem.vue +++ b/src/views/Art/ArtRightItem.vue @@ -54,6 +54,7 @@ function clickGo() { .art-title { max-width: 200px; + height: 18px; font-size: 16px; font-family: 'font_bold'; color: #736661; @@ -64,7 +65,8 @@ function clickGo() { } .art-author { max-width: 150px; - margin-top: 4px; + height: 14px; + margin-top: 2px; font-size: 12px; font-family: 'font_regular'; color: #9b8c85; diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue index b5e6017..81938fd 100644 --- a/src/views/Nav/Nav.vue +++ b/src/views/Nav/Nav.vue @@ -38,6 +38,7 @@ >{{ switchLanguage(shop, 'shopName') }} +

{{ shop.artAuthor }}

{ z-index: 1; width: 824px; height: 1078px; - background: linear-gradient(171.17deg, rgb(217 214 205 / 40%) 7.32%, #ecebe7 89.2%); + background: linear-gradient(180deg, #ded8c8 0%, #efeee4 47.92%, #fafafa 100%); + + .line { + position: absolute; + top: 456px; + left: 48px; + width: 727px; + height: 1px; + border: 1px solid rgb(0 0 0 / 6%); + } .marquee-wrapper { overflow: hidden; width: 340px; @@ -395,11 +405,13 @@ watch(shop, newVal => { max-width: 180px; } .go-container { + max-width: 180px; font-size: 36px; font-family: 'font_bold'; color: rgb(0 0 0 / 60%); font-style: normal; font-weight: 700; + line-height: 120%; } } .art-images {