Merge branch 'master' into zzx

src/config/index.ts

@@ -19,9 +19,9 @@ const mapEnvVersion = {
    */
   // trial: "http://192.168.1.166:8080/jeecg-boot",
   // trial: 'http://192.168.0.157:8080',
-  trial: 'http://47.109.84.152:8081',
+  // trial: 'http://47.109.84.152:8081',
   // trial: 'http://192.168.1.166:8080',
-  // trial: 'https://smqjh.api.zswlgz.com',
+  trial: 'https://smqjh.api.zswlgz.com',
   /**
    * 正式版
    */

src/pages/index/index.vue

@@ -63,7 +63,7 @@ const navList = computed(() => {
     { icon: `${StaticUrl}/smqjh-jiayou.png`, title: '加油', name: '', show: !isOnlineAudit.value }, // refueling-tabbar
     { icon: `${StaticUrl}/smqjh-jiudian.png`, title: '酒店民宿', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-daijia.png`, title: '代驾', name: '', show: !isOnlineAudit.value },
-    { icon: `${StaticUrl}/smqjh-djk.png`, title: '大健康', name: 'djk-homeTabbar', show: !isOnlineAudit.value },
+    { icon: `${StaticUrl}/smqjh-djk.png`, title: '大健康', name: 'djk-homeTabbar', show: true },
   ]
   return list
 })

src/subPack-djk/shopinfo/index.vue

@@ -13,9 +13,16 @@ onLoad((options: any) => {
   getShopInfo(Number(options.id))
 })
 function handleNav() {
+  if (!shopInfo.value) {
+    useGlobalToast().show('商家信息获取失败！')
+    return
+  }
   uni.openLocation({
-    latitude: Number(shopInfo.value?.shopLat),
-    longitude: Number(shopInfo.value?.shopLng),
+    latitude: Number(shopInfo.value.shopLat),
+    longitude: Number(shopInfo.value.shopLng),
+    fail: (e) => {
+      console.log(e, '打开失败')
+    },
   })
 }
 function handlePhone() {
@@ -27,7 +34,7 @@ function handlePhone() {
 
 <template>
   <view v-if="shopInfo" class="py20rpx">
-    <scroll-view scroll-x class="h165rpx w-full whitespace-nowrap pl24rpx">
+    <scroll-view scroll-x class="box-border h165rpx w-full whitespace-nowrap pl24rpx">
       <view class="w-full flex items-center">
         <view v-for="item in shopInfo.shopLogo?.split(',')" :key="item" class="mr20rpx h164rpx w280rpx flex-shrink-0">
           <image
@@ -51,7 +58,7 @@ function handlePhone() {
           营业中 {{ shopInfo.businessTime }}
         </view>
         <view class="mt20rpx h160rpx flex items-center justify-between bg-cover bg-center px24rpx" :style="{ backgroundImage: `url(${StaticUrl}/djk-shop-nav-bg.png)` }">
-          <view class="flex items-center">
+          <view class="line-clamp-2 w450rpx flex items-center">
             <image
               :src="`${StaticUrl}/location-black.png`"
               class="mr16rpx h-33.8rpx min-w-28.97rpx w-28.97rpx"