From ca105b3df177ed3f19d6f3ef5f39790769f5f1b2 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Wed, 14 Aug 2024 15:51:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E8=88=AA=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/offline/JSON/getBackTime.json   |  2 +-
 .../offline/JSON/getDevCoordinateByIP.json    | 30 ++++++++++-
 src/base/ShopItem/ShopItem.vue                | 53 ++++++++++++++++---
 src/composables/useHandleScreen.js            |  2 +-
 4 files changed, 76 insertions(+), 11 deletions(-)

diff --git a/public/static/offline/JSON/getBackTime.json b/public/static/offline/JSON/getBackTime.json
index 236a65e..91c1be0 100644
--- a/public/static/offline/JSON/getBackTime.json
+++ b/public/static/offline/JSON/getBackTime.json
@@ -1 +1 @@
-{"code":200,"msg":"操作成功","data":[20,20]}
\ No newline at end of file
+{ "code": 200, "msg": "操作成功", "data": [120, 120] }
diff --git a/public/static/offline/JSON/getDevCoordinateByIP.json b/public/static/offline/JSON/getDevCoordinateByIP.json
index bcd918d..b5217fd 100644
--- a/public/static/offline/JSON/getDevCoordinateByIP.json
+++ b/public/static/offline/JSON/getDevCoordinateByIP.json
@@ -1 +1,29 @@
-{"code":200,"msg":"success","data":{"machineCode":"MLnMzBjQdwVKysWyz1RG0","machineName":"111","machineTypeName":"导视","label":"windows","screenAttribute":"1080*1920竖屏","building":"A栋","buildingCode":"DLvmtzN2qodUq_oYr7vyM","buildingOrder":0,"floor":"1F","floorCode":"nL3E-j25zxxkag_HMSGsR","floorOrder":2,"ip":"192.168.1.21","mac":"E0D55E1B2B17","location":"16","angle":"0","projectCode":"project-zert3dski8fqmgr4zhusea","regionCode":"","lensCoordinate":"","orientationCoordinate":"","deployType":"saas","xfyunIp":"","xfyunPort":"","style":"0"}}
\ No newline at end of file
+{
+  "code": 200,
+  "msg": "success",
+  "data": {
+    "machineCode": "MLnMzBjQdwVKysWyz1RG0",
+    "machineName": "111",
+    "machineTypeName": "导视",
+    "label": "windows",
+    "screenAttribute": "1080*1920竖屏",
+    "building": "A栋",
+    "buildingCode": "DLvmtzN2qodUq_oYr7vyM",
+    "buildingOrder": 0,
+    "floor": "1F",
+    "floorCode": "nL3E-j25zxxkag_HMSGsR",
+    "floorOrder": 2,
+    "ip": "192.168.1.21",
+    "mac": "E0D55E1B2B17",
+    "location": "16",
+    "angle": "270",
+    "projectCode": "project-zert3dski8fqmgr4zhusea",
+    "regionCode": "",
+    "lensCoordinate": "",
+    "orientationCoordinate": "",
+    "deployType": "saas",
+    "xfyunIp": "",
+    "xfyunPort": "",
+    "style": "0"
+  }
+}
diff --git a/src/base/ShopItem/ShopItem.vue b/src/base/ShopItem/ShopItem.vue
index 16c503c..f0a26cb 100644
--- a/src/base/ShopItem/ShopItem.vue
+++ b/src/base/ShopItem/ShopItem.vue
@@ -21,9 +21,13 @@
         ></QRCodeFromText>
         <div class="qrcode-meta1">手机扫码导航</div>
       </div>
-      <div v-if="isFood" class="foodActiveName">立即导航</div>
+      <div v-if="isFood" class="foodActiveName">
+        <div class="name-left">{{ switchLanguage(shop, 'shopName') }}</div>
+        <div class="nav-right">导航</div>
+      </div>
       <div class="name" v-else>
-        <div class="shop-name">立即导航</div>
+        <div class="shop-name">{{ switchLanguage(shop, 'shopName') }}</div>
+        <div class="nav-right">导航</div>
       </div>
     </div>
 
@@ -206,16 +210,38 @@ const deactivate = () => store.SET_SHOP(null)
     }
     .foodActiveName {
       display: flex;
-      justify-content: center;
+      justify-content: space-between;
       align-items: center;
+      padding-left: 16px;
+      padding-right: 8px;
       width: calc(100% - 32px);
       height: 45px;
       border-radius: 100px;
       background: var(--VI--, linear-gradient(99deg, #f0b92b 0%, #f9d556 100%));
-      color: var(--b-80, rgba(0, 0, 0, 0.8));
-      text-align: center;
-      font-size: 14px;
-      font-weight: 700;
+      margin-top: 9px;
+      .name-left {
+        flex: 1;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: var(--b-80, rgba(0, 0, 0, 0.8));
+        font-size: 14px;
+        font-weight: 700;
+      }
+      .nav-right {
+        flex: 0 0 62px;
+        width: 62px;
+        height: 37px;
+        border-radius: 100px;
+        background: var(--w-60, rgba(255, 255, 255, 0.6));
+        color: var(--b-80, rgba(0, 0, 0, 0.8));
+        text-align: center;
+        font-family: 'HarmonyOS Sans SC';
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: 37px;
+      }
     }
     .name-right {
       display: block;
@@ -264,9 +290,20 @@ const deactivate = () => store.SET_SHOP(null)
       text-align: center;
       line-height: 40px;
     }
-    .shop-name {
+    .nav-right {
+      flex: 0 0 62px;
+      width: 62px;
+      height: 31px;
+      border-radius: 100px;
+      background: var(--w-60, rgba(255, 255, 255, 0.6));
+      color: var(--b-80, rgba(0, 0, 0, 0.8));
       text-align: center;
+      font-size: 14px;
+      font-style: normal;
+      font-weight: 700;
+      line-height: 31px;
     }
+
     &.isFood {
       .qrcode-wrapper {
         background: #ffffff;
diff --git a/src/composables/useHandleScreen.js b/src/composables/useHandleScreen.js
index 00fcab0..310f9fb 100644
--- a/src/composables/useHandleScreen.js
+++ b/src/composables/useHandleScreen.js
@@ -11,7 +11,7 @@ export const useHandleScreen = (callback, screenSaveCallback) => {
   const { currentFloor: device, mapStatus, path } = toRefs(store)
 
   const nativeMethods = computed(() => {
-    return !device.value ? {} : device.value.label === DEVICE.ANDROID ? window.android : window.chrome.webview.hostObjects.sync.csobj
+    return !device.value ? {} : device.value.label === DEVICE.ANDROID ? window.android : window.chrome?.webview?.hostObjects?.sync?.csobj
   })
 
   const state = reactive({