This commit is contained in:
haomingming
2023-03-31 17:24:25 +08:00
parent 52742fdbd9
commit df9a526b7b
12 changed files with 97 additions and 28 deletions
@@ -159,11 +159,11 @@ Component({
}).then((res) => {
let HMM_data = res.data;//HMM
let HMM_messageList_del = [];
console.log("HMM getMessageList: ", HMM_data);
// console.log("HMM getMessageList: ", HMM_data);
let HMM_messageList = HMM_data.messageList;
HMM_messageList.forEach(item => {
let HMM_type = item.type;
console.log(item)
// let HMM_type = item.type;
// console.log(item)
//去除自定义消息
// if(HMM_type == "TIMCustomElem") return;
let show_avatar = this.checkShowAvatar(item);
@@ -186,9 +186,9 @@ Component({
}
},
checkShowAvatar(message){
console.log("checkShowAvatar ");
// console.log("checkShowAvatar ");
let type = message.type;
console.log("message type: ", type);
// console.log("message type: ", type);
let show_avatar = true;
if(type === "TIMCustomElem"){
const customMessage = JSON.parse(message.payload.data);
@@ -268,7 +268,7 @@ Component({
});
} catch (error) {
}
if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING) || item.type !== MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM) {
if ((item.type === MESSAGE_TYPE_TEXT.TIM_CUSTOM_ELEM && this.data.typingMessage.businessID !== BUSINESS_ID_TEXT.USER_TYPING)) {
this.data.showNewMessageCount.push(message);
this.setData({
showNewMessageCount: this.data.showNewMessageCount,
+7 -5
View File
@@ -103,11 +103,11 @@ Component({
ready() {
//修改为组件传值
// this.getInquiryMessageBasic()
console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
// console.log("app.globalData.scene from TUIchat ready: ", app.globalData.scene);
let pages = getCurrentPages();
console.log("pages:", pages)
console.log("pages.length:", pages.length)
console.log("pages:", pages[0])
// console.log("pages:", pages)
// console.log("pages.length:", pages.length)
// console.log("pages:", pages[0])
if(pages.length == 1){
console.log("navbarData.showCapsule");
this.setData({
@@ -171,7 +171,9 @@ Component({
confirmDialog(){
api.putDoctorInquiryFinish({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
console.log(response);
this.getInquiryMessageBasic()
this.getInquiryMessageBasic();
//调用子组件中的跳到最新消息
this.selectComponent('#MessageList').handleJumpNewMessage();
}).catch(errors => {console.error(errors);})
this.setData({
dialog_visible: false
+3 -3
View File
@@ -5,7 +5,7 @@
<view class="left">
<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 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" wx:if="{{baseInfo.inquiry_status==4}}">结束问诊</text>
@@ -16,7 +16,7 @@
<image class="tui-navigatorbar-back" bindtap="goBack" src="../../static/assets/ic_back_black.svg" />
<view class="conversation-title">{{conversationName}}</view>
</view> -->
<view class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}} || {{ showAll && 'list-box-group-notips'}}" style="height: calc(100vh - 197rpx - 100rpx - {{navbar_height}}px);">
<view class="list-box {{ showTips && 'list-box-notips'}} || {{ showGroupTips && 'list-box-group'}} || {{ showAll && 'list-box-group-notips'}}" style="height: calc(100vh {{baseInfo.inquiry_status==4?'- 197rpx':'+ 20px'}} - 100rpx - {{navbar_height}}px);"><!-- 100vh -input-area高度 - info高度 -navbar高度 -->
<!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
<!-- <view class="safetytips">
<text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能,不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息,勿轻易拨打陌生电话,谨防上当受骗。</text>
@@ -36,7 +36,7 @@
bind:handleCall="handleCall" ></MessageInput>
</view>
</view>
<view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;">
<view style="height: 40px;position: fixed;bottom: 0;width: 100%;background-color: #fff;z-index: 1;" wx:if="{{baseInfo.inquiry_status==4}}">
</view>
</view>