2.23 更新
This commit is contained in:
@@ -58,7 +58,11 @@ Page({
|
||||
_this.setData({
|
||||
has_data: true
|
||||
})
|
||||
_this.selectComponent('#tabs').resize();
|
||||
try {
|
||||
_this.selectComponent('#tabs').resize();
|
||||
} catch (y) {
|
||||
|
||||
}
|
||||
let getCurrentName = _this.selectComponent('#tabs').getCurrentName();
|
||||
let now_message_inquiry_type = _this.data.now_message_inquiry_type;
|
||||
if(getCurrentName != now_message_inquiry_type){
|
||||
@@ -194,6 +198,7 @@ Page({
|
||||
let lastMessage = item.lastMessage;
|
||||
if(!lastMessage) return;
|
||||
let cloudCustomData = lastMessage.cloudCustomData;
|
||||
|
||||
if(!cloudCustomData) return;
|
||||
let cloudCustomDataJson;
|
||||
try {
|
||||
@@ -206,11 +211,20 @@ Page({
|
||||
return;
|
||||
}
|
||||
let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
|
||||
|
||||
order_inquiry_id_list.push(order_inquiry_id);//准备去请求后端那订单状态
|
||||
})
|
||||
let conversationList = arr; //this.data.conversationList;
|
||||
//获取医生问诊消息用户属性
|
||||
api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_id_list.join(",")}).then(response => {
|
||||
let order_inquiry_ids='';
|
||||
order_inquiry_id_list.forEach(item=>{
|
||||
if(order_inquiry_ids){
|
||||
order_inquiry_ids+=','+item;
|
||||
}else{
|
||||
order_inquiry_ids+=item
|
||||
}
|
||||
})
|
||||
api.getDoctorInquiryMessageAttr({order_inquiry_ids: order_inquiry_ids}).then(response => {
|
||||
let new_conversationList = [];
|
||||
if(response.data.length > 0){
|
||||
conversationList.forEach(item => {
|
||||
@@ -362,7 +376,7 @@ Page({
|
||||
|
||||
wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
|
||||
|
||||
console.log(session_data_list_3)
|
||||
console.log(session_data_list_1)
|
||||
this.setData({
|
||||
data_list_1: session_data_list_1,
|
||||
data_list_2: session_data_list_2,
|
||||
@@ -388,7 +402,7 @@ Page({
|
||||
this.setData({
|
||||
show: false
|
||||
})
|
||||
|
||||
console.log(111);
|
||||
// console.log("开始订阅消息");
|
||||
// wx.requestSubscribeMessage({
|
||||
// tmplIds: ['jhYUf91ULCTX_f69hazqAYwImdFf8ELasRAwB6X-MTM'],
|
||||
@@ -406,8 +420,10 @@ Page({
|
||||
//from=end代表从问诊接触过来,from=prescription 代表从处方管理进来
|
||||
//主要处理有新的问诊还停留在老的聊天问诊里的bug。
|
||||
if(from){
|
||||
|
||||
url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type+"&from="+from;
|
||||
}else{
|
||||
|
||||
url = e.currentTarget.dataset.url+"?from_account="+from_account+"&order_inquiry_id="+order_inquiry_id+"&inquiry_type="+inquiry_type;
|
||||
}
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<view class="content" wx:for="{{ data_list_1 }}" wx:key="order_inquiry_id">
|
||||
<view class="content_1">
|
||||
<view class="name">
|
||||
<view class="parallelogram {{item.inquiry_mode==1?'':item.inquiry_mode==2?'video':item.inquiry_mode==6?'yinan':'other'}}">{{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':'其他'}}</view>
|
||||
<view class="parallelogram {{item.inquiry_mode==1?'':item.inquiry_mode==2?'video':item.inquiry_mode==6?'yinan':'other'}}">{{item.inquiry_mode==1?'图文':item.inquiry_mode==2?'视频':item.inquiry_mode==6?'疑难问诊':item.inquiry_mode==7?'附赠回复':'其他'}}</view>
|
||||
<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>
|
||||
@@ -194,7 +194,9 @@
|
||||
<van-tab title="问诊结束" name="6" wx:if="{{data_list_6.length > 0}}">
|
||||
<view class="content" wx:for="{{ data_list_6 }}" wx:key="order_inquiry_id" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}"
|
||||
data-from="end"
|
||||
data-url="/TUIChatKit/pages/index">
|
||||
|
||||
data-url="/TUIChatService/pages/index">
|
||||
<!-- data-url="/TUIChatKit/pages/index" -->
|
||||
<view class="content_1" >
|
||||
<view class="name">
|
||||
<text style="font-size: 34rpx;color: #333;">就诊人:</text>
|
||||
|
||||
Reference in New Issue
Block a user