From cbe0e6ca364a6e287ccbfd6e1cbed88b512d46be Mon Sep 17 00:00:00 2001
From: zhangyao <zhangyao@1000mu.com>
Date: Thu, 15 Jun 2023 17:56:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=AE=E6=92=AD?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E6=8C=89=E9=92=AE=E4=BF=AE=E6=94=B9=E7=B9=81?=
 =?UTF-8?q?=E4=BD=93=E5=AD=97=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header/Header.vue                |  2 +-
 src/components/Map/Map.vue                      |  2 +-
 src/components/ShopDetail/ShopDetail.vue        | 16 ++++++++--------
 src/components/SwitchTab/SwitchTab.vue          |  2 +-
 .../TheServiceDetail/TheServiceDetail.vue       | 15 +++++++--------
 src/components/TypeBtnList/TypeBtnList.vue      |  5 +++++
 src/router/routes.ts                            | 16 ++++++++--------
 src/views/Activity/Activity.vue                 | 17 ++++++++++++++++-
 src/views/Index/Index.vue                       |  2 +-
 9 files changed, 48 insertions(+), 29 deletions(-)

diff --git a/src/components/Header/Header.vue b/src/components/Header/Header.vue
index 4305ade..ae5f5a5 100644
--- a/src/components/Header/Header.vue
+++ b/src/components/Header/Header.vue
@@ -37,7 +37,7 @@
         <svg width="24" height="40" viewBox="0 0 24 40" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M22.2845 0L24 1.00072L1.71546 40L0 38.9993L22.2845 0Z" fill="black" fill-opacity="0.2" />
         </svg>
-        <span>{{ showSearch ? '全局搜索' : route.meta.title }}</span>
+        <span>{{ showSearch ? '全局搜索' : switchLanguage(route.meta, 'name') }}</span>
       </div>
     </transition>
   </header>
diff --git a/src/components/Map/Map.vue b/src/components/Map/Map.vue
index 5c81c9b..368c3e9 100644
--- a/src/components/Map/Map.vue
+++ b/src/components/Map/Map.vue
@@ -24,7 +24,7 @@
         <svg width="24" height="40" viewBox="0 0 24 40" fill="none" xmlns="http://www.w3.org/2000/svg">
           <path d="M22.2845 0L24 1.00072L1.71546 40L0 38.9993L22.2845 0Z" fill="black" fill-opacity="0.2" />
         </svg>
-        <span>{{ route.meta.title }}</span>
+        <span>{{ switchLanguage(route.meta, 'name') }}</span>
       </div>
     </transition>
 
diff --git a/src/components/ShopDetail/ShopDetail.vue b/src/components/ShopDetail/ShopDetail.vue
index 473c8c5..ea86b84 100644
--- a/src/components/ShopDetail/ShopDetail.vue
+++ b/src/components/ShopDetail/ShopDetail.vue
@@ -165,10 +165,10 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
   background: rgb(255 255 255 / 70%);
   border-radius: 12px;
 
-  --swiper-theme-color: rgb(0 0 0 / 30%);
+  --swiper-theme-color: #d7ba92;
   --swiper-pagination-bullet-width: 28px;
   --swiper-pagination-bullet-height: 4px;
-  --swiper-pagination-bullet-inactive-color: #fff;
+  --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%);
 
   .bg-top {
     position: absolute;
@@ -186,15 +186,15 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
     display: inline-block;
     overflow: hidden;
     width: 800px;
-    height: 450px;
-    min-height: 450px;
-    max-height: 450px;
+    height: 490px;
+    // min-height: 450px;
+    // max-height: 450px;
     margin-top: -178px;
     margin-left: 25px;
     // background: #d5d5d5;
     background: rgb(255 255 255);
     border-radius: 12px;
-    .swiper-slide {
+    :deep(.swiper-slide) {
       height: 450px;
       border-radius: 12px;
     }
@@ -214,11 +214,11 @@ useStatistics({ tag: 'shop', shopCode: shop.value.shopCode })
         object-fit: scale-down;
       }
     }
-    .swiper-pagination-bullet {
+    :deep(.swiper-pagination-bullet) {
       border-radius: 4px;
     }
     .detail {
-      bottom: -10px;
+      bottom: 18px;
       // left: 87%;
       // width: 100px;
     }
diff --git a/src/components/SwitchTab/SwitchTab.vue b/src/components/SwitchTab/SwitchTab.vue
index e3fcb09..54d2f45 100644
--- a/src/components/SwitchTab/SwitchTab.vue
+++ b/src/components/SwitchTab/SwitchTab.vue
@@ -26,7 +26,7 @@
 
       <div class="intro-wrapper">
         <span class="intro-name">
-          {{ item.name }}
+          {{ switchLanguage(item, 'name') }}
         </span>
         <span class="intro-name-en">
           {{ item.en }}
diff --git a/src/components/TheServiceDetail/TheServiceDetail.vue b/src/components/TheServiceDetail/TheServiceDetail.vue
index f4c9e73..55ef294 100644
--- a/src/components/TheServiceDetail/TheServiceDetail.vue
+++ b/src/components/TheServiceDetail/TheServiceDetail.vue
@@ -133,10 +133,11 @@ function close() {
   background: rgb(255 255 255 / 70%);
   border-radius: 12px 12px 24px 24px;
 
-  --swiper-theme-color: rgb(0 0 0 / 30%);
+  --swiper-theme-color: #d7ba92;
   --swiper-pagination-bullet-width: 28px;
   --swiper-pagination-bullet-height: 4px;
-  --swiper-pagination-bullet-inactive-color: #fff;
+  --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%);
+
   .bg-top {
     position: absolute;
     top: 0;
@@ -153,15 +154,13 @@ function close() {
     display: inline-block;
     overflow: hidden;
     width: 800px;
-    height: 450px;
-    min-height: 450px;
-    max-height: 450px;
+    height: 490px;
     margin-top: -176px;
     margin-left: 25px;
     // background: #d5d5d5;
     background: rgb(255 255 255);
     border-radius: 12px;
-    .swiper-slide {
+    :deep(.swiper-slide) {
       height: 450px;
       border-radius: 12px;
     }
@@ -173,11 +172,11 @@ function close() {
       object-fit: cover;
       border-radius: 12px;
     }
-    .swiper-pagination-bullet {
+    :deep(.swiper-pagination-bullet) {
       border-radius: 4px;
     }
     .detail {
-      bottom: -10px;
+      bottom: 18px;
       // left: 87%;
       // width: 100px;
     }
diff --git a/src/components/TypeBtnList/TypeBtnList.vue b/src/components/TypeBtnList/TypeBtnList.vue
index 895c75a..e3764cc 100644
--- a/src/components/TypeBtnList/TypeBtnList.vue
+++ b/src/components/TypeBtnList/TypeBtnList.vue
@@ -78,6 +78,11 @@ function changeType(item: TypeItem, index: number) {
         color: rgb(0 0 0 / 80%);
         border-bottom: 6px solid #d7ba92;
       }
+      &.btn-en {
+        h4 {
+          font-size: 21px;
+        }
+      }
     }
   }
 }
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 2af91ff..03f1d61 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -13,7 +13,7 @@ export const routes: RouteRecordRaw[] = [
     path: '/guide',
     component: () => import(/* webpackChunkName: "guide" */ '@/views/Guide/Guide.vue'),
     meta: {
-      title: '地图导览',
+      name: '地图导览',
       titleEn: 'MAP\nGUIDE'
     }
   },
@@ -22,7 +22,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Nav',
     component: () => import(/* webpackChunkName: "nav" */ '@/views/Nav/Nav.vue'),
     meta: {
-      title: '地图导航',
+      name: '地图导航',
       titleEn: 'MAP\nNAVIGATION'
     }
   },
@@ -31,7 +31,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Parking',
     component: () => import('@/views/Parking/Parking.vue'),
     meta: {
-      title: '车位指引',
+      name: '车位指引',
       titleEn: 'PARKING\nGUIDANCE'
     }
   },
@@ -40,7 +40,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Brand',
     component: () => import('@/views/Brand/Brand.vue'),
     meta: {
-      title: '品牌列表',
+      name: '品牌列表',
       titleEn: 'BRAND\nLIST'
     }
   },
@@ -49,7 +49,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Building',
     component: () => import('@/views/Building/Building.vue'),
     meta: {
-      title: '楼栋列表',
+      name: '楼栋列表',
       titleEn: 'BLOCK\nLIST'
     }
   },
@@ -58,7 +58,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Activity',
     component: () => import('@/views/Activity/Activity.vue'),
     meta: {
-      title: '社区活动',
+      name: '社区活动',
       titleEn: 'COMUNITY\nACTIVITY'
     }
   },
@@ -67,7 +67,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Member',
     component: () => import('@/views/Member/Member.vue'),
     meta: {
-      title: '尊享会员',
+      name: '尊享会员',
       titleEn: 'MEMBER\nPRIVILEGES'
     }
   },
@@ -76,7 +76,7 @@ export const routes: RouteRecordRaw[] = [
     name: 'Service',
     component: () => import('@/views/Service/Service.vue'),
     meta: {
-      title: '社区服务',
+      name: '社区服务',
       titleEn: 'COMMUNITY\nSERVICE'
     }
   },
diff --git a/src/views/Activity/Activity.vue b/src/views/Activity/Activity.vue
index 5466ec6..d1f004a 100644
--- a/src/views/Activity/Activity.vue
+++ b/src/views/Activity/Activity.vue
@@ -41,8 +41,8 @@
       <SwiperSlide v-for="(item, index) in actList" :key="index" v-slot="{ isActive }">
         <ActivityItem :act-info="item" :is-active="isActive"></ActivityItem>
       </SwiperSlide>
-      <div class="list-paginationh"></div>
     </Swiper>
+    <div class="list-paginationh"></div>
     <img v-if="actList.length === 0" class="no-data" src="@/assets/images/stay_tuned.svg" alt="" />
 
     <!-- <activityDetail v-if="showDetail" @close="showDetail = false"> </activityDetail> -->
@@ -129,6 +129,13 @@ getData('mall')
   background-size: 1080px 1419px;
   background-color: linear-gradient(180deg, #e2d8ca 0%, rgb(226 216 202 / 0%) 100%);
 
+  --swiper-theme-color: #d7ba92;
+  --swiper-pagination-bullet-width: 28px;
+  --swiper-pagination-bullet-height: 4px;
+  --swiper-pagination-bullet-inactive-color: rgb(0 0 0 / 60%);
+  :deep(.swiper-pagination-bullet) {
+    border-radius: 4px;
+  }
   .btn-group {
     width: 428px;
     margin: 420px auto 0;
@@ -150,6 +157,14 @@ getData('mall')
       }
     }
   }
+  .list-paginationh {
+    position: absolute;
+    right: 0;
+    bottom: 111px;
+    left: 0;
+    width: fit-content;
+    margin: 0 auto;
+  }
   .no-data {
     position: absolute;
     right: 0;
diff --git a/src/views/Index/Index.vue b/src/views/Index/Index.vue
index 984df01..1806c62 100644
--- a/src/views/Index/Index.vue
+++ b/src/views/Index/Index.vue
@@ -7,7 +7,7 @@
       <ul class="ul-container">
         <li v-for="(item, index) in btnModel" :key="index" class="btn-item" @click="itemClick(item)">
           <div class="div" :style="getBg(item)"></div>
-          <p class="btn-name">{{ item.name }}</p>
+          <p class="btn-name">{{ switchLanguage(item, 'name') }}</p>
           <p class="btn-nameen">{{ item.nameEn }}</p>
         </li>
       </ul>