提交4.34

2024-04-24 18:42:59 +08:00
parent e5678bf2e5
commit 71c614dba4
5 changed files with 49 additions and 10 deletions
@@ -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
        });
        
@@ -79,7 +79,6 @@ Component({
        type: Object,
        value: {},
        observer(serviceInfo) {
-            console.log(serviceInfo)
            this.setData({
              serviceInfo: serviceInfo
            });
@@ -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"