优化聊天

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js

@@ -1,5 +1,6 @@
 import formateTime from '../../../../../utils/formate-time';
 import constant from '../../../../../utils/constant';
+const app = getApp()
 // eslint-disable-next-line no-undef
 Component({
   /**
@@ -144,6 +145,7 @@ Component({
           const renderDom = [{
             type: 'prescribe',
             product_name: data.product_name,
+            order_inquiry_id: data.order_inquiry_id,
             order_prescription_id: data.order_prescription_id,
             pharmacist_verify_time: data.pharmacist_verify_time.substring(0,10),
           }];
@@ -209,5 +211,9 @@ Component({
         });
       }
     },
+    go(e){
+      let url = e.currentTarget.dataset.url;
+      app.go(url);
+    }
   },
 });

TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml

@@ -54,7 +54,10 @@
     <view class="evaluation_button">点击评价</view>
   </view>
   <!-- 自定义开处方样式 -->
-  <view wx:if="{{renderDom[0].type==='prescribe'}}" class="gdxz_custom_order_prescribe_message" bindtap="toBuy">
+  <view wx:if="{{renderDom[0].type==='prescribe'}}" 
+  class="gdxz_custom_order_prescribe_message" 
+  data-url="/Pages/yishi/onlinechufang/index?order_inquiry_id={{renderDom[0].order_inquiry_id}}&order_prescription_id={{renderDom[0].order_prescription_id}}&from=chat"
+  bindtap="go">
     <view class="prescribe_title">
       处方已开具
     </view>

TUIKit/components/TUIChat/components/MessageList/index.js

@@ -86,7 +86,6 @@ Component({
     errorMessage: {},
     errorMessageID: '',
     typingMessage: {},
-
   },
 
   lifetimes: {

TUIKit/components/TUIChat/components/MessageList/index.wxss

@@ -16,6 +16,8 @@
 .t-message{
   position: relative;
   z-index: -9;
+  width: calc(100vw - 20rpx);
+  padding: 0 10rpx;
 }
 .t-recieve-message {
   display: flex;
@@ -35,7 +37,6 @@
   display: flex;
   flex-direction: row;
   justify-content: flex-end;
-  width: 100vw;
   word-break: break-all;
 }
 .t-self-message-body {

TUIKit/components/TUIChat/index.js

@@ -60,6 +60,15 @@ Component({
         });
       },
     },
+    baseInfo: {
+      type: Object,
+      value: {},
+      observer(baseInfo) {
+        this.setData({
+          "navbarData.title": baseInfo.patient_family_name
+        });
+      },
+    }
   },
 
   lifetimes: {
@@ -92,7 +101,8 @@ Component({
 
     },
     ready() {
-      this.getInquiryMessageBasic()
+      //修改为组件传值
+      // this.getInquiryMessageBasic()
     }
   },
   /**
@@ -127,7 +137,6 @@ Component({
       showCapsule: 2, //是否显示左上角图标   1表示显示    0表示不显示
       title: '', //导航栏 中间的标题
     },
-    baseInfo: {},
     navbar_height: 0,
     dialog_visible: false,
 
@@ -151,7 +160,7 @@ Component({
     confirmDialog(){
       api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
         console.log(response);
-        
+        this.getInquiryMessageBasic()
       }).catch(errors => {console.error(errors);})
       this.setData({
         dialog_visible: false
@@ -164,7 +173,6 @@ Component({
         console.log(response);
         this.setData({
           baseInfo: response.data,
-          "navbarData.title": response.data.patient_name
         })
       }).catch(errors => {console.error(errors);})
     },
@@ -263,7 +271,7 @@ Component({
       setNewInputStyle(event.detail.event.detail.height);
       this.setData({
         'viewData.style': newInputStyle,
-        input_area_style: "position: absolute;  bottom: 30px;"
+        input_area_style: "position: absolute;  bottom: 45rpx;"
       });
     },
     // 监听键盘，失去焦点时收起键盘

TUIKit/components/TUIChat/index.wxml

@@ -3,12 +3,12 @@
 <view class="container">
   <view class="info" wx:if="{{ true }}">
   <view class="left">
-    <view class="name">{{baseInfo.patient_name}}</view>
-    <view class="age">{{baseInfo.patient_sex==1?'男':'女'}}｜{{baseInfo.patient_age}}岁</view>
-    <view class="status">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
+    <view class="name">{{baseInfo.patient_family_name}}</view>
+    <view class="age">{{baseInfo.patient_family_sex==1?'男':'女'}}｜{{baseInfo.patient_family_age}}岁</view>
+    <view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}">{{baseInfo.inquiry_status==1?'待支付':baseInfo.inquiry_status==2?'待分配':baseInfo.inquiry_status==3?'待接诊':baseInfo.inquiry_status==4?'已接诊':baseInfo.inquiry_status==5?'已完成':baseInfo.inquiry_status==6?'已结束':baseInfo.inquiry_status==7?'已取消':'未知'}}</view>
   </view>
   <view class="right">
-    <text class="right_txt" bindtap="putDoctorInquiryFinish">结束问诊</text>
+    <text class="right_txt" bindtap="putDoctorInquiryFinish" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
   </view>
 </view>
 
@@ -30,20 +30,20 @@
   <view class="group-profile">
     <TUIGroup id="TUIGroup" wx:if="{{isShow}}" conversation="{{conversation}}" bind:groupCall="groupCall" bind:showConversationList="showConversationList"></TUIGroup>
   </view>
-  <view class="input-area" style="{{input_area_style}}">
-  <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
-    <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
-    bind:handleCall="handleCall" ></MessageInput>
+  <view class="input-area" style="{{input_area_style}}" wx:if="{{baseInfo.inquiry_status == 4}}">
+    <view class="message-input" style="{{viewData.style}}" wx:if="{{showChat}}">
+      <MessageInput bind:myhandleExtensions="myhandleExtensions" id="MessageInput" inquiry_type="{{inquiry_type}}" order_inquiry_id="{{order_inquiry_id}}" conversation="{{conversation}}" hasCallKit="{{hasCallKit}}" bind:sendMessage="sendMessage" bind:downKeysBoards="downKeysBoards" bind:pullKeysBoards="pullKeysBoards" bind:showMessageErrorImage="showMessageErrorImage" 
+      bind:handleCall="handleCall" ></MessageInput>
+    </view>
   </view>
-  </view>
-  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;">
+  <view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
     
   </view>
 </view>
 <t-dialog
   visible="{{ dialog_visible }}"
   title="温馨提示"
-  content="您确认结束问诊？"
+  content="确定要结束问诊么？"
 >
 <view slot="cancel-btn" class="dialog dialog_cancel_btn" bindtap="cancelDialog">
   取消

TUIKit/components/TUIChat/index.wxss

@@ -2,6 +2,7 @@
   width: 100vw;
   height: 100vh;
   background-color: #F4F4F4;
+  z-index: 0;
 }
 .safetytips-box{
   background: rgba(255, 149, 0, 0.1);
@@ -97,7 +98,8 @@
 }
 .input-area {
   position: relative;
-  z-index: 999999;
+  z-index: 2;
+  /* z-index: 999999; */
   /* position: absolute;
   bottom: 20px; */
 }
@@ -111,7 +113,7 @@
   width: 100%;
   padding-bottom: var(--padding);
   background-color: #ffffff;
-  z-index: 999999;
+  /* z-index: 999999; */
 }
 .calling {
   position: fixed;
@@ -173,6 +175,9 @@
   color: #FA541C;
   padding: 10rpx 20rpx;
 }
+.status_complete{
+  color: #C5C5C5;
+}
 .dialog{
   width: 50%;
   text-align: center;