chore(release): 1.0.0-B.7

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.6...v1.0.0-B.7) (2023-07-21)
+
+
+### Bug Fixes
+
+* 🧩 相关优化 ([52aa37b](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/52aa37b21478d2d8dd31c64d5c747e963a1ac6a1))
+* 修改界面问题 ([8706015](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/87060157679df45fd0ad1fa8721f1e59e6794e85))
+* 修改品牌宽度和推荐logo ([27f357d](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/27f357d61d8de5f1df96d4139288379eb27e9baa))
+
 ## [1.0.0-B.6](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.0-B.5...v1.0.0-B.6) (2023-07-20)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.6",
+  "version": "1.0.0-B.7",
   "lockfileVersion": 3,
   "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",

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

public/static/offline/JSON/getFacilityList.json

@@ -1,123 +1,231 @@
 {
-    "code": 200,
-    "msg": "操作成功",
-    "data": [
-        {
-            "name": "扶梯",
-            "nameEn": "escalator",
-            "code": "wvbKjHPqqnbjxsXTlSfc1",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "ft",
-            "filePath": "/iotFile/2022/11/15/f3u4NjtZtlVfhoW-p3lqM.png"
-        },
-        {
-            "name": "上扶梯",
-            "nameEn": "",
-            "code": "NtFDFfDiTIQIWQ5UFqcbv",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "upft",
-            "filePath": "/iotFile/2022/11/15/RbX3fMJtHD12cie3ZWbhl.png"
-        },
-        {
-            "name": "下扶梯",
-            "nameEn": "xiafuti",
-            "code": "UPAo4Rr1B0SUonvpSW8kC",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "downft",
-            "filePath": "/iotFile/2022/11/15/KVRDjyi__OiTBK0wvTiab.png"
-        },
-        {
-            "name": "母婴室",
-            "nameEn": "",
-            "code": "D3i4vTd1k7NYlaC4kmeVP",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "mys",
-            "filePath": "/iotFile/2022/11/15/ASyeOlY20rCM0Y204kOXf.png"
-        },
-        {
-            "name": "洗手间",
-            "nameEn": "toilet",
-            "code": "ACgMk2fBoaIn268yyLnFG",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "xsj",
-            "filePath": "/iotFile/2022/11/15/R7GJWgwODBsGiM4A6ARzu.png"
-        },
-        {
-            "name": "直梯",
-            "nameEn": "",
-            "code": "DaNPxh6ilIIhd4gkri38j",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "dt",
-            "filePath": "/iotFile/2022/11/15/xOyk8yctB_D0KaD4jw6D-.png"
-        },
-        {
-            "name": "吸烟室",
-            "nameEn": "",
-            "code": "5Gp5PNrRVu7RBsrqGiJOi",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "xys",
-            "filePath": "/iotFile/2022/11/15/l-wKNIKm4SbRdalfC0adv.png"
-        },
-        {
-            "name": "人行通道",
-            "nameEn": "",
-            "code": "eOfA_xJ0yJ8BghGyuc3kw",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "td",
-            "filePath": "/iotFile/2022/11/15/-ZCv-lT1vGnozNj-hnYjW.png"
-        },
-        {
-            "name": "男洗手间",
-            "nameEn": "",
-            "code": "OMoEcFmqQCTTGPTPCRGzp",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "xsjn",
-            "filePath": "/iotFile/2022/11/15/RPLs01DqaHy-HUcOWFunN.png"
-        },
-        {
-            "name": "女洗手间",
-            "nameEn": "",
-            "code": "J9xwLN-PXnxcf5cxlVM5d",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "xsjv",
-            "filePath": "/iotFile/2022/11/15/7gt7rdAoCvH-Mz6afk7yu.png"
-        },
-        {
-            "name": "活动",
-            "nameEn": "",
-            "code": "Me3ww760_AGXnA49PefKm",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "hd",
-            "filePath": "/iotFile/2023/03/29/xiNzv4wixeghR6OIKWjad.png"
-        },
-        {
-            "name": "服务台",
-            "nameEn": "",
-            "code": "9_BitsfWpJbShoy74lu-5",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "fwt",
-            "filePath": "/iotFile/saas/20230602/mnj4iHDnTbxx7SaYu9naD.png"
-        },
-        {
-            "name": "停车场",
-            "nameEn": "",
-            "code": "5-dKYo0_dOe9AtuDESAH1",
-            "customFacilityName": "",
-            "customFacilityNameEn": "",
-            "abbreviation": "tcc",
-            "filePath": "/iotFile/saas/20230602/5YOnznceV6MoLMbjysHdG.png"
-        }
-    ]
-}
+  "code": 200,
+  "msg": "操作成功",
+  "data": [
+    {
+      "name": "直梯",
+      "nameEn": "",
+      "code": "_Lw1JgBlHcHmHIhDffWDX",
+      "customFacilityName": "电梯",
+      "customFacilityNameEn": "",
+      "abbreviation": "dt",
+      "filePath": "/convert/Files/86b0e9ab-57bd-40b9-97c0-f1b6f1d0efd4/dt.png"
+    },
+    {
+      "name": "女洗手间",
+      "nameEn": "",
+      "code": "ncGrnPQ0R1wCrZGXgg6UT",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "xsjv",
+      "filePath": "/convert/Files/58017bc7-4d0d-41eb-80ff-f7f1d664d1ef/xsjv.png"
+    },
+    {
+      "name": "男洗手间",
+      "nameEn": "",
+      "code": "gl9qD0UXBY991EpItqldQ",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "xsjn",
+      "filePath": "/convert/Files/b972ebe1-90ec-41a4-98ff-bd762bddec13/xsjn.png"
+    },
+    {
+      "name": "楼梯",
+      "nameEn": "",
+      "code": "XGgII8bTWzH2Lwy_iKtd1",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "lt",
+      "filePath": "/convert/Files/0c783f8d-0efb-4916-9835-d7dd244f8126/lt.png"
+    },
+    {
+      "name": "扶梯",
+      "nameEn": "扶梯",
+      "code": "SWjFvak82y9lXc0rBXn2g",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "ft",
+      "filePath": "/convert/Files/ff5514af-a743-4823-a246-43de4b8d362f/ft.png"
+    },
+    {
+      "name": "无障碍卫生间",
+      "nameEn": "无障碍卫生间",
+      "code": "CFfRtlLbYE9d38bv3VZy0",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "cjr",
+      "filePath": "/convert/Files/abc22b61-3d10-42c2-a5c1-182c21da9147/cjr.png"
+    },
+    {
+      "name": "停车场",
+      "nameEn": "",
+      "code": "WeKtI9-Wig4BldTI4o7J8",
+      "customFacilityName": "小汽车停车场",
+      "customFacilityNameEn": "GUEST PARKING",
+      "abbreviation": "tcc",
+      "filePath": "/convert/Files/f4fe843e-63d9-460c-8cb0-c8fdf5c06c71/tcc.png"
+    },
+    {
+      "name": "母婴室",
+      "nameEn": "",
+      "code": "MW_Iy4G6ggBTGADTUZzMD",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "mys",
+      "filePath": "/convert/Files/e42ea976-1acc-45fa-b00e-203213f5f5b6/mys.png"
+    },
+    {
+      "name": "服务台",
+      "nameEn": "",
+      "code": "Q06WweVcR09F-fPHEmfPg",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "fwt",
+      "filePath": "/convert/Files/293e3458-9588-46be-954b-f081b669dc52/fwt.png"
+    },
+    {
+      "name": "公交",
+      "nameEn": "",
+      "code": "NSqr2QyYFOTrv7sw8iD10",
+      "customFacilityName": "公交车站",
+      "customFacilityNameEn": "BUS STOP",
+      "abbreviation": "ksgj",
+      "filePath": "/convert/Files/f833d3d4-278a-4a44-b468-27dbe095c7d6/ksgj.png"
+    },
+    {
+      "name": "停车缴费",
+      "nameEn": "",
+      "code": "_T9olY_vY3fO7y2AZzmeB",
+      "customFacilityName": "货车消防车停车场",
+      "customFacilityNameEn": "TRUCK/FIRE TRUCK PARKING",
+      "abbreviation": "tcjf",
+      "filePath": "/convert/Files/54166ee6-01a1-4581-98ef-d4aee35bda03/tcjf.png"
+    },
+    {
+      "name": "泊车",
+      "nameEn": "",
+      "code": "Jl-NdW9ISljgJ1N9BW1l6",
+      "customFacilityName": "落客区",
+      "customFacilityNameEn": "DROP-OFF AREA",
+      "abbreviation": "bc",
+      "filePath": "/convert/Files/db17b7bd-1634-41ca-9f0b-403641c854ce/bc.png"
+    },
+    {
+      "name": "寄存服务",
+      "nameEn": "",
+      "code": "JaYd2lAUD4FHfMAubmIVe",
+      "customFacilityName": "非机动车停放处",
+      "customFacilityNameEn": "NON-MOTOR VEHICLE PARKING",
+      "abbreviation": "jcfw",
+      "filePath": "/convert/Files/11b18ede-5ae5-4553-ab30-db56d8f0fd9e/jcfw.png"
+    },
+    {
+      "name": "医保窗口",
+      "nameEn": "医保窗口",
+      "code": "pArJlI5bJwXhaJUVPOhtI",
+      "customFacilityName": "医务室",
+      "customFacilityNameEn": "",
+      "abbreviation": "ybck",
+      "filePath": "/convert/Files/eae1e601-fe13-4cc9-87c2-ac5ef518e353/医保窗口03x.png"
+    },
+    {
+      "name": "便民服务中心",
+      "nameEn": "便民服务中心",
+      "code": "Xszzl-Rok1dyZ2ieEycfJ",
+      "customFacilityName": "会员服务台",
+      "customFacilityNameEn": "",
+      "abbreviation": "ykzx",
+      "filePath": "/convert/Files/8efbc3a5-5da5-4254-a1d0-a71e8fdc36bc/便民服务中心03x.png"
+    },
+    {
+      "name": "洗手间",
+      "nameEn": "",
+      "code": "f2q9rFi3OST5rx-8ZYa1T",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "xsj",
+      "filePath": "/convert/Files/8c564bba-04d5-4768-9cfa-a12a5d4a2f99/xsj.png"
+    },
+    {
+      "name": "手机充电",
+      "nameEn": "",
+      "code": "DHj6sOL_zYMI9FineH6H9",
+      "customFacilityName": "腕表服务中心",
+      "customFacilityNameEn": "",
+      "abbreviation": "sjcd",
+      "filePath": "/convert/Files/b7494658-ad4c-41f5-894a-35f3f69f9f45/sjcd.png"
+    },
+    {
+      "name": "裁剪处",
+      "nameEn": "",
+      "code": "ruV4mByIZio3GJGZsLI00",
+      "customFacilityName": "改衣室",
+      "customFacilityNameEn": "",
+      "abbreviation": "cjc",
+      "filePath": "/convert/Files/4fa4d5f6-7c16-44a0-bf05-d256d1a15e0d/cjc.png"
+    },
+    {
+      "name": "VIP",
+      "nameEn": "",
+      "code": "FIxHV5LAux76IeXPUgfIX",
+      "customFacilityName": "会员服务中心",
+      "customFacilityNameEn": "",
+      "abbreviation": "vip",
+      "filePath": "/convert/Files/9bd282ae-5bc5-4ceb-83bf-b8745a7ef170/vip.png"
+    },
+    {
+      "name": "VIP",
+      "nameEn": "",
+      "code": "fF3AmgmfkTmAuGQlvTILj",
+      "customFacilityName": "会员服务中心",
+      "customFacilityNameEn": "",
+      "abbreviation": "vip",
+      "filePath": "/convert/Files/9bd282ae-5bc5-4ceb-83bf-b8745a7ef170/vip.png"
+    },
+    {
+      "name": "医保窗口",
+      "nameEn": "医保窗口",
+      "code": "Va6rgALQ3RRrTYb_zLloF",
+      "customFacilityName": "医务室",
+      "customFacilityNameEn": "",
+      "abbreviation": "ybck",
+      "filePath": "/convert/Files/eae1e601-fe13-4cc9-87c2-ac5ef518e353/医保窗口03x.png"
+    },
+    {
+      "name": "裁剪处",
+      "nameEn": "",
+      "code": "lmmFAZnYWC393qlysEdKZ",
+      "customFacilityName": "改衣室",
+      "customFacilityNameEn": "",
+      "abbreviation": "cjc",
+      "filePath": "/convert/Files/4fa4d5f6-7c16-44a0-bf05-d256d1a15e0d/cjc.png"
+    },
+    {
+      "name": "便民服务中心",
+      "nameEn": "便民服务中心",
+      "code": "AjGqv9q8eZE2oi9qoYyVj",
+      "customFacilityName": "会员服务台",
+      "customFacilityNameEn": "",
+      "abbreviation": "ykzx",
+      "filePath": "/convert/Files/8efbc3a5-5da5-4254-a1d0-a71e8fdc36bc/便民服务中心03x.png"
+    },
+    {
+      "name": "地铁",
+      "nameEn": "",
+      "code": "D1S0dHs4jwg9KQm14ecNK",
+      "customFacilityName": "",
+      "customFacilityNameEn": "",
+      "abbreviation": "dit",
+      "filePath": "/convert/Files/1d97cca7-0506-4244-802f-945061e8ee9e/dit.png"
+    },
+    {
+      "name": "上扶梯",
+      "nameEn": "",
+      "code": "uhWgxXEP2Sjun2EHMIl4J",
+      "customFacilityName": "无障碍电梯",
+      "customFacilityNameEn": "",
+      "abbreviation": "upft",
+      "filePath": "/convert/Files/1e6b78b0-12e9-468c-afea-a645b268838e/upft.png"
+    }
+  ]
+}

src/assets/images/brand/icon_format.svg

@@ -1,3 +1,3 @@
 <svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.00017 3.33398C9.74432 3.33398 10.4812 3.48056 11.1687 3.76533C11.8562 4.05011 12.4809 4.46751 13.0071 4.99371C13.5333 5.51991 13.9507 6.1446 14.2355 6.83211C14.5203 7.51962 14.6668 8.25649 14.6668 9.00065V14.6673H9.00017C7.49727 14.6673 6.05593 14.0703 4.99323 13.0076C3.93052 11.9449 3.3335 10.5035 3.3335 9.00065C3.3335 7.49776 3.93052 6.05642 4.99323 4.99371C6.05593 3.93101 7.49727 3.33398 9.00017 3.33398V3.33398ZM12.0002 12.0007V9.00065C12.0002 8.40731 11.8242 7.82729 11.4946 7.33394C11.1649 6.84059 10.6964 6.45608 10.1482 6.22901C9.60004 6.00195 8.99684 5.94254 8.41489 6.0583C7.83295 6.17405 7.2984 6.45977 6.87885 6.87933C6.45929 7.29889 6.17356 7.83344 6.05781 8.41538C5.94205 8.99732 6.00146 9.60052 6.22853 10.1487C6.45559 10.6969 6.84011 11.1654 7.33345 11.4951C7.8268 11.8247 8.40682 12.0007 9.00017 12.0007H12.0002ZM9.00017 17.334H14.6668V23.0007C14.6668 24.1214 14.3345 25.217 13.7118 26.1489C13.0892 27.0808 12.2042 27.8071 11.1687 28.236C10.1333 28.6649 8.99388 28.7771 7.89465 28.5584C6.79543 28.3398 5.78572 27.8001 4.99323 27.0076C4.20073 26.2151 3.66103 25.2054 3.44238 24.1062C3.22373 23.0069 3.33595 21.8676 3.76485 20.8321C4.19374 19.7967 4.92006 18.9117 5.85193 18.289C6.78381 17.6663 7.8794 17.334 9.00017 17.334V17.334ZM9.00017 20.0007C8.40682 20.0007 7.8268 20.1766 7.33345 20.5062C6.84011 20.8359 6.45559 21.3044 6.22853 21.8526C6.00146 22.4008 5.94205 23.004 6.05781 23.5859C6.17356 24.1679 6.45929 24.7024 6.87885 25.122C7.2984 25.5415 7.83295 25.8273 8.41489 25.943C8.99684 26.0588 9.60004 25.9994 10.1482 25.7723C10.6964 25.5452 11.1649 25.1607 11.4946 24.6674C11.8242 24.174 12.0002 23.594 12.0002 23.0007V20.0007H9.00017ZM23.0002 3.33398C24.5031 3.33398 25.9444 3.93101 27.0071 4.99371C28.0698 6.05642 28.6668 7.49776 28.6668 9.00065C28.6668 10.5035 28.0698 11.9449 27.0071 13.0076C25.9444 14.0703 24.5031 14.6673 23.0002 14.6673H17.3335V9.00065C17.3335 7.49776 17.9305 6.05642 18.9932 4.99371C20.0559 3.93101 21.4973 3.33398 23.0002 3.33398V3.33398ZM23.0002 12.0007C23.5935 12.0007 24.1735 11.8247 24.6669 11.4951C25.1602 11.1654 25.5447 10.6969 25.7718 10.1487C25.9989 9.60052 26.0583 8.99732 25.9425 8.41538C25.8268 7.83344 25.541 7.29889 25.1215 6.87933C24.7019 6.45977 24.1674 6.17405 23.5854 6.0583C23.0035 5.94254 22.4003 6.00195 21.8521 6.22901C21.3039 6.45608 20.8354 6.84059 20.5058 7.33394C20.1761 7.82729 20.0002 8.40731 20.0002 9.00065V12.0007H23.0002ZM17.3335 17.334H23.0002C24.1209 17.334 25.2165 17.6663 26.1484 18.289C27.0803 18.9117 27.8066 19.7967 28.2355 20.8321C28.6644 21.8676 28.7766 23.0069 28.5579 24.1062C28.3393 25.2054 27.7996 26.2151 27.0071 27.0076C26.2146 27.8001 25.2049 28.3398 24.1057 28.5584C23.0065 28.7771 21.8671 28.6649 20.8316 28.236C19.7962 27.8071 18.9112 27.0808 18.2885 26.1489C17.6658 25.217 17.3335 24.1214 17.3335 23.0007V17.334ZM20.0002 20.0007V23.0007C20.0002 23.594 20.1761 24.174 20.5058 24.6674C20.8354 25.1607 21.3039 25.5452 21.8521 25.7723C22.4003 25.9994 23.0035 26.0588 23.5854 25.943C24.1674 25.8273 24.7019 25.5415 25.1215 25.122C25.541 24.7024 25.8268 24.1679 25.9425 23.5859C26.0583 23.004 25.9989 22.4008 25.7718 21.8526C25.5447 21.3044 25.1602 20.8359 24.6669 20.5062C24.1735 20.1766 23.5935 20.0007 23.0002 20.0007H20.0002Z" fill="#E00068"/>
+<path d="M9.00017 3.33398C9.74432 3.33398 10.4812 3.48056 11.1687 3.76533C11.8562 4.05011 12.4809 4.46751 13.0071 4.99371C13.5333 5.51991 13.9507 6.1446 14.2355 6.83211C14.5203 7.51962 14.6668 8.25649 14.6668 9.00065V14.6673H9.00017C7.49727 14.6673 6.05593 14.0703 4.99323 13.0076C3.93052 11.9449 3.3335 10.5035 3.3335 9.00065C3.3335 7.49776 3.93052 6.05642 4.99323 4.99371C6.05593 3.93101 7.49727 3.33398 9.00017 3.33398V3.33398ZM12.0002 12.0007V9.00065C12.0002 8.40731 11.8242 7.82729 11.4946 7.33394C11.1649 6.84059 10.6964 6.45608 10.1482 6.22901C9.60004 6.00195 8.99684 5.94254 8.41489 6.0583C7.83295 6.17405 7.2984 6.45977 6.87885 6.87933C6.45929 7.29889 6.17356 7.83344 6.05781 8.41538C5.94205 8.99732 6.00146 9.60052 6.22853 10.1487C6.45559 10.6969 6.84011 11.1654 7.33345 11.4951C7.8268 11.8247 8.40682 12.0007 9.00017 12.0007H12.0002ZM9.00017 17.334H14.6668V23.0007C14.6668 24.1214 14.3345 25.217 13.7118 26.1489C13.0892 27.0808 12.2042 27.8071 11.1687 28.236C10.1333 28.6649 8.99388 28.7771 7.89465 28.5584C6.79543 28.3398 5.78572 27.8001 4.99323 27.0076C4.20073 26.2151 3.66103 25.2054 3.44238 24.1062C3.22373 23.0069 3.33595 21.8676 3.76485 20.8321C4.19374 19.7967 4.92006 18.9117 5.85193 18.289C6.78381 17.6663 7.8794 17.334 9.00017 17.334V17.334ZM9.00017 20.0007C8.40682 20.0007 7.8268 20.1766 7.33345 20.5062C6.84011 20.8359 6.45559 21.3044 6.22853 21.8526C6.00146 22.4008 5.94205 23.004 6.05781 23.5859C6.17356 24.1679 6.45929 24.7024 6.87885 25.122C7.2984 25.5415 7.83295 25.8273 8.41489 25.943C8.99684 26.0588 9.60004 25.9994 10.1482 25.7723C10.6964 25.5452 11.1649 25.1607 11.4946 24.6674C11.8242 24.174 12.0002 23.594 12.0002 23.0007V20.0007H9.00017ZM23.0002 3.33398C24.5031 3.33398 25.9444 3.93101 27.0071 4.99371C28.0698 6.05642 28.6668 7.49776 28.6668 9.00065C28.6668 10.5035 28.0698 11.9449 27.0071 13.0076C25.9444 14.0703 24.5031 14.6673 23.0002 14.6673H17.3335V9.00065C17.3335 7.49776 17.9305 6.05642 18.9932 4.99371C20.0559 3.93101 21.4973 3.33398 23.0002 3.33398V3.33398ZM23.0002 12.0007C23.5935 12.0007 24.1735 11.8247 24.6669 11.4951C25.1602 11.1654 25.5447 10.6969 25.7718 10.1487C25.9989 9.60052 26.0583 8.99732 25.9425 8.41538C25.8268 7.83344 25.541 7.29889 25.1215 6.87933C24.7019 6.45977 24.1674 6.17405 23.5854 6.0583C23.0035 5.94254 22.4003 6.00195 21.8521 6.22901C21.3039 6.45608 20.8354 6.84059 20.5058 7.33394C20.1761 7.82729 20.0002 8.40731 20.0002 9.00065V12.0007H23.0002ZM17.3335 17.334H23.0002C24.1209 17.334 25.2165 17.6663 26.1484 18.289C27.0803 18.9117 27.8066 19.7967 28.2355 20.8321C28.6644 21.8676 28.7766 23.0069 28.5579 24.1062C28.3393 25.2054 27.7996 26.2151 27.0071 27.0076C26.2146 27.8001 25.2049 28.3398 24.1057 28.5584C23.0065 28.7771 21.8671 28.6649 20.8316 28.236C19.7962 27.8071 18.9112 27.0808 18.2885 26.1489C17.6658 25.217 17.3335 24.1214 17.3335 23.0007V17.334ZM20.0002 20.0007V23.0007C20.0002 23.594 20.1761 24.174 20.5058 24.6674C20.8354 25.1607 21.3039 25.5452 21.8521 25.7723C22.4003 25.9994 23.0035 26.0588 23.5854 25.943C24.1674 25.8273 24.7019 25.5415 25.1215 25.122C25.541 24.7024 25.8268 24.1679 25.9425 23.5859C26.0583 23.004 25.9989 22.4008 25.7718 21.8526C25.5447 21.3044 25.1602 20.8359 24.6669 20.5062C24.1735 20.1766 23.5935 20.0007 23.0002 20.0007H20.0002Z" fill="#8E9090"/>
 </svg>

src/components/ActivityDetail/ActivityDetail.vue

@@ -402,10 +402,11 @@ function handleGo() {
     font-family: 'font_bold';
     text-align: center;
     color: rgb(0 0 0 / 80%);
-    background: var(--w-60, rgb(255 255 255 / 60%));
-    border: 2px solid var(--w-100, #fff);
+    background: rgb(255 255 255 / 60%);
+    border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     line-height: 72px;
     // margin: auto;
     img {

src/components/CarInfo/CarInfo.vue

@@ -105,6 +105,7 @@ function go() {
     border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     img {
       width: 48px;
       height: 48px;

src/components/CarSearch/CarSearch.vue

@@ -6,13 +6,13 @@
     </div>
     <div class="car-search-content">
       <div class="title">{{ $t('searchCar') }}</div>
-      <div class="point">已为您搜索到以下车位号，选择车位号进行导航</div>
+      <div class="point">{{ searchList.length ? '已为您搜索到以下车位号，选择车位号进行导航' : '未找到车位号，请您重新搜索' }}</div>
       <ScrollView v-if="searchList.length" :list="searchList" class="myScroll" scrollbar>
         <div class="list">
           <div v-for="item in searchList" :key="item" class="item" @click="search(item)">{{ item }}</div>
         </div>
       </ScrollView>
-      <img v-else class="empty" src="@/assets/images/stay_tuned.svg" alt="" />
+      <img v-else class="empty" src="@/assets/images/nodata.svg" alt="" />
     </div>
   </div>
 </template>
@@ -149,6 +149,7 @@ function search(shopNum: string) {
     border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     img {
       width: 48px;
       height: 48px;

src/components/Map/Map.vue

@@ -6,8 +6,8 @@
     <!-- 地图店铺弹框 -->
     <div id="shopInfo" class="boxShop boxShop2">
       <div id="shopNum">
-        <Marquees :content="shopName">
-          <div class="shop-name">{{ shopName }}</div>
+        <Marquees :content="shopName" class="shop-name">
+          <div>{{ shopName }}</div>
         </Marquees>
       </div>
       <div class="map-flex">
@@ -116,6 +116,9 @@ function handleDetail() {
     font-family: 'font_bold';
     color: #fff;
     font-weight: 700;
+    .shop-name {
+      width: 130px;
+    }
   }
   .go-button {
     width: 125px;
@@ -180,13 +183,15 @@ function handleDetail() {
   position: absolute;
   z-index: 500;
   width: 200px;
+  height: 110px;
   visibility: hidden;
   .circle {
     @include fl(center);
 
     position: absolute;
     bottom: 0;
-    left: 50%;
+    left: 45%;
+    z-index: -1;
     width: 20px;
     height: 20px;
     font-size: 10px;
@@ -264,6 +269,7 @@ function handleDetail() {
   }
 }
 .triangle {
+  margin-top: -2px;
   text-align: center;
   img {
     width: 12px;

src/components/PictureText/PictureText.vue

@@ -23,7 +23,7 @@
       <div v-if="qrList.length && qrList[0].content?.name" class="qr-container">
         <div class="item">
           <img :src="qrList[0].content.file_code[0]" alt="" />
-          <div class="name">{{ switchLanguage(qrList[0].content, 'name') }}</div>
+          <div class="names">{{ switchLanguage(qrList[0].content, 'name') }}</div>
         </div>
       </div>
     </div>
@@ -37,6 +37,7 @@ import { Swiper, SwiperSlide } from 'swiper/vue'
 import { Autoplay } from 'swiper'
 import 'swiper/css'
 import ScrollView from '@/base/ScrollView/ScrollView.vue'
+
 const { switchLanguage } = useSwitchLanguage()
 interface Props {
   acList: PicText[]
@@ -121,7 +122,7 @@ defineProps<Props>()
       overflow: hidden;
       width: 708px;
       .item {
-        width: 80px;
+        max-width: 180px;
         height: 102px;
         margin-right: 24px;
         text-align: center;
@@ -130,8 +131,10 @@ defineProps<Props>()
           height: 80px;
           margin-bottom: 8px;
         }
-        .name {
-          width: 72px;
+        .names {
+          @include no-wrap;
+
+          max-width: 180px;
           padding-right: 0;
           font-size: 12px;
           font-family: 'font_regular';
@@ -139,8 +142,6 @@ defineProps<Props>()
           font-style: normal;
           font-weight: 400;
           line-height: 14px;
-
-          @include no-wrap();
         }
       }
     }

src/components/PublicComponent/PublicComponent.vue

@@ -79,6 +79,12 @@ watch(route, to => {
     window?.Map_QM?.startRender()
     if (to.fullPath === '/') {
       window?.Map_QM?.showFloor(6)
+      const art: any = document.getElementById('mapContainer')
+      art.style.width = '2244px'
+      art.style.height = '1352px'
+      art.style.right = '690px'
+      art.style.top = '304px'
+      window.Map_QM.changeWindowResize(2244, 1352)
     }
   } else {
     window?.Map_QM?.cancelRender()

src/components/Recommend/Recommend.vue

@@ -41,7 +41,7 @@ import { getColumnList } from '@/http/api/base'
 import Brand from '@/utils/Class/Brand'
 import ScrollView from '@/base/ScrollView/ScrollView.vue'
 const store = useRootStore()
-const { columnList, showColumnList, shopMap } = toRefs(store)
+const { columnList, showColumnList, shopMap, shop } = toRefs(store)
 const router = useRouter()
 const { switchLanguage } = useSwitchLanguage()
 
@@ -50,6 +50,9 @@ function close() {
 }
 function clickShop(item: FeaturedList) {
   if (item.content.shopCode) {
+    if (shop.value) {
+      store.SET_PREV_SHOP(shop.value)
+    }
     store.SET_SHOP(shopMap.value[item.content.shopCode])
     store.SET_SHOW_DETAIL(true)
   } else if (item.content.point) {
@@ -109,6 +112,7 @@ getColumnList().then(({ data }) => {
     border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     img {
       width: 48px;
       height: 48px;

src/components/SearchResultListItem/SearchResultListItem.vue

@@ -55,7 +55,7 @@ const emits = defineEmits(['click'])
   }
   .bottom {
     display: flex;
-    justify-content: space-between;
+    justify-content: flex-start;
     align-items: center;
     width: 100%;
     height: 28px;
@@ -64,7 +64,9 @@ const emits = defineEmits(['click'])
     font-family: 'font_bold';
     line-height: 28px;
     .name {
-      max-width: 460px;
+      // max-width: 460px;
+      width: 460px;
+      padding-right: 20px;
       font-size: 24px;
       color: #8e9090;
 

src/components/ShopDetail/ShopDetail.vue

@@ -395,7 +395,7 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
     border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
-    // margin: auto;
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     img {
       width: 48px;
     }

src/composables/useInitMap.ts

@@ -28,10 +28,11 @@ export const useInitMap = async function () {
           })
         })
         store.SET_MAP_PARK_LIST(arr)
+        window.Map_QM.showFloor(6)
       },
       {
         build: device.value?.buildingOrder ?? 0,
-        floor: 6,
+        floor: device.value.floorOrder,
         navPoint: device.value.location,
         angle: device.value.angle,
         iconUrl: delPrefixOfFacilityList,
@@ -78,8 +79,9 @@ function onClickArt(event: any) {
       shopNameEn: event.data.artData.content.nameEn,
       floorOrder: floors[0].floorOrder,
       floor: floors[0].floor,
-      logoUrl: '',
-      yaxis: Number(poi[2])
+      logoUrl: event.data.artData.content.icon[0],
+      yaxis: Number(poi[2]),
+      doorMaterialList: event.data.artData.content.file_code
     }
     store.SET_CURRENT_ART_NAME(event.data.artData.content.name)
     store.SET_SHOP(shop)

src/store/root/actions.ts

@@ -27,6 +27,7 @@ export interface Actions {
   SET_MAP_PARK_LIST(list: string[]): void
   SET_SPECIAL_LIST(list: SpecialIndustry[]): void
   SET_CURRENT_ART_NAME(name: string): void
+  SET_PREV_SHOP(shop: Shop): void
 }
 
 export type GenActions = CreateActions<Root, State, Actions>
@@ -100,5 +101,8 @@ export const actions: GenActions = {
   },
   SET_CURRENT_ART_NAME(name) {
     this.currentArtName = name
+  },
+  SET_PREV_SHOP(shop) {
+    this.prevShop = shop
   }
 }

src/store/root/state.ts

@@ -23,6 +23,7 @@ export interface State {
   mapParkList: string[] // 停车位列表
   specialIndustryList: SpecialIndustry[] // 特殊业态列表
   currentArtName: string // 当前选中艺术装置
+  prevShop: Shop //
 }
 
 export const state = (): State => ({
@@ -47,5 +48,6 @@ export const state = (): State => ({
   artPlaceList: [],
   mapParkList: [],
   specialIndustryList: [],
-  currentArtName: ''
+  currentArtName: '',
+  prevShop: {} as Shop
 })

src/views/Activity/ActivityItem.vue

@@ -111,7 +111,7 @@ onMounted(() => {
     position: relative;
     width: inherit;
     height: 495px;
-    background: #ebebeb;
+    background: #ebebeb00;
 
     img {
       width: inherit;

src/views/Art/ArtItem.vue

@@ -116,6 +116,7 @@ function go(item: ArtPlace) {
         width: 274px;
         font-size: 12px;
         font-family: 'font_regular';
+        white-space: pre-wrap;
         color: #8e9090;
         font-style: normal;
         font-weight: 400;

src/views/Brand/recommendShop.vue

@@ -43,7 +43,7 @@
       >
         <swiper-slide v-for="(item, index) in recList" :key="index">
           <div :key="item.shopCode" class="item" :shopInfo="item" @click="handleShop(item)">
-            <img v-if="item?.doorMaterialList?.at(0)" :src="item?.doorMaterialList?.at(0)" class="rec-img" alt="" />
+            <img v-if="item?.logoUrl" :src="item?.logoUrl" class="rec-img" alt="" />
             <img v-else :src="require('@/assets/images/brand/no-rec.svg')" class="rec-img no-rec" alt="" />
             <p class="bottom-title">
               <!-- <img class="rec-logo" :src="item.logoUrl ? item.logoUrl : require('@/assets/images/empty_small.svg')" alt="" /> -->

src/views/Brand/shopList.vue

@@ -150,20 +150,20 @@ const toggleFormatAndFloors = ref<0 | 1 | 2>(0)
 
 const list = [
   {
-    name: '区域筛选',
+    name: '区域搜索',
     en: 'AREA',
     icon: require('../../assets/images/brand/icon_area.svg'),
     iconSel: require('../../assets/images/brand/icon_area_sel.svg')
   },
   {
-    name: '楼层筛选',
+    name: '楼层搜索',
     en: 'FLOOR',
     icon: require('../../assets/images/brand/icon_floor.svg'),
     iconSel: require('../../assets/images/brand/icon_floor_sel.svg')
   },
   {
-    name: '业态筛选',
-    en: 'FORMAT',
+    name: '业态搜索',
+    en: 'CLASSIFICATION',
     icon: require('../../assets/images/brand/icon_format.svg'),
     iconSel: require('../../assets/images/brand/icon_format_sel.svg')
   }
@@ -485,6 +485,8 @@ function myScrollEnd() {
       height: auto;
     }
     .shop-items {
+      width: 1388px;
+
       .shop-div {
         margin-bottom: 40px;
         .shop-floor {

src/views/Guide/FloorPicList.vue

@@ -5,6 +5,7 @@
       :key="item.id"
       class="floor animate__animated animate__fadeIn"
       :style="{ animationDelay: index / 5 + 's' }"
+      @click="changeFloor(item.content.floorOrder)"
     >
       <img :src="item.content.file_code[0]" alt="" />
     </div>
@@ -18,6 +19,11 @@ import { getFloorPicList } from '@/http/api/base'
 const store = useRootStore()
 const { currentBuildingFloorsList } = toRefs(store)
 
+const emit = defineEmits(['changeFloor'])
+function changeFloor(floorOrder: string) {
+  emit('changeFloor', Number(floorOrder))
+}
+
 // 获取楼层缩略图信息
 const picList = ref<FloorPic[]>([])
 getFloorPicList().then(({ data }) => {

src/views/Guide/Guide.vue

@@ -83,7 +83,7 @@
     <ArtList v-if="floorIdx === 6" />
 
     <!-- 楼层缩略图 -->
-    <FloorPicList v-if="floorIdx === 6" />
+    <FloorPicList v-if="floorIdx === 6" @change-floor="changeFloors" />
   </div>
 </template>
 

src/views/Member/MemberItem.vue

@@ -110,7 +110,7 @@ onMounted(() => {
     position: relative;
     width: inherit;
     height: 495px;
-    background: #ebebeb;
+    background: #ebebeb00;
 
     img {
       width: inherit;

src/views/Nav/Nav.vue

@@ -214,6 +214,9 @@ if (showSearch.value) {
 
 watch(shop, newVal => {
   startNavi({ ...newVal })
+  if (showColumnList.value) {
+    showColumnList.value = false
+  }
 })
 
 onUnmounted(() => {

src/views/Search/Search.vue

@@ -241,6 +241,9 @@ function handleActivity(item: Activity) {
 
 //点击店铺
 function handleSearchShop(val: Shop) {
+  if (shop.value) {
+    store.SET_PREV_SHOP(shop.value)
+  }
   store.SET_SHOP(val)
   store.SET_SHOW_DETAIL(true)
   useStatistics({ tag: 'brandSearch', shopCode: val.shopCode })
@@ -267,6 +270,9 @@ function handleHotSearch(item: Shop) {
   if (!val) {
     return
   }
+  if (shop.value) {
+    store.SET_PREV_SHOP(shop.value)
+  }
   store.SET_SHOP(val)
   store.SET_SHOW_DETAIL(true)
   // router.push('/search/detail')
@@ -364,6 +370,7 @@ function handleHotSearch(item: Shop) {
     border: 2px solid #fff;
     border-radius: 50px;
     backdrop-filter: blur(20px);
+    box-shadow: 0 20px 30px 0 rgb(0 0 0 / 10%);
     // margin: auto;
     img {
       width: 48px;