From 976b5ea00909f6921aeb3edf6d8426a52d660db1 Mon Sep 17 00:00:00 2001 From: liyongle Date: Sat, 5 Aug 2023 10:21:03 +0800 Subject: [PATCH 1/4] chore(release): 1.0.3-B.0 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47b6b24..7447653 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ 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.3-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2...v1.0.3-B.0) (2023-08-05) + + +### Bug Fixes + +* 🧩 当前设备为景观层时地图位置优化 ([d3c4ce5](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/d3c4ce530c246d4afdfeb41ad3222ff6a5d76e9c)) + ### [1.0.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2-B.2...v1.0.2) (2023-08-04) ### [1.0.2-B.2](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2-B.1...v1.0.2-B.2) (2023-08-04) diff --git a/package-lock.json b/package-lock.json index aba5cac..c6a682e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.2", + "version": "1.0.3-B.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.2", + "version": "1.0.3-B.0", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 9b1f648..81a95ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.2", + "version": "1.0.3-B.0", "private": true, "scripts": { "serve": "vue-cli-service serve", From 2a1424bcf586742ed9f0b69c0f682885e0f13037 Mon Sep 17 00:00:00 2001 From: liyongle Date: Sat, 5 Aug 2023 10:50:59 +0800 Subject: [PATCH 2/4] chore(release): 1.0.3 --- CHANGELOG.md | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7447653..b25be4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ 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.3](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.3-B.0...v1.0.3) (2023-08-05) + ### [1.0.3-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.2...v1.0.3-B.0) (2023-08-05) diff --git a/package-lock.json b/package-lock.json index c6a682e..a9abc5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "vue_cli_ts", - "version": "1.0.3-B.0", + "version": "1.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vue_cli_ts", - "version": "1.0.3-B.0", + "version": "1.0.3", "dependencies": { "@better-scroll/core": "^2.5.0", "@better-scroll/observe-image": "^2.5.0", diff --git a/package.json b/package.json index 81a95ee..a53ddc3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue_cli_ts", - "version": "1.0.3-B.0", + "version": "1.0.3", "private": true, "scripts": { "serve": "vue-cli-service serve", From 882f061cddbf62e94db1daff15052707fea9cbf4 Mon Sep 17 00:00:00 2001 From: zhangyao Date: Mon, 7 Aug 2023 19:09:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=93=81=E7=89=8C?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A8=E8=8D=90=E9=A1=B5=E8=87=AA=E9=80=82?= =?UTF-8?q?=E5=BA=94=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=99=AF=E8=A7=82?= =?UTF-8?q?=E5=9F=8E=E5=92=8CB2B3=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E9=A1=B5=E9=9D=A2=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/search/icon_area.svg | 5 +++++ src/components/ActivityDetail/ActivityDetail.vue | 5 +++++ .../SearchResultListItem.vue | 8 +++++--- src/views/Brand/shopList.vue | 16 ++++++++++++++-- 4 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 src/assets/images/search/icon_area.svg diff --git a/src/assets/images/search/icon_area.svg b/src/assets/images/search/icon_area.svg new file mode 100644 index 0000000..24d4514 --- /dev/null +++ b/src/assets/images/search/icon_area.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/components/ActivityDetail/ActivityDetail.vue b/src/components/ActivityDetail/ActivityDetail.vue index e08f405..11be6d1 100644 --- a/src/components/ActivityDetail/ActivityDetail.vue +++ b/src/components/ActivityDetail/ActivityDetail.vue @@ -162,6 +162,11 @@ function handleGo() { const facList = res.data console.log('props.actInfo.facilityCode :>> ', props.actInfo.facilityCode) const fac = facList.find(item => item.code === props.actInfo.facilityCode) + const obj = store.facilityList.find(item => item.abbreviation === fac?.abbreviation) + + if (obj && fac) { + fac.navFilePath = obj.navFilePath + } if (fac) { handleFacility(toRaw(fac)) } diff --git a/src/components/SearchResultListItem/SearchResultListItem.vue b/src/components/SearchResultListItem/SearchResultListItem.vue index b99393f..eb0840f 100644 --- a/src/components/SearchResultListItem/SearchResultListItem.vue +++ b/src/components/SearchResultListItem/SearchResultListItem.vue @@ -6,6 +6,8 @@
{{ switchLanguage(shop, 'shopName') }} + + {{ switchLanguage(shop, 'regionName') }} {{ switchLanguage(shop, 'industryFatherName') }} @@ -59,13 +61,13 @@ const emits = defineEmits(['click']) align-items: center; width: 100%; height: 28px; - padding-right: 40px; + padding-right: 32px; padding-left: 32px; font-family: 'font_bold'; line-height: 28px; .name { // max-width: 460px; - width: 460px; + width: 398px; padding-right: 20px; font-size: 24px; color: #8e9090; @@ -85,7 +87,7 @@ const emits = defineEmits(['click']) margin-right: 8px; } .format-name { - width: 96px; + width: 84px; @include no-wrap(); } diff --git a/src/views/Brand/shopList.vue b/src/views/Brand/shopList.vue index eb1661f..84a2c6f 100644 --- a/src/views/Brand/shopList.vue +++ b/src/views/Brand/shopList.vue @@ -1,5 +1,5 @@