chore(release): 1.0.0-B.4

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.0-B.4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.3...v1.0.0-B.4) (2023-05-12)
+
+
+### Bug Fixes
+
+* 🧩 导航时不显示菜单 ([51582a4](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/51582a4b8ff06336b85b8e87da3a67646b8e694b))
+* 🧩 修改导航界面 ([5f8985d](https://git.1000my.com/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/commit/5f8985d595ea63735b6c3a3cbf98265462e62cde))
+
 ## [1.0.0-B.3](https://company/project-shenyangk11/sy_k11_H_base_daoshi_vue_ts/compare/v1.0.0-B.2...v1.0.0-B.3) (2023-05-12)
 
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.3",
+  "version": "1.0.0-B.4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "vue_cli_ts",
-      "version": "1.0.0-B.3",
+      "version": "1.0.0-B.4",
       "dependencies": {
         "@better-scroll/core": "^2.5.0",
         "@better-scroll/observe-image": "^2.5.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue_cli_ts",
-  "version": "1.0.0-B.3",
+  "version": "1.0.0-B.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

public/static/offline/JSON/getBackTime.json

@@ -1,5 +1,5 @@
 {
   "code": 200,
   "msg": "操作成功",
-  "data": [600, 600]
+  "data": [600, null]
 }

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" />
 

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>

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>

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]

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',

src/views/Nav/Nav.vue

@@ -62,7 +62,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: -25px' : ''">
+              {{ directionInfo ? switchLanguage(directionInfo, 'text') : '' }}
+            </p>
             <!-- <p class="go-tip">{{ $t('go.please') }}</p> -->
           </div>
         </div>