From 51582a4b8ff06336b85b8e87da3a67646b8e694b Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Fri, 12 May 2023 16:08:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/offline/JSON/getBackTime.json   |  2 +-
 .../PublicComponent/PublicComponent.vue       |  2 +-
 src/components/Search/Hot.vue                 |  2 +-
 src/components/Search/Result.vue              |  2 +-
 src/composables/useHandleScreen.ts            |  2 +-
 src/router/routes.ts                          | 36 +++++++++++++------
 src/views/Nav/Nav.vue                         |  4 ++-
 7 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/public/static/offline/JSON/getBackTime.json b/public/static/offline/JSON/getBackTime.json
index 2fd08fc..b9464fb 100644
--- a/public/static/offline/JSON/getBackTime.json
+++ b/public/static/offline/JSON/getBackTime.json
@@ -1,5 +1,5 @@
 {
   "code": 200,
   "msg": "操作成功",
-  "data": [600, 600]
+  "data": [600, null]
 }
diff --git a/src/components/PublicComponent/PublicComponent.vue b/src/components/PublicComponent/PublicComponent.vue
index 37c3a12..dfa0fb7 100644
--- a/src/components/PublicComponent/PublicComponent.vue
+++ b/src/components/PublicComponent/PublicComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <Header />
-  <Menu />
+  <Menu v-show="$route.meta.showMenu" />
   <!-- 地图容器 -->
   <Map v-show="$route.meta.showMap" @handle-go="handleGO" @handle-detail="handleDetail" />
 
diff --git a/src/components/Search/Hot.vue b/src/components/Search/Hot.vue
index 916f6dc..4af9317 100644
--- a/src/components/Search/Hot.vue
+++ b/src/components/Search/Hot.vue
@@ -5,7 +5,7 @@
       <div class="shop_list">
         <div v-for="item in list" :key="item.shopCode" class="shop_item" @click="show(item)">
           <div class="top">
-            <img :src="item.logoUrl" alt="" />
+            <img :src="item.logoUrl ? item.logoUrl : require('@/assets/images/header/logo.svg')" alt="" />
           </div>
           <div class="info">
             <div class="name">{{ switchLanguage(item, 'shopName') }}</div>
diff --git a/src/components/Search/Result.vue b/src/components/Search/Result.vue
index d35df06..ce5669c 100644
--- a/src/components/Search/Result.vue
+++ b/src/components/Search/Result.vue
@@ -4,7 +4,7 @@
       <div class="shop_list">
         <div v-for="item in list" :key="item.shopCode" class="shop_item" @click="show(item)">
           <div class="left">
-            <img :src="item.logoUrl" alt="" />
+            <img :src="item.logoUrl ? item.logoUrl : require('@/assets/images/header/logo.svg')" alt="" />
           </div>
           <div class="info">
             <div class="name">{{ switchLanguage(item, 'shopName') }}</div>
diff --git a/src/composables/useHandleScreen.ts b/src/composables/useHandleScreen.ts
index 16a9ab3..30a566a 100644
--- a/src/composables/useHandleScreen.ts
+++ b/src/composables/useHandleScreen.ts
@@ -86,7 +86,7 @@ export const useHandleScreen = (callback: () => void) => {
   onMounted(() => {
     //获取返回首页和进入屏保的具体时间
     getBackTime().then(({ data }) => {
-      const noWallpaper = data[1] === 0 //判断有无屏保 为0时没有
+      const noWallpaper = data[1] === 0 || data[1] === null //判断有无屏保 为0时没有
       const paperTime = noWallpaper ? -1 : data[1]
       totalTime.value = [data[0], paperTime]
       toIndexTime.value = data[0]
diff --git a/src/router/routes.ts b/src/router/routes.ts
index 6fbb70f..221fe6f 100644
--- a/src/router/routes.ts
+++ b/src/router/routes.ts
@@ -5,21 +5,24 @@ export const routes: RouteRecordRaw[] = [
     path: '/',
     component: () => import(/* webpackChunkName: "index" */ '@/views/Index/Index.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
     path: '/guide',
     component: () => import(/* webpackChunkName: "guide" */ '@/views/Guide/Guide.vue'),
     meta: {
-      showMap: true
+      showMap: true,
+      showMenu: true
     }
   },
   {
     path: '/brand',
     component: () => import(/* webpackChunkName: "guide" */ '@/views/Brand/Brand.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
@@ -27,7 +30,8 @@ export const routes: RouteRecordRaw[] = [
     name: 'Nav',
     component: () => import(/* webpackChunkName: "nav" */ '@/views/Nav/Nav.vue'),
     meta: {
-      showMap: true
+      showMap: true,
+      showMenu: false
     }
   },
   {
@@ -35,7 +39,8 @@ export const routes: RouteRecordRaw[] = [
     name: 'Activity',
     component: () => import(/* webpackChunkName: "activity" */ '@/views/Activity/Activity.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
@@ -43,7 +48,8 @@ export const routes: RouteRecordRaw[] = [
     name: 'Member',
     component: () => import(/* webpackChunkName: "member" */ '@/views/Member/Member.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
@@ -51,7 +57,8 @@ export const routes: RouteRecordRaw[] = [
     name: 'School',
     component: () => import(/* webpackChunkName: "activity" */ '@/views/School/School.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
@@ -59,18 +66,27 @@ export const routes: RouteRecordRaw[] = [
     name: 'Service',
     component: () => import(/* webpackChunkName: "service" */ '@/views/ServiceList/ServiceList.vue'),
     meta: {
-      showMap: false
+      showMap: false,
+      showMenu: true
     }
   },
   {
     path: '/parking',
     name: 'Parking',
-    component: () => import(/* webpackChunkName: "parking" */ '@/views/Parking/Parking.vue')
+    component: () => import(/* webpackChunkName: "parking" */ '@/views/Parking/Parking.vue'),
+    meta: {
+      showMap: false,
+      showMenu: true
+    }
   },
   {
     path: '/art',
     name: 'Art',
-    component: () => import(/* webpackChunkName: "parking" */ '@/views/Art/Art.vue')
+    component: () => import(/* webpackChunkName: "parking" */ '@/views/Art/Art.vue'),
+    meta: {
+      showMap: false,
+      showMenu: true
+    }
   },
   {
     path: '/transfer',
diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue
index 62fbefd..b5e6017 100644
--- a/src/views/Nav/Nav.vue
+++ b/src/views/Nav/Nav.vue
@@ -61,7 +61,9 @@
             :data-key="directionInfo?.text"
           />
           <div class="go-container">
-            <p class="go-text">{{ directionInfo ? switchLanguage(directionInfo, 'text') : '' }}</p>
+            <p class="go-text" :style="language === 'en' ? 'margin-top: 10px' : ''">
+              {{ directionInfo ? switchLanguage(directionInfo, 'text') : '' }}
+            </p>
             <!-- <p class="go-tip">{{ $t('go.please') }}</p> -->
           </div>
         </div>

From 5f8985d595ea63735b6c3a3cbf98265462e62cde Mon Sep 17 00:00:00 2001
From: liyongle <liyongle@123>
Date: Fri, 12 May 2023 16:12:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=F0=9F=A7=A9=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Nav/Nav.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Nav/Nav.vue b/src/views/Nav/Nav.vue
index 81938fd..bf6ca62 100644
--- a/src/views/Nav/Nav.vue
+++ b/src/views/Nav/Nav.vue
@@ -62,7 +62,7 @@
             :data-key="directionInfo?.text"
           />
           <div class="go-container">
-            <p class="go-text" :style="language === 'en' ? 'margin-top: 10px' : ''">
+            <p class="go-text" :style="language === 'en' ? 'margin-top: -25px' : ''">
               {{ directionInfo ? switchLanguage(directionInfo, 'text') : '' }}
             </p>
             <!-- <p class="go-tip">{{ $t('go.please') }}</p> -->