Merge branch 'feature/bug-197' of ssh://121.43.162.141:10022/six.fe/health.applet into release/2.0.1

# Conflicts:
#	miniprogram/module/care/pages/careDetail/careDetail.ts

miniprogram/module/care/pages/careDetail/careDetail.ts

@@ -21,7 +21,6 @@ Page({
     healthReports: [],
     statusText: "未知状态",
     loading: true,
-    isShow: false,
     isShowDelivery: false,
   },
   onCardRecord(e: any) {
@@ -64,7 +63,7 @@ Page({
           });
           res.items.forEach((item: any) => {
             item.carouselMediaList = [];
-           
+
            // 添加photo
            if (item.conditioningProgramDetail?.photo) {
              item.carouselMediaList.push({
@@ -73,7 +72,7 @@ Page({
                title: '商品图片'
              });
            }
-           
+
            // 添加itemImgFirst
            if (item?.conditioningProgramDetail?.itemImgFirst) {
              item.carouselMediaList.push({
@@ -82,7 +81,7 @@ Page({
                title: '操作图片'
              });
            }
-           
+
            // 添加itemVideoFirst
            if (item?.conditioningProgramDetail?.itemVideoFirst) {
              item.carouselMediaList.push({
@@ -91,7 +90,7 @@ Page({
                title: '操作视频'
              });
            }
-        
+
            });
         }
         this.setData({
@@ -102,7 +101,11 @@ Page({
         console.log(res, "服务包详情数据");
         let isShowDelivery = false;
         console.log(res.items, "服务包详情数据");
-      
+        if (res.items.length > 0) {
+          isShowDelivery = res.items.some((item: any) => {
+            return item.conditioningProgramDetail?.isDelivery === "Y";
+          });
+        }
         this.setData({
           isShowDelivery,
         });
@@ -135,17 +138,11 @@ Page({
           careDetail: {},
         });
       }
-      if (JSON.stringify(this.data.careDetail) !== "{}") {
-        this.setData({
-          isShow: true,
-        });
-      } else {
-        this.setData({
-          isShow: false,
-        });
-      }
-    } catch (error) {
-      console.log(error);
+    } catch (error: any) {
+      wx.showToast({
+        title: error.message,
+        icon: "none",
+      });
       wx.hideLoading();
       this.setData({
         isShow: false,

miniprogram/module/care/pages/careDetail/careDetail.wxml

@@ -5,7 +5,6 @@
     scroll-y 
   >
     <block wx:if="{{!loading}}">
-      <block wx:if="{{isShow}}">
         <!-- 调理中卡片 -->
         <view class="info-card card-content">
           <view class="status-tag">
@@ -255,9 +254,5 @@
           </view>
         </view>
       </block>
-      <block wx:else>
-        <t-empty icon="info-circle-filled" description="暂无数据" />
-      </block>
-    </block>
   </scroll-view>
 </view>