医生消息展示4.25

Pages/yishi/wenzhen_v2/wenzhen.js

@@ -307,6 +307,17 @@ Page({
       let cloudCustomData = lastMessage.cloudCustomData;
       if(!cloudCustomData) return;
       let cloudCustomDataJson = JSON.parse(cloudCustomData);
+          //   remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count,
+    //   service_package_start_time:serviceInfo.start_time,
+    //   service_package_finish_time:serviceInfo.finish_timestart_time,
+    //   service_period:serviceInfo.service_period,
+    //   remaining_quantity:serviceInfo.remaining_quantity,
+    let remaining_month_inquiry_count=cloudCustomDataJson.remaining_month_inquiry_count;
+    let service_package_start_time=cloudCustomDataJson.service_package_start_time;
+    let service_package_finish_time=cloudCustomDataJson.service_package_finish_time;
+    let remaining_quantity=cloudCustomDataJson.remaining_quantity;
+    let service_period=cloudCustomDataJson.service_period;
+    let monthly_frequency=cloudCustomDataJson.monthly_frequency;
       let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
       if(!order_inquiry_id) return;
       let inquiry_type = cloudCustomDataJson.inquiry_type;
@@ -354,6 +365,13 @@ Page({
       txt.Text= lastMessage.messageForShow;
       session_item.last_message_content = txt;
       session_item.message_send_time = getTimeAgo(lastMessage.lastTime);
+
+      session_item.remaining_month_inquiry_count=remaining_month_inquiry_count;
+      session_item.service_package_start_time=service_package_start_time;
+      session_item.service_package_finish_time=service_package_finish_time;
+      session_item.service_period=service_period;
+      session_item.remaining_quantity=remaining_quantity;
+      session_item.monthly_frequency= monthly_frequency;
       session_item.message_type = type;
       session_item.order_inquiry_id = order_inquiry_id;
       session_item.inquiry_type = inquiry_type;

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -49,11 +49,21 @@
             </view>
             <view class="date">{{ item.inquiry_status==1?'待支付':item.inquiry_status==2?'待分配':item.inquiry_status==3?'待接诊':item.inquiry_status==4?'接诊中':item.inquiry_status==5?'已完成':item.inquiry_status==6?'已结束':item.inquiry_status==7?'已取消':'其他' }}</view>
           </view>
-          <view class="descbox" wx:if="{{item.inquiry_mode==9}}">
+          <view class="descbox" wx:if="{{item.inquiry_mode==9 && item.inquiry_status==4}}">
-            <view class="desc">服务期限：2023.12.31 10:0</view>
+            <view class="desc">服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}}</view>
-          <view class="desc">服务进度：2023.12.31 10:0</view>
+          <view class="desc" wx:if="{{item.monthly_frequency==='0'}}">服务进度：不限次数问诊</view>
+          <view class="desc" wx:else>服务进度：当月剩余{{item.remaining_month_inquiry_count}}次问诊</view>
           </view>
-          <view class="desc" wx:if="{{item.inquiry_mode==9  }}">服务内容：2023.12.31 10:0</view>
+          <view class="desc" wx:if="{{item.inquiry_mode==9 && item.inquiry_status==3 }}">服务内容：服务周期{{item.service_period/30}}个月</view>
+          <view class="descbox" wx:if="{{item.inquiry_mode==8 && item.inquiry_status==4}}">
+            <view class="desc">服务期限：{{item.service_package_start_time}}-{{item.service_package_finish_time}}</view>
+          <view class="desc" >服务进度：<text wx:if="{{item.monthly_frequency==='0'}}">当月不限次问诊</text>
+          <text wx:else>当月剩余{{item.remaining_month_inquiry_count}}次问诊</text>,剩余{{item.remaining_quantity}}盒干爽颗粒（步长）
+
+          </view>
+         
+          </view>
+          <view class="desc" wx:if="{{item.inquiry_mode==8 && item.inquiry_status==3 }}">服务内容：{{item.monthly_frequency==='0'?'不限':item.monthly_frequency}}次问诊/月,30盒肝爽颗粒（步长）</view>
           <!-- {{item.last_message_content.message_type}} -->
           <view class="content_2">{{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}}</view>
           <view class="content_3">

TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js

@@ -257,9 +257,10 @@ Component({
                 message_rounds: message_rounds,
                 remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count,
                 service_package_start_time:serviceInfo.start_time,
-                service_package_finish_time:serviceInfo.finish_timestart_time,
+                service_package_finish_time:serviceInfo.finish_time,
                 service_period:serviceInfo.service_period,
                 remaining_quantity:serviceInfo.remaining_quantity,
+                monthly_frequency:serviceInfo.monthly_frequency,
                 patient_family_data: patient_family_data
               });
              
@@ -821,9 +822,10 @@ this.setData({
           message_rounds: message_rounds,
           remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count,
           service_package_start_time:serviceInfo.start_time,
-          service_package_finish_time:serviceInfo.finish_timestart_time,
+          service_package_finish_time:serviceInfo.finish_time,
           service_period:serviceInfo.service_period,
           remaining_quantity:serviceInfo.remaining_quantity,
+          monthly_frequency:serviceInfo.monthly_frequency,
           patient_family_data: patient_family_data
         });
         
@@ -1246,9 +1248,10 @@ this.setData({
           message_rounds: message_rounds,
           remaining_month_inquiry_count:serviceInfo.remaining_month_inquiry_count,
           service_package_start_time:serviceInfo.start_time,
-          service_package_finish_time:serviceInfo.finish_timestart_time,
+          service_package_finish_time:serviceInfo.finish_time,
           service_period:serviceInfo.service_period,
           remaining_quantity:serviceInfo.remaining_quantity,
+          monthly_frequency:serviceInfo.monthly_frequency,
           patient_family_data: patient_family_data
         });