From 02f8c91537b5e8697a1c5e5f82c8bb46c08515ac Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 2 Jul 2024 23:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E5=BA=97=EF=BC=8C=E5=A4=9A=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E5=AE=A2=E6=9C=8D=E5=B1=95=E7=A4=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/realstore/detail/detail.vue | 4 ++--
 pages/plugins/shop/design/design.vue      | 2 +-
 pages/plugins/shop/detail/detail.vue      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 4e1e7e34..ecf7cbd2 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -73,7 +73,7 @@
                                         </view>
                                         <!-- 右侧操作 -->
                                         <view class="icon-list margin-left-main">
-                                            <view v-if="(data_base.is_service_info || 0) == 1" class="icon-item green cr-green border-radius-sm dis-inline-block tc cp" @tap="popup_service_open_event">
+                                            <view v-if="(data_base || null) != null && (data_base.is_service_info || 0) == 1" class="icon-item green cr-green border-radius-sm dis-inline-block tc cp" @tap="popup_service_open_event">
                                                 <iconfont name="icon-mendian-kefu" size="26rpx"></iconfont>
                                             </view>
                                             <view :class="'icon-item red border-radius-sm dis-inline-block tc cp pr ' + (favor_info.status == 1 ? 'cr-red' : 'cr-grey-9')" @tap="favor_event">
@@ -238,7 +238,7 @@
                     </view>
                 </view>
                 <view class="popup-service-container">
-                    <view v-if="(data_base || null) != null && (info || null) != null && (data_base.is_service_info || 0) == 1 && ((info.service_data || null) != null || (info.chat_info || null) != null)" class="header-service">
+                    <view v-if="(info || null) != null && (data_base || null) != null && (data_base.is_service_info || 0) == 1" class="header-service">
                         <view v-if="(info.chat_info || null) != null" class="item padding-main single-text">
                             <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
                             <view class="dis-inline-block chat-info cp" @tap="chat_event">
diff --git a/pages/plugins/shop/design/design.vue b/pages/plugins/shop/design/design.vue
index 5fdd068b..1ad25ed8 100644
--- a/pages/plugins/shop/design/design.vue
+++ b/pages/plugins/shop/design/design.vue
@@ -122,7 +122,7 @@
                     </view>
                 </view>
                 <view class="popup-service-container">
-                    <view v-if="(data_base || null) != null && (shop || null) != null && (data_base.is_service_info || 0) == 1 && ((shop.service_data || null) != null || (shop.chat_info || null) != null)" class="header-service">
+                    <view v-if="(shop || null) != null && (data_base || null) != null && (data_base.is_service_info || 0) == 1" class="header-service">
                         <view v-if="(shop.chat_info || null) != null" class="item padding-main single-text">
                             <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
                             <view class="dis-inline-block chat-info cp" @tap="chat_event">
diff --git a/pages/plugins/shop/detail/detail.vue b/pages/plugins/shop/detail/detail.vue
index 5d952dce..55cf6494 100644
--- a/pages/plugins/shop/detail/detail.vue
+++ b/pages/plugins/shop/detail/detail.vue
@@ -161,7 +161,7 @@
                     </view>
                 </view>
                 <view class="popup-service-container">
-                    <view v-if="(data_base || null) != null && (shop || null) != null && (data_base.is_service_info || 0) == 1 && ((shop.service_data || null) != null || (shop.chat_info || null) != null)" class="header-service">
+                    <view v-if="(shop || null) != null && (data_base || null) != null && (data_base.is_service_info || 0) == 1" class="header-service">
                         <view v-if="(shop.chat_info || null) != null" class="item padding-main single-text">
                             <text class="va-m">{{$t('detail.detail.r4124d')}}</text>
                             <view class="dis-inline-block chat-info cp" @tap="chat_event">