fix: 修改详情布局

.drone.yml

@@ -68,7 +68,7 @@ steps:
       - mv $zip_name ../
 
       # svn目录定义 开头和结尾不能有/，且不能出现中文乱码，复制地址时建议只复制02项目定制后的目录，会影响到变量取值
-      - svndir="2022研发/Prd007_智能导视/02项目定制/BJ006北京京西大悦城/导视前端"
+      - svndir="2022研发/Prd007_智能导视/02项目定制/SY001沈阳K11/导视前端"
       # - svn_reponame=${svndir%%/*}
       # - svn_path=${svndir##*/}
       # - echo 仓库内部子路径取值 $svn_path
@@ -104,7 +104,7 @@ steps:
     image: lddsb/drone-dingtalk-message
     failure: ignore
     settings:
-      token: 'your dingTalk robot token'
+      token: '060f61d3f5a0e9bd6645e4cac8a861d29e7dfdf7f2f56369cc43eeb1a66c9fe3'
       type: markdown
       message_color: true
       message_pic: true

.tpl

@@ -1,9 +1,13 @@
 <font color=[TPL_STATUS_COLOR] size="3">
-  项目svn地址：http://svn.1000my.com/svn/2022研发/Prd007_智能导视/02项目定制/
+  项目svn地址：http://svn.1000my.com/svn/2022研发/Prd007_智能导视/02项目定制/SY001沈阳K11/导视前端
 </font>
 
 <font color=[TPL_STATUS_COLOR] size="3">
-  项目git地址：https://git.1000my.com/
+  项目git地址：https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts
+</font>
+
+<font color=[TPL_STATUS_COLOR] size="3">
+  更新内容：[TPL_COMMIT_MSG]
 </font>
 
 ![image]([TPL_STATUS_PIC])

CHANGELOG.md

@@ -0,0 +1,85 @@
+# Changelog
+
+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.1 (2023-05-10)
+
+
+### Features
+
+* 🚀 服务 ([3ef0b9a](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/3ef0b9afabeb5c68f0142a3f28cc164be6d6765f))
+* 🚀 会员、活动、学院接口 ([4ef2dee](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/4ef2dee4b3727e192984e37c58c512a7eefab035))
+* 🚀 会员、文化学院、活动 ([d7ab9e0](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d7ab9e082152530a2fcec80a9cc17ff65a686aa5))
+* 🚀 活动、服务 ([6cd5df3](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/6cd5df306399318be17ae27e33761716520a9ab5))
+* 🚀 轮播组件 ([91f2b8f](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/91f2b8ffa696d786874b7893c3fa15c4e7d379a5))
+* 🚀 模块统计 ([7abf0c3](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/7abf0c380854c2520ce8258fb029abd57c1e34d9))
+* 🚀 品牌分页 ([8943646](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/8943646670e67d25908a2cdbcc4676471c627558))
+* 🚀 首页 ([6bfff43](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/6bfff43f3800127f091b1a2a3d3aa371cd807c76))
+* 🚀 搜索功能 ([9c5aa9d](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9c5aa9d08a71e42a31f3d24597761fb45bba6d20))
+* 🚀 添加车牌 车位导航增加周边交通组件 ([1e69bc4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/1e69bc4dbdeb91f6bfa54d0a7520e177ddab8289))
+* 🚀 添加多语言文案 ([b92ef73](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/b92ef73d642f49a2f9db660c9861d5ce67b93f17))
+* 🚀 添加分页hooks以及分页逻辑放在worker线程处理 ([d275da4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d275da4dd108d253beef00869ef3308bf446e72f))
+* 🚀 添加退出判断 ([b53b841](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/b53b84139ae470580c8c83c98b310e39e3bd9859))
+* 🚀 添加影院模块的ts声明文件 ([9c8fc16](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9c8fc1691ce6daf449096b49283cfc369582612a))
+* 🚀 停车优化 ([6626fab](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/6626fab9044ecd418595765a272bdd56724dcbf7))
+* 🚀 统计功能 ([e12bc78](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/e12bc78fe423afc7cd1025fa57236c9c11a355a9))
+* 🚀 头部开发 ([fe1fe33](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/fe1fe33b627a929c39aa45d5004bb8c08ceb5d45))
+* 🚀 新增地图导览筛选店铺/停车模块hook ([6c52626](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/6c52626bb1673425bd5ad320802865d815ce19b2))
+* 🚀 新增模块接口 ([1268733](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/12687332b674bc64ee1d2ff4bae0144ef768ca65))
+* 🚀 新增切片插件 ([c4c535a](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/c4c535a0e83e5b7ee517bdcfa2256a1a9f6443b5))
+* 🚀 周边交通 ([34230cc](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/34230cc941a541f58d04ad00da2597bc06abcac9))
+* 🚀 周边交通界面 ([9f81f15](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9f81f15d18a4d0771f6dbf216866dea8287cbe42))
+* 🚀 first push ([ea3f285](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/ea3f2856f8d95cc4c133ef7c568bb6a69a2c53cb))
+* 🚀 init ([24e101c](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/24e101c4fb1ec731b139d75012d2ffef380d8991))
+* 导航页面做了普通导航的界面，艺术点位的导航未做完 ([d695b37](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d695b3799a6640f8fb7adc3ff818cdb4eae68315))
+* 翻译文案 ([72734ad](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/72734ad001d563c48af32dfab9e0898ae88eabe5))
+* 翻译文案 ([a4bd2ad](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a4bd2ada51defaae8740e06d5f3f216f899862fc))
+* 翻译文案 ([14f50ed](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/14f50ed3280229ea06968e4296e079cd828f5bc9))
+* 删除切换语言hooks 添加关键注释 ([a6a8872](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a6a88723999adbf4ce9942bf9b76196179e0ccb9))
+* 删除切换语言hooks 添加关键注释 ([dcc66ff](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/dcc66ff4ff756472d86ecee4785348a7292cfb2c))
+* 删除切换语言hooks 添加关键注释 ([afa5183](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/afa51835dd42177c46d8d5c0c4481deca70848ce))
+* 添加滚动条组件 ([8e363e6](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/8e363e6b08308db6e96901efda462b02bb39b8b4))
+* 添加滚动条组件 ([e899a0e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/e899a0e6d7816f40cb2ca53d863cff44ace4dd22))
+* 添加滚动条组件 ([a403c62](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a403c62290533cdb3b2f6a327fede9f0e5e6767f))
+* 添加基础英文文案和繁体文案 ([d28b9cf](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d28b9cff4e85abdf127d804ddaa9abceffd46094))
+* 添加路由跳转组件 全局window声明文件 ([8b60aa6](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/8b60aa6fb309b1f28940b1d181980f0398efffcc))
+* 添加路由跳转组件 全局window声明文件 ([690c43a](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/690c43ab5f3ec557477bb9a0716e6770b245d6b6))
+* 添加路由跳转组件 全局window声明文件 ([f59e00f](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/f59e00f9adfc9e72ca9c962604be2a1b10d077b3))
+* 添加vscode文件 ([b196e97](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/b196e970f9c2984ace0b140420e97d1525c1bb6c))
+* 添加vscode文件 ([668b0de](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/668b0dee345beee33333bc058b025d5b25791d5e))
+* 添加vscode文件 ([9c4b7aa](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9c4b7aa7d248d1a717e952e58b625086807ebc45))
+* 增加品牌模块 ([3b4fb38](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/3b4fb38b38a32f421fb973e3779c777002710588))
+* 增加艺术点位 ([55617bf](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/55617bf3f15c60618575aebfa4ce846240227e97))
+* init ([64d70e9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/64d70e9a505ae2c4839df5b7aaef1c2f3ecc5386))
+
+
+### Bug Fixes
+
+* 🧩 车位号优化 ([2e4c8dc](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/2e4c8dc23c43ca97bbc475fda94b5d3ef1fd2189))
+* 🧩 服务优化 ([79d6a98](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/79d6a9843e38edf0b0ceb508565ca2fb1fd3f735))
+* 🧩 服务中英繁优化 ([ce161a1](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/ce161a189c7ba191b3ac3e927545562f722733fe))
+* 🧩 删除警告代码 ([2b44e8e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/2b44e8e06d0ace86cae616d92c55ac3aa34b7aed))
+* 🧩 删除警告代码 ([50bc367](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/50bc367a57f9b6c1e496251ee1d9163dc8e693ab))
+* 🧩 首页优化 ([f9ed612](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/f9ed612dd9b533d077806579bb9830c5c1b9d324))
+* 🧩 搜索结果优化 ([142dfd9](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/142dfd9a33898c6c63f1ea3d78b70ec2afd63f8a))
+* 🧩 搜索优化 ([d17e822](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d17e822b40f30071a4853d13e68c61908e417745))
+* 🧩 搜索优化 ([a977604](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a9776044c75d821a420445e5e784583230c64327))
+* 🧩 停车和周边交通接口 ([7f96d1e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/7f96d1e539acb45d459842d106b4c070edfbd514))
+* 🧩 停车输入框优化 ([701be2a](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/701be2af282890c3ef9f7d8e02a434b9d35a1af7))
+* 🧩 停车优化 ([51935a2](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/51935a2844385503ce5314292db4754576657411))
+* 🧩 修改菜单层级 ([4a31511](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/4a31511bcc0d8d558b8c14b093b1b091c0b0fa7c))
+* 🧩 修改艺术点位 ([f853688](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/f853688ce0e1162e037a0b521fbf0cc9690cdb13))
+* 🧩 修改ci文档 ([a06f291](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/a06f291b225e6bd754fea9ae45511857aa7b5d94))
+* 🧩 优化模块 ([9296ccb](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9296ccbf363c013c563bda9bd2f76deac448b0f1))
+* 🧩 优化字体 ([d8915ee](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/d8915eef1d0e4a84140cba3f1de99f019f5faf01))
+* 🧩 周边交通优化 ([ffa8303](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/ffa830313061848cf5867ef3ec93f0a62e0272b6))
+* 🧩 ui优化 ([c1a6b21](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/c1a6b21f09c0bb021f8e8f682b7ebc5d3e558638))
+* 解决冲突 ([b9f97ad](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/b9f97ad5d1757ebfa0455b3e34a0e936503c8ca9))
+* 离线数据更新 ([bce999f](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/bce999f29fe58efbe5aa8bb797a57411c25050ae))
+* 品牌页面和导航页面做了部分 ([61f464c](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/61f464ca7227a532cf2b41642fa9dafef30b3008))
+* 手动合并 ([e16ab27](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/e16ab27be389c6af0fa1ea39b14efa022d64314b))
+* 手动合并test ([cb35c3e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/cb35c3e4d0181aa0047d8e8e6d5ef32f61bc9b6a))
+* 文件冲突 ([623b153](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/623b153c105e5c4ea6ecbdc47271d6bd4e63d76e))
+* 修改导航页面 ([e717a96](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/e717a967f2071ea808fdc8b4814ab79704e845c3))
+* 增加离线数据 ([9b11a5e](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/9b11a5e27219f3264b2ec0845c892c92ac177b9c))
+* 增加艺术的接口 ([f55e638](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/f55e6384824129a14ad99268d4798714d2cca364))

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "0.1.0",
+  "version": "1.0.0-B.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "0.1.0",
+      "version": "1.0.0-B.1",
       "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": "0.1.0",
+  "version": "1.0.0-B.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/static/offline/JSON/GetDevCoordinateByIP.json

@@ -1 +1 @@
-{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":3,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}}
+{"code":200,"msg":"success","data":{"machineCode":"fOjdaZJ0kCfJ2WCgszOKr","machineName":"12132","machineTypeName":"信发","label":"windows","screenAttribute":"1920*1080横屏","building":"主楼","buildingCode":"h-8eWvLqbPZP5cuWHY-vA","buildingOrder":0,"floor":"L1","floorCode":"p6U4SCkoJf9Xq5gBGpa3L","floorOrder":3,"ip":"192.168.1.209","mac":"4CEDFBCAFF27","location":"0","angle":"0","projectCode":"project-n-ww5jvpwnu0ads70lbkda"}}

public/static/qm/MainMap_QM.js

@@ -1628,7 +1628,7 @@ MainMap_QM.prototype = {
 		this.initGuide();
 		this.controls.target.set(this.util.guiOptions.targatX, this.util.guiOptions.targatY, this.util.guiOptions.targatZ);
 		let pathData = this.util.allMap[parseInt(this.util.deviceObj.build)].buildArr[parseInt(this.util.deviceObj.floor)].mapData.path;
-		pathData.nodes.sort(this.util.sortNode);
+		pathData && pathData.nodes.sort(this.util.sortNode);
 		if (parseInt(this.util.deviceObj.node) != -1) {
 			if (pathData && pathData.nodes.length > parseInt(this.util.deviceObj.node)) {
 				this.util.deviceObj.xaxis = pathData.nodes[parseInt(this.util.deviceObj.node)].x;

public/static/worker/page.worker.js

@@ -1,5 +1,5 @@
 let pageIndex = 1 //数组中需要分页(即下标为pageIdx的数据)的当前页 大数组中的二维
-const pageSize = 20 //一页显示的条数
+const pageSize = 15 //一页显示的条数
 let pageList = [] //用于UI渲染的列表
 let showMore = false
 let pageIdx = 0 //当前是数组中的哪一项需要分页 大数组中的一维

src/components/CarInfo/CarInfo.vue

@@ -113,7 +113,7 @@ function go() {
     display: flex;
     align-items: center;
     padding: 48px 56px;
-    background: #fff;
+    background: #efeeea;
   }
   .car-group {
     display: flex;
@@ -143,8 +143,8 @@ function go() {
     height: 100px;
     font-size: 36px;
     text-align: center;
-    color: #fff;
-    background: #d4a866;
+    color: #faeba9;
+    background: linear-gradient(159.19deg, #c4b280 13.77%, #a89866 96.7%);
     border-radius: 0 0 16px 16px;
     font-weight: 700;
     line-height: 44px;

src/components/PlateInput/PlateInput.vue

@@ -80,7 +80,7 @@ $input-bg: #fff;
 $input-radius: 12px;
 $font-size: 32px;
 $font-energy-size: 14px;
-$btn-bg: #d4a866;
+$btn-bg: #a6976f;
 $btn-color: #fff;
 $btn-font-size: 28px;
 $btn-width: 218px;
@@ -129,7 +129,7 @@ $btn-width: 218px;
       margin-right: 42px;
     }
     &.active {
-      border: 2px solid #d4a866;
+      border: 2px solid #a6976f;
     }
     &.space {
       width: 75px;

src/components/PlateKeyboard/PlateKeyboard.vue

@@ -126,7 +126,7 @@ onBeforeUnmount(() => {
     }
     &.active {
       color: #fff;
-      background: #d4a866;
+      background: #a6976f;
     }
   }
 }

src/components/ShopItem/ShopItem.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-defineProps<{ shop: Shop }>()
+defineProps<{ shop: any }>()
 </script>
 
 <style scoped lang="scss">

src/components/Traffic/Traffic.vue

@@ -42,7 +42,7 @@
         </div>
         <div class="jiu_2">
           <svg width="681" height="145" viewBox="0 0 681 145" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M672.5 0.5L680.5 1L18.5 144.5L0 141L672.5 0.5Z" :fill="roadList[1].color" />
+            <path d="M672.5 0.5L680.5 1L18.5 144.5L0 141L672.5 0.5Z" :fill="roadList[3].color" />
           </svg>
         </div>
         <div class="jiu_bg">
@@ -79,44 +79,44 @@
         <div class="info-container">
           <div class="item">
             <div class="name">博览路：</div>
-            <div class="road" style="margin-right: 24px">
+            <div class="road" style="margin-right: 20px">
               <div class="w" :style="'background:' + roadList[4].color"></div>
               <div class="type">{{ switchLanguage(roadList[4], 'status') }}</div>
             </div>
-            <div class="road">
+            <div class="road" style="margin-right: 0">
               <div class="w" :style="'background:' + roadList[5].color"></div>
               <div class="type">{{ switchLanguage(roadList[5], 'status') }}</div>
             </div>
           </div>
           <div class="item">
             <div class="name">九龙街：</div>
-            <div class="road" style="margin-right: 24px">
+            <div class="road" style="margin-right: 20px">
               <div class="w" :style="'background:' + roadList[2].color"></div>
               <div class="type">{{ switchLanguage(roadList[2], 'status') }}</div>
             </div>
-            <div class="road">
+            <div class="road" style="margin-right: 0">
               <div class="w" :style="'background:' + roadList[3].color"></div>
               <div class="type">{{ switchLanguage(roadList[3], 'status') }}</div>
             </div>
           </div>
           <div class="item">
             <div class="name">沈水路：</div>
-            <div class="road" style="margin-right: 24px">
+            <div class="road" style="margin-right: 20px">
               <div class="w" :style="'background:' + roadList[0].color"></div>
               <div class="type">{{ switchLanguage(roadList[0], 'status') }}</div>
             </div>
-            <div class="road">
+            <div class="road" style="margin-right: 0">
               <div class="w" :style="'background:' + roadList[1].color"></div>
               <div class="type">{{ switchLanguage(roadList[1], 'status') }}</div>
             </div>
           </div>
           <div class="item">
             <div class="name">青年大桥：</div>
-            <div class="road" style="margin-right: 24px">
+            <div class="road" style="margin-right: 20px">
               <div class="w" :style="'background:' + roadList[6].color"></div>
               <div class="type">{{ switchLanguage(roadList[6], 'status') }}</div>
             </div>
-            <div class="road">
+            <div class="road" style="margin-right: 0">
               <div class="w" :style="'background:' + roadList[7].color"></div>
               <div class="type">{{ switchLanguage(roadList[7], 'status') }}</div>
             </div>
@@ -444,7 +444,7 @@ function changeStatus(status: string, item: any) {
         margin-bottom: 48px;
         .name {
           width: 100px;
-          margin-right: 40px;
+          margin-right: 20px;
           font-size: 20px;
           font-family: 'font_bold';
           color: #736661;

src/composables/useFindCar.ts

@@ -1,9 +1,9 @@
 import { ref } from 'vue'
 import { getFindCar } from '@/http/api/parking'
-import { HTTP_CODE } from '@/enums'
 import { isLicensePlate } from '@/utils/utils'
 import { useRootStore } from '@/store/root'
 import { useRouter } from 'vue-router'
+import { HTTP_CODE } from '@/enums'
 import Message from '@/base/Message/Message'
 
 export const useFindCar = () => {
@@ -25,11 +25,13 @@ export const useFindCar = () => {
         loading.value = true
         const { code, msg, data } = await getFindCar(plate)
         if (code === HTTP_CODE.ERR_OK) {
-          result.value = { ...data, carCode: plate, parkingTime: toHoursAndMinutes(Number(data.parkingTime)) }
-          showCarDetail.value = true
-        } else {
-          Message({ text: msg, type: 'success' })
+          if (data) {
+            result.value = { ...data, carCode: plate, parkingTime: toHoursAndMinutes(Number(data.parkingTime)) }
+            showCarDetail.value = true
+          }
+          return
         }
+        Message({ text: msg, type: 'success' })
       } catch (error) {
         Message({ text: error as string, type: 'success' })
       } finally {

src/composables/usePage.ts

@@ -1,4 +1,4 @@
-import { ref, shallowRef, watch, toRaw, nextTick, onBeforeUnmount, type ShallowRef } from 'vue'
+import { Ref, ref, shallowRef, watch, toRaw, nextTick, onBeforeUnmount, type ShallowRef } from 'vue'
 
 /**
  * @param {array} totalList 分页数据源
@@ -6,7 +6,7 @@ import { ref, shallowRef, watch, toRaw, nextTick, onBeforeUnmount, type ShallowR
  * @return {*} { scrollEnd, pageList, loaded }
  */
 type PageList = { name: string; shopList: Shop[] }
-export const usePage = (totalList: PageList[], scroll: ShallowRef<any>) => {
+export const usePage = (totalList: Ref<PageList[]>, scroll: ShallowRef<any>) => {
   if (typeof Worker === 'undefined') {
     alert('抱歉,当前运行环境不支持Web Worker API, 请升级浏览器版本')
   }

src/http/api/parking/index.ts

@@ -1,9 +1,9 @@
 import { request } from '../../http'
 // 找车
-export const getFindCar = (plateId: string) => request<CarInfo>({ url: `/v1/web/thirdPark`, data: { plateId }, method: 'post' })
+export const getFindCar = (plateId: string) => request<CarInfo>({ url: `/guide/v1/web/thirdPark`, params: { plateId }, method: 'get' })
 
 // 周边交通
 export const getThirdTraffic = (projectCode: string) =>
-  request<Traffic[]>({ url: `/v1/web/thirdTraffic`, params: { projectCode }, method: 'get' })
+  request<Traffic[]>({ url: `/guide/v1/web/thirdTraffic`, params: { projectCode }, method: 'get' })
 
 export const getParkingInfo = () => request<ParkingInfo>({ url: `/JSON/getParkingInfo.json` })

src/views/Brand/Brand.vue

@@ -31,9 +31,17 @@
       </li>
     </ul>
     <!-- 店铺 -->
-    <scroll-view ref="shopScroll" :scrollbar="true" class="shop-scroll" :list="copyShopList" :pull-up="false">
+    <scroll-view
+      ref="shopScroll"
+      :scrollbar="true"
+      class="shop-scroll"
+      :list="pageList[0]?.shopList"
+      pull-up
+      :scroll-top="false"
+      @scroll-end="myScrollEnd"
+    >
       <ul class="shop-group">
-        <shopItem v-for="shop in copyShopList" :key="shop.shopCode" :shop="shop" @click="clickShop(shop)" />
+        <shopItem v-for="shop in pageList[0]?.shopList" :key="shop.shopCode" :shop="shop" @click="clickShop(shop)" />
       </ul>
     </scroll-view>
   </div>
@@ -45,6 +53,7 @@ import typeBtnGroup from '@/components/TypeBtnList/TypeBtnList.vue'
 import scrollView from '@/base/ScrollView/ScrollView.vue'
 import { getBrandInfo } from '@/http/api/brand/index'
 import { ref, computed, shallowRef } from 'vue'
+import { usePage } from '@/composables/usePage'
 
 import { storeToRefs } from 'pinia'
 import { useRootStore } from '@/store/root'
@@ -69,11 +78,12 @@ const formatZMList = computed(() => {
 const formatList = ref<Industry[]>([])
 const zmList = ref<Industry[]>([])
 const letters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-
 const floorIdx = ref(-1)
 const floorList = ref<FloorItem[]>([])
 
-const copyShopList = shallowRef<Shop[]>([])
+const copyShopList = shallowRef<any>([])
+const myscroll = shallowRef(null)
+const { scrollEnd, pageList } = usePage(copyShopList, myscroll)
 
 const typeBtnList = [
   {
@@ -140,7 +150,7 @@ getBrandInfo().then(({ data }) => {
 function changeType(item: any) {
   currentTypeId.value = item.order
   formatIdx.value = 0
-  copyShopList.value = [...shopList.value]
+  copyShopList.value = [{ name: '1', shopList: [...shopList.value] }]
 }
 function resetIdx() {
   formatIdx.value = 0
@@ -151,31 +161,36 @@ function handleClickFloor(item: FloorItem, index: number) {
   resetIdx()
   floorIdx.value = index
   if (index === 0) {
-    copyShopList.value = [...shopList.value]
+    copyShopList.value = [{ name: '1', shopList: [...shopList.value] }]
     return
   }
-  copyShopList.value = shopList.value.filter(shop => shop.floor === item.floor)
+  copyShopList.value = [{ name: '1', shopList: shopList.value.filter(shop => shop.floor === item.floor) }]
 }
 //点击业态和字母
 function handleClickFormat(item: Industry, index: number) {
   resetIdx()
   formatIdx.value = index
   if (index === 0) {
-    copyShopList.value = [...shopList.value]
+    copyShopList.value = [{ name: '1', shopList: [...shopList.value] }]
     return
   }
   if (currentTypeId.value === 0) {
-    copyShopList.value = shopList.value.filter(shop => shop.industryFatherCode === item.industryCode)
+    copyShopList.value = [{ name: '1', shopList: shopList.value.filter(shop => shop.industryFatherCode === item.industryCode) }]
     useStatistics({ tag: 'industry', industryCode: item.industryCode })
   } else {
-    copyShopList.value = shopList.value.filter(shop => shop.initials?.charAt(0) === item.industryName)
+    copyShopList.value = [{ name: '1', shopList: shopList.value.filter(shop => shop.initials?.charAt(0) === item.industryName) }]
   }
 }
 //点击品牌
-function clickShop(item: Shop) {
+function clickShop(item: any) {
   store.SET_SHOP(item)
   store.SET_SHOW_DETAIL(true)
 }
+
+// 分页到底部
+function myScrollEnd() {
+  scrollEnd()
+}
 </script>
 
 <style scoped lang="scss">
@@ -242,7 +257,7 @@ function clickShop(item: Shop) {
     position: absolute;
     top: 319px;
     left: 124px;
-    width: 144px;
+    width: 80px;
     font-size: 24px;
     font-family: 'font_bold';
     text-align: center;
@@ -251,7 +266,7 @@ function clickShop(item: Shop) {
     font-weight: 700;
 
     .floor-item {
-      margin-bottom: 32px;
+      margin-bottom: 48px;
 
       &.active {
         font-size: 36px;

src/views/Nav/Nav.vue

@@ -166,7 +166,7 @@ import effectFade from '@/components/EffectFade/EffectFade.vue'
 import ScrollView from '@/base/ScrollView/ScrollView.vue'
 
 const store = useRootStore()
-const { shop, device, language, config } = storeToRefs(store)
+const { shop, device, language } = storeToRefs(store)
 
 const { speedUp, handleReplay, handleSpeedUp, resetPause } = useMapNavControl()
 const { directionInfo, pathShopList, backPathArray, startNavi } = useStartNavi(shop, device, resetPause)

src/views/Parking/Parking.vue

@@ -141,6 +141,7 @@ getParkingInfo().then(({ data }) => {
   .content {
     display: flex;
     justify-content: space-between;
+    align-items: center;
     margin: 0 226px;
     .content-left {
       width: 900px;

src/views/ServiceList/ServiceList.vue

@@ -93,7 +93,7 @@ function go() {
   left: 670px;
   width: 580px;
   height: 98px;
-  background: #d6bd86;
+  background: linear-gradient(159.19deg, #c4b280 13.77%, #a89866 96.7%);
   border-radius: 16px;
   .text-container {
     @include fl(center, flex-end);