8.10提交代码 糖组检测

This commit is contained in:
zoujiandong
2023-08-10 16:17:27 +08:00
parent 34e177d957
commit 833def112c
33 changed files with 688 additions and 190 deletions
+32 -20
View File
@@ -12,15 +12,16 @@ Page({
height: app.globalData.height,
static_host: api.getStaticHost(),
has_data: false,
data_list_1: [],
data_list_2: [],
data_list_3: [],
data_list_4: [],
data_list_5: [],
data_list_5_loading: false,
data_list_1: [],//在线问诊
data_list_2: [],//快速问诊
data_list_3: [],//公益问诊
data_list_4: [], //问诊购药
data_list_5: [],//糖组检测
data_list_6: [],//问诊结束
data_list_6_loading: false,
conversationList: [],
message_inquiry_type: 99999,
now_message_inquiry_type: 5,
now_message_inquiry_type: 6,
system_notice_unreadnnum: "",
service_notice_unreadnnum: "",
hasOnShow: false,
@@ -37,9 +38,10 @@ Page({
dot_2: false,
dot_3: false,
dot_4: false,
dot_5: false,
},
onLoad() {
// console.log("wenzhen onloadddd");
console.log("wenzhen onloadddd");
// if(wx.$TUIKit){
// wx.$TUIKit.on(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived, this);
@@ -73,7 +75,7 @@ Page({
service_notice_unreadnnum: service_notice_unreadnnum,
})
if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0){
if(_this.data.data_list_1.length > 0 || _this.data.data_list_2.length > 0 || _this.data.data_list_3.length > 0 || _this.data.data_list_4.length > 0 || _this.data.data_list_5.length > 0 || _this.data.data_list_6.length > 0){
_this.setData({
has_data: true
})
@@ -141,6 +143,7 @@ Page({
data_list_3: [],
data_list_4: [],
data_list_5: [],
data_list_6: [],
message_inquiry_type: 9999,
now_message_inquiry_type: 5,
unreadnnum_inter: 0,
@@ -153,6 +156,7 @@ Page({
dot_2: false,
dot_3: false,
dot_4: false,
dot_5: false,
})
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.MESSAGE_RECEIVED, this.$onMessageReceived);
wx.$TUIKit.off(wx.$TUIKitTIM.EVENT.SDK_READY, this.onSDKReady);
@@ -162,7 +166,7 @@ Page({
this.setData({
hasOnShow: false,
message_inquiry_type: 9999,
now_message_inquiry_type: 5,
now_message_inquiry_type: 6,
})
},
onSDKReady(){
@@ -350,7 +354,8 @@ Page({
item.patient_sex = order.patient_sex;
new_conversationList.push(item);
})
}
};
//console.log(new_conversationList);
this.setData({
conversationList: new_conversationList
})
@@ -361,22 +366,26 @@ Page({
},
formatConversationList(){
let session_list = [];
let session_data_list_1 = [];
let session_data_list_2 = [];
let session_data_list_3 = [];
let session_data_list_4 = [];
let session_data_list_5 = [];
let session_data_list_6 = [];
session_list.push(session_data_list_1);
session_list.push(session_data_list_2);
session_list.push(session_data_list_3);
session_list.push(session_data_list_4);
session_list.push(session_data_list_5);
session_list.push(session_data_list_6);
let usertype = wx.getStorageSync('usertype');
let userID = wx.getStorageSync('user_id_'+usertype);
let totalUnreadCount = 0;
let message_inquiry_type = this.data.message_inquiry_type;
console.log("conversationList---------");
console.log(this.data.conversationList);
this.data.conversationList.forEach(item => {
let conversationID = item.conversationID;
if(conversationID == "C2Cadministrator") return;//如果是管理员消息直接跳过
@@ -391,7 +400,7 @@ Page({
if(!order_inquiry_id) return;
let inquiry_type = cloudCustomDataJson.inquiry_type;
if(!inquiry_type) return;
if(inquiry_type > 4) return;
if(inquiry_type > 5) return;
if(inquiry_type < message_inquiry_type){
message_inquiry_type = inquiry_type;
}
@@ -452,17 +461,20 @@ Page({
}
}
session_list[inquiry_type - 1].push(session_item);
console.log("--------------------")
console.log(session_list)
})
wx.setStorageSync(userID+'_wenzhen_info', totalUnreadCount);
console.log(session_data_list_3)
this.setData({
data_list_1: session_data_list_1,
data_list_2: session_data_list_2,
data_list_3: session_data_list_3,
data_list_4: session_data_list_4,
data_list_5: session_data_list_5,
message_inquiry_type: message_inquiry_type
})
wx.stopPullDownRefresh()
@@ -559,21 +571,21 @@ Page({
onReachBottom() {
// console.log('===触底了!!===');
let now_message_inquiry_type = this.data.now_message_inquiry_type;
if(now_message_inquiry_type == 5){
if(now_message_inquiry_type == 6){
if(this.data.current_page < this.data.last_page){//最后一页时停止分页
this.getDoctorInquiryFinishMessage()
}
}
},
getDoctorInquiryFinishMessage(){
let data_list_5 = this.data.data_list_5;
let data_list_6= this.data.data_list_6;
let params = {};
params.page = this.data.current_page + 1;
this.setData({data_list_5_loading: true})
this.setData({data_list_6_loading: true})
api.getDoctorInquiryFinishMessage(params).then(response => {
// console.log(response);
this.setData({
"data_list_5": data_list_5.concat(response.data.data),
"data_list_6": data_list_6.concat(response.data.data),
current_page: response.data.current_page,
total: response.data.total,
per_page: response.data.per_page,
@@ -581,9 +593,9 @@ Page({
})
// this.selectComponent('#tabs').resize();
}).then(res =>{
this.setData({ data_list_5_loading: false})
this.setData({ data_list_6_loading: false})
}).catch(errors => {
this.setData({ data_list_5_loading: false})
this.setData({ data_list_6_loading: false})
console.error(errors);
})
}
+51 -7
View File
@@ -23,11 +23,11 @@
</view>
<view class="empty" wx:if="{{ has_data==false }}" >
<view wx:if="{{!data_list_5_loading}}" class="empty_box">
<view wx:if="{{!data_list_6_loading}}" class="empty_box">
<van-image src="{{static_host}}/applet/doctor/static/images/yishi/wnzhen_empty.png" fit="heightFix" height="108rpx" aria-label="empty" />
<view class="empty_note">未收到任何消息</view>
</view>
<van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
<van-loading size="24px" wx:if="{{data_list_6_loading}}">加载中...</van-loading>
</view>
<!-- <van-button color="#3CC7C0" custom-style="width: 92vw;margin: 0 auto;border-radius: 10rpx;" block wx:if="{{ !has_data }}">开通图文问诊</van-button> -->
@@ -334,8 +334,52 @@
<view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊24小时后自动取消</view>
</view>
</van-tab>
<van-tab title="问诊结束" name="5" wx:if="{{data_list_5.length > 0}}">
<view class="content" wx:for="{{ data_list_5 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
<van-tab title="糖组检测" dot="{{dot_5}}" name="5" wx:if="{{data_list_5.length > 0}}">
<!-- <wenzhen-data
name="{{ item.patient_name }}"
sex="{{ item.patient_sex==1?'男':'女' }}"
age="{{ item.patient_age }}"
date="{{ item.message_send_time }}"
desc="{{ item.last_message_content.Text }}"
status="{{ item.inquiry_status }}"
order_inquiry_id="{{ item.order_inquiry_id }}"
inquiry_type="{{item.inquiry_type}}"
from_account="{{item.from_account}}"
status_text="{{ 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?'已取消':'其他' }}"
note="{{ item.inquiry_status==3?'不接诊24小时后自动取消':'' }}"
message_dot="{{item.message_dot}}"
wx:for="{{ data_list_2 }}"
/> -->
<view class="content" wx:for="{{ data_list_5 }}">
<view class="content_1">
<view class="name">
<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>
<view class="content_2">{{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="btn" wx:if="{{ item.inquiry_status == 3 }}">
<van-button bind:click="go" data-url="/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" bindtap="tabShow"
data-show_dialog_from_account="{{item.from_account}}"
data-show_dialog_order_inquiry_id="{{item.order_inquiry_id}}"
data-show_dialog_inquiry_type="{{item.inquiry_type}}"
custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;margin-left:20rpx;" color="#3CC7C0">去接诊</van-button>
</view>
<view class="btn" wx:if="{{ item.inquiry_status >= 4 }}">
<van-button bind:click="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index" plain custom-style="padding:0 35rpx; height:67rpx; border-radius: 10rpx;" color="#3CC7C0">问诊详情</van-button>
<!-- <van-button bind:click="go" data-url="/Pages/yishi/chat_session/index" plain custom-style="width:200rpx; border-radius: 10rpx;" color="#3CC7C0">会话列表</van-button> -->
</view>
</view>
<view class="content_4" wx:if="{{ item.inquiry_status == 3 }}">不接诊72小时后自动取消</view>
</view>
</van-tab>
<van-tab title="问诊结束" name="6" wx:if="{{data_list_6.length > 0}}">
<view class="content" wx:for="{{ data_list_6 }}" bindtap="goChat" data-from_account="{{item.from_account}}" data-inquiry_type="{{item.inquiry_type}}" data-order_inquiry_id="{{item.order_inquiry_id}}" data-url="/Pages/yishi/chat/index">
<view class="content_1" >
<view class="name">
<text style="font-size: 34rpx;color: #333;">就诊人:</text>
@@ -351,10 +395,10 @@
</view>
<view style="width: 100%;text-align: center;">
<van-loading size="24px" wx:if="{{data_list_5_loading}}">加载中...</van-loading>
<van-loading size="24px" wx:if="{{data_list_6_loading}}">加载中...</van-loading>
</view>
<van-empty description="暂无数据" wx:if="{{data_list_5.length == 0}}" />
<van-divider contentPosition="center" wx:if="{{data_list_5.length > 0 && current_page == last_page}}">到底了~</van-divider>
<van-empty description="暂无数据" wx:if="{{data_list_6.length == 0}}" />
<van-divider contentPosition="center" wx:if="{{data_list_6.length > 0 && current_page == last_page}}">到底了~</van-divider>
</van-tab>
</van-tabs>
</view>