diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47b6b24..1e0cbb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,22 @@
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.4-B.0](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/compare/v1.0.3...v1.0.4-B.0) (2023-08-07)
+
+
+### Bug Fixes
+
+* 修改品牌模块推荐页自适应，不显示景观城和B2B3，修改搜索页面结果显示区域 ([882f061](https://git.1000my.com/project-chengduSKP/cd_SKP_H_base_daoshi_vue_ts/commit/882f061cddbf62e94db1daff15052707fea9cbf4))
+
+### [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)
+
+
+### 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..04e4a31 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "vue_cli_ts",
- "version": "1.0.2",
+ "version": "1.0.4-B.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vue_cli_ts",
- "version": "1.0.2",
+ "version": "1.0.4-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..b0f15be 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "vue_cli_ts",
- "version": "1.0.2",
+ "version": "1.0.4-B.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
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 @@
-