dev #2

Merged
zhangyao merged 9 commits from dev into test 3 years ago
  1. 17
      CHANGELOG.md
  2. 4
      package-lock.json
  3. 2
      package.json
  4. 11918
      public/static/offline/JSON/GetMapInfo.json
  5. 172
      public/static/offline/JSON/getArtData.json
  6. 171
      public/static/offline/JSON/getArtList.json
  7. 6
      public/static/offline/JSON/getBackTime.json
  8. 10
      src/assets/images/nav/go_icon.svg
  9. 6
      src/components/CarInfo/CarInfo.vue
  10. 18
      src/components/PathGroup/PathGroup.vue
  11. 4
      src/components/PlateInput/PlateInput.vue
  12. 2
      src/components/PlateKeyboard/PlateKeyboard.vue
  13. 38
      src/components/ShopDetail/ShopDetail.vue
  14. 1
      src/components/ShopItem/ShopItem.vue
  15. 20
      src/components/Traffic/Traffic.vue
  16. 4
      src/views/Art/Art.vue
  17. 14
      src/views/Art/ArtMapItem.vue
  18. 4
      src/views/Art/ArtRightItem.vue
  19. 6
      src/views/Brand/Brand.vue
  20. 14
      src/views/Nav/Nav.vue
  21. 2
      src/views/Parking/Parking.vue
  22. 2
      src/views/ServiceList/ServiceList.vue

17
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. 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) ## 1.0.0-B.1 (2023-05-10)

4
package-lock.json

@ -1,12 +1,12 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.1",
"version": "1.0.0-B.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.1",
"version": "1.0.0-B.3",
"dependencies": { "dependencies": {
"@better-scroll/core": "^2.5.0", "@better-scroll/core": "^2.5.0",
"@better-scroll/observe-image": "^2.5.0", "@better-scroll/observe-image": "^2.5.0",

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "vue_cli_ts", "name": "vue_cli_ts",
"version": "1.0.0-B.1",
"version": "1.0.0-B.3",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",

11918
public/static/offline/JSON/GetMapInfo.json

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

171
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
}]
}

6
public/static/offline/JSON/getBackTime.json

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

10
src/assets/images/nav/go_icon.svg

@ -0,0 +1,10 @@
<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_514_14640)">
<path d="M3.24333 15.5252C2.37333 15.2352 2.36499 14.7669 3.25999 14.4686L35.0717 3.86523C35.9533 3.5719 36.4583 4.06523 36.2117 4.92856L27.1217 36.7386C26.8717 37.6202 26.3633 37.6502 25.99 36.8136L20 23.3336L30 10.0002L16.6667 20.0002L3.24333 15.5252Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_514_14640">
<rect width="40" height="40" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 519 B

6
src/components/CarInfo/CarInfo.vue

@ -113,7 +113,7 @@ function go() {
display: flex; display: flex;
align-items: center; align-items: center;
padding: 48px 56px; padding: 48px 56px;
background: #fff;
background: #efeeea;
} }
.car-group { .car-group {
display: flex; display: flex;
@ -143,8 +143,8 @@ function go() {
height: 100px; height: 100px;
font-size: 36px; font-size: 36px;
text-align: center; 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; border-radius: 0 0 16px 16px;
font-weight: 700; font-weight: 700;
line-height: 44px; line-height: 44px;

18
src/components/PathGroup/PathGroup.vue

@ -93,14 +93,16 @@ const yourpos = computed(() => {
}) })
// //
const lastImage = 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({ defineExpose({
resetPlayIdx resetPlayIdx

4
src/components/PlateInput/PlateInput.vue

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

2
src/components/PlateKeyboard/PlateKeyboard.vue

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

38
src/components/ShopDetail/ShopDetail.vue

@ -74,7 +74,7 @@
</scroll-view> </scroll-view>
<!-- 导航按钮 --> <!-- 导航按钮 -->
<div v-if="shop.yaxis" class="go" @click="handleGo"> <div v-if="shop.yaxis" class="go" @click="handleGo">
<img src="@/assets/images/shopDetail/bg_go.png" alt="" />
<img src="@/assets/images/nav/go_icon.svg" alt="" />
<h5>{{ $t('shop.goBtn') }}</h5> <h5>{{ $t('shop.goBtn') }}</h5>
</div> </div>
<!-- 关闭按钮 --> <!-- 关闭按钮 -->
@ -195,11 +195,11 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
} }
.logo-wrapper { .logo-wrapper {
position: absolute; position: absolute;
top: -32px;
left: 300px;
top: 32px;
left: 852px;
z-index: 1; z-index: 1;
width: 152px;
height: 152px;
width: 150px;
height: 150px;
padding: 12px; padding: 12px;
background: #fff; background: #fff;
border-radius: 0; border-radius: 0;
@ -211,12 +211,12 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
} }
.name-wrapper { .name-wrapper {
position: absolute; position: absolute;
top: 40px;
left: 852px;
top: 65px;
left: 1058px;
z-index: 1; z-index: 1;
.marquee-wrapper { .marquee-wrapper {
overflow: hidden; overflow: hidden;
width: 700px;
width: 546px;
margin-bottom: 12px; margin-bottom: 12px;
white-space: nowrap; white-space: nowrap;
@ -253,6 +253,8 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
.shop-attr-group { .shop-attr-group {
width: 500px; width: 500px;
margin-top: 70px;
margin-left: -209px;
.ul { .ul {
display: flex; display: flex;
margin-bottom: 17px; margin-bottom: 17px;
@ -281,9 +283,9 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
left: 852px; left: 852px;
z-index: 1; z-index: 1;
overflow: hidden; overflow: hidden;
width: 722px;
height: 165px;
padding-right: 14px;
width: 578px;
height: 172px;
padding-right: 16px;
.intro { .intro {
font-size: 14px; font-size: 14px;
font-family: 'font_regular'; font-family: 'font_regular';
@ -298,20 +300,24 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
} }
.go { .go {
position: absolute; position: absolute;
top: 38px;
right: -75px;
right: 8px;
bottom: 8px;
z-index: 1; z-index: 1;
width: 150px;
width: 118px;
height: 218px;
background-color: #a6976f;
img { img {
position: absolute; position: absolute;
width: 150px;
top: 69px;
left: 39px;
width: 40px;
} }
h5 { h5 {
position: absolute; position: absolute;
right: 0; right: 0;
left: 0; left: 0;
display: block; display: block;
margin: 85px auto 0;
margin: 125px auto 0;
font-size: 22px; font-size: 22px;
font-family: 'font_bold'; font-family: 'font_bold';
text-align: center; text-align: center;

1
src/components/ShopItem/ShopItem.vue

@ -65,6 +65,7 @@ defineProps<{ shop: any }>()
flex-direction: column; flex-direction: column;
.name { .name {
max-width: 90%; max-width: 90%;
height: 18px;
font-size: 16px; font-size: 16px;
color: #685c3b; color: #685c3b;

20
src/components/Traffic/Traffic.vue

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

4
src/views/Art/Art.vue

@ -510,9 +510,9 @@ function clickGo(item: ArtItem) {
.map-group { .map-group {
position: absolute; position: absolute;
top: 85px; top: 85px;
left: 510px;
left: 580px;
li { li {
margin-bottom: -108px;
margin-bottom: -70px;
img { img {
height: 205px; height: 205px;
} }

14
src/views/Art/ArtMapItem.vue

@ -16,7 +16,7 @@
</div> </div>
</div> </div>
<!-- 编号 --> <!-- 编号 -->
<p class="art-number">{{ artInfo.artNum }}</p>
<p class="art-number">{{ artInfo.tag }}</p>
<!-- 导航按钮 --> <!-- 导航按钮 -->
<div class="go-container" @click="clickGo">GO</div> <div class="go-container" @click="clickGo">GO</div>
</div> </div>
@ -29,7 +29,9 @@ const props = defineProps({
artInfo: { artInfo: {
type: Object, type: Object,
// eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function // eslint-disable-next-line @typescript-eslint/no-empty-function, no-empty-function
default: () => {}
default: () => {
return { artworkName: '' }
}
} }
}) })
function clickGo() { function clickGo() {
@ -56,10 +58,11 @@ function clickGo() {
.intro-container { .intro-container {
display: inline-block; display: inline-block;
padding-top: 16px; padding-top: 16px;
padding-left: 6px;
padding-left: 12px;
.art-title { .art-title {
max-width: 170px; max-width: 170px;
height: 16px;
font-size: 14px; font-size: 14px;
font-family: 'font_bold'; font-family: 'font_bold';
color: #736661; color: #736661;
@ -70,7 +73,8 @@ function clickGo() {
} }
.art-author { .art-author {
max-width: 170px; max-width: 170px;
margin-top: 6px;
height: 14px;
margin-top: 2px;
font-size: 10px; font-size: 10px;
font-family: 'font_bold'; font-family: 'font_bold';
color: #9b8c85; color: #9b8c85;
@ -115,7 +119,7 @@ function clickGo() {
bottom: 0; bottom: 0;
width: 65px; width: 65px;
height: 36px; height: 36px;
padding-top: 8px;
padding-top: 12px;
padding-left: 29px; padding-left: 29px;
font-size: 16px; font-size: 16px;
font-family: 'font_bold'; font-family: 'font_bold';

4
src/views/Art/ArtRightItem.vue

@ -54,6 +54,7 @@ function clickGo() {
.art-title { .art-title {
max-width: 200px; max-width: 200px;
height: 18px;
font-size: 16px; font-size: 16px;
font-family: 'font_bold'; font-family: 'font_bold';
color: #736661; color: #736661;
@ -64,7 +65,8 @@ function clickGo() {
} }
.art-author { .art-author {
max-width: 150px; max-width: 150px;
margin-top: 4px;
height: 14px;
margin-top: 2px;
font-size: 12px; font-size: 12px;
font-family: 'font_regular'; font-family: 'font_regular';
color: #9b8c85; color: #9b8c85;

6
src/views/Brand/Brand.vue

@ -150,7 +150,7 @@ getBrandInfo().then(({ data }) => {
function changeType(item: any) { function changeType(item: any) {
currentTypeId.value = item.order currentTypeId.value = item.order
formatIdx.value = 0 formatIdx.value = 0
copyShopList.value = [...shopList.value]
copyShopList.value = [{ name: '1', shopList: [...shopList.value] }]
} }
function resetIdx() { function resetIdx() {
formatIdx.value = 0 formatIdx.value = 0
@ -171,7 +171,7 @@ function handleClickFormat(item: Industry, index: number) {
resetIdx() resetIdx()
formatIdx.value = index formatIdx.value = index
if (index === 0) { if (index === 0) {
copyShopList.value = [...shopList.value]
copyShopList.value = [{ name: '1', shopList: [...shopList.value] }]
return return
} }
if (currentTypeId.value === 0) { if (currentTypeId.value === 0) {
@ -266,7 +266,7 @@ function myScrollEnd() {
font-weight: 700; font-weight: 700;
.floor-item { .floor-item {
margin-bottom: 32px;
margin-bottom: 48px;
&.active { &.active {
font-size: 36px; font-size: 36px;

14
src/views/Nav/Nav.vue

@ -38,6 +38,7 @@
>{{ switchLanguage(shop, 'shopName') }} >{{ switchLanguage(shop, 'shopName') }}
</marquees> </marquees>
</div> </div>
<div class="line"></div>
<h3 class="author">{{ shop.artAuthor }}</h3> <h3 class="author">{{ shop.artAuthor }}</h3>
<!-- 介绍 --> <!-- 介绍 -->
<scroll-view <scroll-view
@ -334,7 +335,16 @@ watch(shop, newVal => {
z-index: 1; z-index: 1;
width: 824px; width: 824px;
height: 1078px; 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 { .marquee-wrapper {
overflow: hidden; overflow: hidden;
width: 340px; width: 340px;
@ -393,11 +403,13 @@ watch(shop, newVal => {
max-width: 180px; max-width: 180px;
} }
.go-container { .go-container {
max-width: 180px;
font-size: 36px; font-size: 36px;
font-family: 'font_bold'; font-family: 'font_bold';
color: rgb(0 0 0 / 60%); color: rgb(0 0 0 / 60%);
font-style: normal; font-style: normal;
font-weight: 700; font-weight: 700;
line-height: 120%;
} }
} }
.art-images { .art-images {

2
src/views/Parking/Parking.vue

@ -141,6 +141,7 @@ getParkingInfo().then(({ data }) => {
.content { .content {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center;
margin: 0 226px; margin: 0 226px;
.content-left { .content-left {
width: 900px; width: 900px;
@ -201,6 +202,7 @@ getParkingInfo().then(({ data }) => {
font-size: 14px; font-size: 14px;
font-family: 'font_regular'; font-family: 'font_regular';
text-align: justify; text-align: justify;
white-space: pre-wrap;
color: #736661; color: #736661;
line-height: 28px; line-height: 28px;
} }

2
src/views/ServiceList/ServiceList.vue

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

Loading…
Cancel
Save