From 882f061cddbf62e94db1daff15052707fea9cbf4 Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao@1000mu.com>
Date: Mon, 7 Aug 2023 19:09:50 +0800
Subject: [PATCH] =?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 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="&#229;&#159;&#186;&#231;&#161;&#128;/&#228;&#186;&#140;&#231;&#186;&#167;&#232;&#143;&#156;&#229;&#141;&#149;/&#230;&#156;&#141;&#229;&#138;&#161;-&#229;&#145;&#168;&#232;&#190;&#185;">
+<path id="&#231;&#159;&#162;&#233;&#135;&#143;" d="M16.6667 2.5C17.1267 2.5 17.5 2.87333 17.5 3.33333V16.6667C17.5 17.1267 17.1267 17.5 16.6667 17.5H3.33333C2.87333 17.5 2.5 17.1267 2.5 16.6667V3.33333C2.5 2.87333 2.87333 2.5 3.33333 2.5H16.6667ZM9.32417 10.965L4.16667 11.875V15.8333H10.1817L9.32333 10.965H9.32417ZM15.8333 4.16667H9.8175L11.8742 15.8333H15.8333V4.16667ZM8.125 4.16667H4.16667V10.1817L9.035 9.32333L8.125 4.16667Z" fill="#615C59"/>
+</g>
+</svg>
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 @@
     <div class="bottom">
       <span class="name">{{ switchLanguage(shop, 'shopName') }}</span>
       <span class="floor-name">
+        <img src="@/assets/images/search/icon_area.svg" alt="" />
+        <span class="format-name">{{ switchLanguage(shop, 'regionName') }}</span>
         <img v-if="shop.industryUrl" :src="shop.industryUrl" alt="" />
         <span class="format-name">{{ switchLanguage(shop, 'industryFatherName') }}</span>
         <img src="@/assets/images/search/pos.svg" alt="" />
@@ -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 @@
 <template>
-  <div class="shop-list">
+  <div class="shop-list" :class="{ 'no-rec': recList.length === 0 }">
     <!--  -->
     <switchtab
       class="switch-btn"
@@ -19,6 +19,7 @@
       :refresh-delay="200"
       :pull-up="true"
       :list="pageList"
+      :class="{ 'no-rec': recList.length === 0 }"
       @scroll-end="myScrollEnd"
     >
       <!-- <swiper
@@ -199,7 +200,9 @@ const floorsList = computed(() => {
       floorOrder: -1,
       floorMapCode: ''
     },
-    ...currentBuildingFloorsList.value
+    ...currentBuildingFloorsList.value.filter(
+      item => item.floor !== 'B2' && item.floor !== 'B3' && item.floorOrder < currentBuildingFloorsList.value.length - 1
+    )
   ]
 })
 const recList = ref<Shop[]>([])
@@ -381,6 +384,9 @@ function myScrollEnd() {
   height: 1080px;
   padding-top: 0;
   padding-left: 0;
+  &.no-rec {
+    width: 1790px;
+  }
   .right-control-area {
     position: absolute;
     top: 134px;
@@ -499,6 +505,12 @@ function myScrollEnd() {
     .swiper-wrapper {
       height: auto;
     }
+    &.no-rec {
+      width: 1532px;
+      .shop-items {
+        width: 1532px;
+      }
+    }
     .shop-items {
       width: 1388px;