提交4.34

Pages/yishi/wenzhen_v2/wenzhen.wxml

@@ -47,12 +47,19 @@
               <text style="font-size: 34rpx;color: #333;">就诊人：</text>
               {{item.patient_name}}  {{item.patient_sex==1?'男':'女'}}｜{{item.patient_age}}<t-badge dot="{{item.message_dot || item.inquiry_status==3}}" offset="{{ [-4, 4] }}" content="岁" />
             </view>
-            <view class="date"> {{item.message_send_time}}</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="desc">服务期限：2023.12.31 10:0</view>
+          <view class="desc">服务进度：2023.12.31 10:0</view>
+          </view>
+          <view class="desc" wx:if="{{item.inquiry_mode==9  }}">服务内容：2023.12.31 10:0</view>
           <!-- {{item.last_message_content.message_type}} -->
           <view class="content_2">{{item.custommessagetype==13?'[附赠回复]':item.last_message_content.Text}}</view>
           <view class="content_3">
-            <view class="status">{{ 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 class="status">
+            {{item.message_send_time}}</view>
+            <!-- <view class="status">{{ 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 class="btn" wx:if="{{ item.inquiry_status == 3 }}">
               <van-button bind:click="go" data-url="/user/pages/yishi/case/index?order_inquiry_id={{item.order_inquiry_id}}" plain custom-style="padding:0 35rpx; height:67rpx;  border-radius: 10rpx;" color="#3CC7C0">查看病历</van-button>
               <van-button type="default" 

Pages/yishi/wenzhen_v2/wenzhen.wxss

@@ -82,7 +82,8 @@ page{
 }
 .date{
   font-size: 30rpx;
-  color: #999;
+  color: #FA541C;
+ 
 }
 .content_2{
   background-color: #FAFAFA;
@@ -98,7 +99,7 @@ page{
 }
 .status{
   font-size: 26rpx;
-  color: #FA541C;
+  color: #999;
   flex: 1;
 }
 .status_end{
@@ -181,4 +182,9 @@ page{
 }
 .parallelogram.visit.parallelogram::before{
     background:#03b5e3;
+}
+.desc{
+    margin: 0 30rpx 10rpx;
+    font-size: 28rpx;
+color: #000000;  
 }

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

@@ -48,6 +48,15 @@ Component({
             });
           },
     },
+    serviceInfo:{
+        type: Object,
+        value:{},
+        observer(val){
+            this.setData({
+                serviceInfo:val
+            });
+          }
+    },
     videoInfo:{
         type: Object,
         value:{},
@@ -107,6 +116,7 @@ Component({
     video_dialog_visible:false,
     showTalk:false,
     videoInfo:{},
+    serviceInfo:{},
     baseInfo:{},
     family_id:'',
     patient_user_id:'',
@@ -237,7 +247,7 @@ Component({
       
               let cach_message_rounds = this.data.message_rounds
               message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
-      
+              let {serviceInfo}=this.data;
               const mycloudCustomData = JSON.stringify({
                 order_inquiry_id: this.data.order_inquiry_id,
                 inquiry_type: this.data.inquiry_type,
@@ -245,6 +255,11 @@ Component({
                 message_type: 0,
                 is_system: 0,
                 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_period:serviceInfo.service_period,
+                remaining_quantity:serviceInfo.remaining_quantity,
                 patient_family_data: patient_family_data
               });
              
@@ -796,7 +811,7 @@ this.setData({
 
         let cach_message_rounds = this.data.message_rounds
         message_rounds = cach_message_rounds>message_rounds?cach_message_rounds:message_rounds
-
+      let {serviceInfo}=this.data;
         const mycloudCustomData = JSON.stringify({
           order_inquiry_id: this.data.order_inquiry_id,
           inquiry_type: this.data.inquiry_type,
@@ -804,6 +819,11 @@ this.setData({
           message_type: 0,
           is_system: 0,
           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_period:serviceInfo.service_period,
+          remaining_quantity:serviceInfo.remaining_quantity,
           patient_family_data: patient_family_data
         });
         
@@ -1215,7 +1235,7 @@ this.setData({
 
         const to = this.getToAccount();
         const text = flag ? msg : this.data.message;
-
+        let {serviceInfo}=this.data;
         const { FEAT_NATIVE_CODE } = constant;
         const mycloudCustomData = JSON.stringify({
           order_inquiry_id: this.data.order_inquiry_id,
@@ -1224,6 +1244,11 @@ this.setData({
           message_type: 0,
           is_system: 0,
           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_period:serviceInfo.service_period,
+          remaining_quantity:serviceInfo.remaining_quantity,
           patient_family_data: patient_family_data
         });
         

TUIChatService/TUIKit/components/TUIChat/index.js

@@ -79,7 +79,6 @@ Component({
         type: Object,
         value: {},
         observer(serviceInfo) {
-            console.log(serviceInfo)
             this.setData({
               serviceInfo: serviceInfo
             });

TUIChatService/TUIKit/components/TUIChat/index.wxml

@@ -30,7 +30,7 @@
         <text wx:else>0</text>个沟通回合
         </text>
       </view>
-      <view class="count_time" wx:elif="{{baseInfo.inquiry_status==4 && (baseInfo.inquiry_mode==9 || baseInfo.inquiry_mode==8) }}"> 问诊中 |  <text wx:if="{{serviceInfo.monthly_frequency==0}}" class="red"	decode>&nbsp;不限问诊次数，{{serviceInfo.finish_time}}天后结束</text>
+      <view class="count_time" wx:elif="{{baseInfo.inquiry_status==4 && (baseInfo.inquiry_mode==9 || baseInfo.inquiry_mode==8) }}"> 问诊中 |  <text wx:if="{{serviceInfo.monthly_frequency==0}}" class="red"	decode>&nbsp;不限问诊次数，{{serviceInfo.remaining_finish_day}}天后结束</text>
           <text decode wx:else>&nbsp;当月剩余：<text class="red">{{serviceInfo.monthly_frequency-serviceInfo.month_inquiry_count}}</text>次</text></view>
     </view>
     <view class="right">
@@ -74,7 +74,9 @@
   <view class="input-area" style="{{input_area_style}}" >
     <!-- wx:if="{{showChat}}" -->
     <view class="message-input" style="{{viewData.style}}" >
-      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" isEditTime="{{isEditTime}}" 
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" baseInfo="{{baseInfo}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" from="{{from}}" hasCallKit="{{hasCallKit}}" 
+      serviceInfo="{{serviceInfo}}"
+      isEditTime="{{isEditTime}}" 
       videoInfo="{{videoInfo}}"
       bind:sendMessage="sendMessage"
       bind:freshVideoInfo="getAudioMsg"