修复展示服务包详情

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

@@ -57,7 +57,7 @@
           </view>
           <view wx:for="{{careDetail.items}}" wx:key="id">
             <!-- 线下操作-->
-            <view class="scheme-card" wx:if="{{item.patientConditioningOfflines && item.patientConditioningOfflines.length>0}}">
+            <view class="scheme-card" wx:if="{{item.conditioningProgramDetail.isOffline && item.conditioningProgramDetail.isOffline==='Y'}}">
               <view class="scheme-title" wx:if="{{item.conditioningProgramDetail && item.conditioningProgramDetail.name && item.conditioningProgramDetail.name!=='null'}}">{{item.conditioningProgramDetail.name}}</view>
               <view class="divider"></view>
               <image class="scheme-img" src="{{item.conditioningProgramDetail.photo}}" mode="aspectFill" wx:if="{{item.conditioningProgramDetail.photo}}" />
@@ -71,15 +71,15 @@
                     <text style="color:black">{{item.totalMeasure}}次</text>
                   </text>
                 </text>
-                <text class="link" bindtap="onRecord" data-id="{{item.id}}">核销记录</text>
+                <text class="link" bindtap="onRecord" data-id="{{item.id}}" wx:if="{{item.conditioningProgramDetail.isOffline && item.conditioningProgramDetail.isOffline==='Y'}}">核销记录</text>
               </view>
               <view class="scheme-row">
                 <text class="text-gray">频次：</text>
-                每 {{item.frequencyType}}天{{item.frequencyMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit}}
+                每 {{item.frequencyType}}天{{item.frequencyMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit || '次'}}
               </view>
               <view class="scheme-row">
                 <text class="text-gray">机构：</text>
-                {{item.conditioningProgramDetail.institutionName}}
+                {{item.conditioningProgramDetail.conditioningProgramSupplierName}}
               </view>
               <view class="scheme-bottom" wx:if="{{item.actualStartDate}}">
                 <text class="next-time" wx:if="{{item.arrangeDate}}">下一次时间：{{item.arrangeDate}}</text>
@@ -90,10 +90,10 @@
               </view>
             </view>
             <!-- 线上操作 -->
-            <view class="scheme-card" wx:key="id" wx:if="{{item.patientConditioningOnlines && item.patientConditioningOnlines.length>0}}">
+            <view class="scheme-card" wx:if="{{item.conditioningProgramDetail.isOffline && item.conditioningProgramDetail.isOffline==='N'}}">
               <view class="scheme-title">{{item.conditioningProgramDetail.name}}</view>
               <view class="divider"></view>
-              <image class="scheme-img" rc="{{item.conditioningProgramDetail.photo}}" mode="aspectFill" wx:if="{{item.conditioningProgramDetail.photo}}" />
+              <image class="scheme-img" src="{{item.conditioningProgramDetail.photo}}" mode="aspectFill" wx:if="{{item.conditioningProgramDetail.photo}}" />
               <view class="scheme-row light">
                 <text class="text-gray">数量：</text>
                 {{item.totalMeasure}}
@@ -105,11 +105,11 @@
                 </text>
               </view>
               <view class="desc-row">
-                <text class="desc-label">{{item.remark}}</text>
+                <text class="desc-label">{{item.remark || ''}}</text>
               </view>
             </view>
             <!-- 健康评估-->
-            <view class="scheme-card" wx:if="{{item.healthAnalysisReports && item.healthAnalysisReports.length>0}}">
+            <view class="scheme-card" wx:if="{{item.conditioningProgramDetail.conditioningProgramType && item.conditioningProgramDetail.conditioningProgramType==='健康评估'}}">
               <view class="scheme-title">{{item.conditioningProgramDetail.name}}</view>
               <view class="divider"></view>
               <image class="scheme-img" src="{{item.conditioningProgramDetail.photo}}" mode="aspectFill" wx:if="{{item.conditioningProgramDetail.photo}}" />
@@ -122,15 +122,15 @@
                     <text style="color:black">{{item.totalMeasure}}次</text>
                   </text>
                 </text>
-                <text class="link" bindtap="onReport" data-id="{{item.id}}">健康分析报告</text>
+                <text class="link" bindtap="onReport" data-id="{{item.id}}" wx:if="{{item.conditioningProgramDetail.conditioningProgramType && item.conditioningProgramDetail.conditioningProgramType==='健康评估'}}">健康分析报告</text>
               </view>
               <view class="scheme-row">
                 <text class="text-gray">频次：</text>
-                每 {{item.frequencyType}}天{{item.frequencyMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit}}
-              </view>
-              <view class="scheme-row">
-                <text class="text-gray">机构：</text>
-                {{item.conditioningProgramDetail.institutionName}}
+                <view wx:if="{{item.frequencyType==='不限'}}">{{item.frequencyType}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit}}</view>
+                <view wx:else>
+                  每 {{item.frequencyType}}天{{item.frequencyMeasure}}{{item.conditioningProgramDetail.cpFixedPricingRule.convertUnit}}
+                </view>
+              
               </view>
               <view class="desc-row">
                 <text class="text-gray">操作指南：</text>