gdxz/miniprogram-doctor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.18医生

Browse Source
This commit is contained in:
zoujiandong
2024-03-18 18:50:29 +08:00
parent d37fb6b1de
commit a9edbc3489
112 changed files with 4490 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TUIChatService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.js
+3 -5
View File
@@ -228,14 +228,13 @@ Component({
}];
return renderDom;
}
//13 SEND_TALK
if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.SEND_TALK){
//13 SEND_TALK 14
if (customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.SEND_TALK || customMessage.message_type === GDXZ_CUSTOM_MSEEAGE.RECOMMEND_TALK){
const renderDom = [{
type: 'send_talk',
title: customMessage.title,
desc: customMessage.desc,
}];
return renderDom;
}
@@ -246,8 +245,7 @@ Component({
const renderDom = [{
type: 'video_time',
title: customMessage.title,
desc: customMessage.desc,
desc: customMessage.desc.replace(/text/g,'span')
}];
return renderDom;
}
TUIChatService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxml
+4 -2
View File
@@ -35,7 +35,9 @@
<view class="custom-content-text">{{renderDom[0].text}}</view>
</view>
<view wx:if="{{renderDom[0].type ==='c2cCalling' || renderDom[0].type ==='groupCalling'}}" class="call-message {{isMine?'my-text':'your-text'}}" >
<image src="{{isMine?'../../../../../static/images/video-right.png':'../../../../../static/images/video-left.png'}}" mode="" class="{{isMine?'classImgright':'classImgleft'}}"/>
<view class="custom-content-text">{{renderDom[0].text}}</view>
</view>
<!-- <view wx:if="{{renderDom[0].type ==='notSupport'}}" class="message-body-span text-message" >
<view class="message-body-span-text">{{renderDom[0].text}}</view>
@@ -144,10 +146,10 @@
</view>
</view>
<view class="videotime" wx:if="{{renderDom[0].type==='video_time'}}" >
{{renderDom[0].desc}}
<rich-text nodes="{{renderDom[0].desc}}"></rich-text>
</view>
<view class="videotime" wx:if="{{renderDom[0].type==='send_talk'}}" >
{{renderDom[0].desc}}
<rich-text nodes="{{renderDom[0].desc}}"></rich-text>
</view>
</view>
TUIChatService/TUIKit/components/TUIChat/components/MessageElements/CustomMessage/index.wxss
+22
View File
@@ -422,6 +422,7 @@ color: #666666;
}
.call-message.my-text {
max-width: 60vw;
flex-direction: row-reverse;
min-height: 50rpx;
padding: 10rpx 24rpx;
line-height: 50rpx;
@@ -469,4 +470,25 @@ color: #666666;
text-align: center;
line-height: 44rpx;
color: rgba(0,0,0,0.65);
}
.classImgleft{
width:30rpx;
height:30rpx;
margin-right:10rpx;
}
.classImgright{
margin-top: 4rpx;
width:30rpx;
height:30rpx;
margin-left:10rpx;
}
.call-message{
display: flex;
align-items: center;
}
.tipColor{
color:#3BB5FE;
}
.tipRoundsColor{
color: #FF4D4F;
}
TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.js
+42 -8
View File
@@ -148,9 +148,10 @@ Component({
recordtime:0,
dialog_message: "在线开处方需先进行多点执业认证",
message_rounds: 0,
times_number:'',
duration:'',
times_number:2,
duration:7,
networkstatus: "wifi",
defaultRoundIndex:0,
static_host: api.getStaticHost(),
formatter(type, value) {
if (type === 'year') {
@@ -333,6 +334,12 @@ Component({
* 组件的方法列表
*/
methods: {
onClickHide(){
this.setData({
showTalk:false
})
},
noop() {},
sendTalk(){
let {order_inquiry_id,duration,times_number}=this.data;
if(times_number==''){
@@ -382,6 +389,17 @@ Component({
})
},
openRound(){
let {duration,columnsRound}=this.data;
for (let i = 0; i < columnsRound.length; i++) {
if(columnsRound[i]==duration){
this.setData({
defaultRoundIndex:i
});
break;
};
}
this.setData({
showRound:true
})
@@ -410,7 +428,7 @@ Component({
title: '预约成功',
icon:"none"
})
this.triggerEvent("freshVideoInfo")
this.triggerEvent("freshVideoInfo");
}
}).catch(errors => {
@@ -425,7 +443,9 @@ Component({
call() {
let {baseInfo}=this.data;
console.log(baseInfo)
wx.setStorage('patientInfo',{
wx.setStorage({
key:'patientInfo',
data:{
order_inquiry_id:baseInfo.order_inquiry_id,
inquiry_type:baseInfo.inquiry_type,
inquiry_mode:baseInfo.inquiry_mode,
@@ -436,18 +456,22 @@ Component({
patient_sex:baseInfo.patient_family_sex,
patient_age:baseInfo.patient_family_age
},
is_system:0
is_system:1
}
}
)
api.geRoomId({
order_inquiry_id:baseInfo.order_inquiry_id
}).then(async(res)=>{
let result=res.data;
console.log("userID:"+this.data.patient_user_id)
TUICallKitServer.setLogLevel(0);
await TUICallKitServer.call({
userID: this.data.patient_user_id,
type: 2,
roomID:Number(result)
});
this.triggerEvent("freshVideoInfo");
})
},
@@ -1470,9 +1494,19 @@ Component({
app.go("/user/pages/yishi/write_sickform/index?order_inquiry_id="+this.data.order_inquiry_id)
},
showSendTalk(){
this.setData({
showTalk:true
})
let {baseInfo,message_rounds}=this.data;
console.log(message_rounds)
if(baseInfo.inquiry_status==4 || baseInfo.inquiry_status==5){
this.setData({
showTalk:true
})
}else{
wx.showToast({
title: '结束问诊或患者回合沟通数为0后才可赠送患者沟通回合数',
icon:'none',
})
}
}
},
TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxml
+5 -5
View File
@@ -3,7 +3,7 @@
<view class="TUI-commom-function-item" data-key="10" bindtap="handleCommonFunctions">查看完整病历</view>
<view class="TUI-commom-function-item" data-key="11" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1}}">在线开处方</view>
<view class="TUI-commom-function-item" data-key="12" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1 && !videoInfo.is_reservation_time && baseInfo.inquiry_mode==2 }}">预约视频时间</view>
<view class="TUI-commom-function-item" data-key="13" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1 && videoInfo.is_reservation_time && videoInfo.is_video==0 && baseInfo.inquiry_mode==2 }}">发起视频</view>
<view class="TUI-commom-function-item" data-key="13" bindtap="handleCommonFunctions" wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1 && videoInfo.is_reservation_time && baseInfo.inquiry_mode==2 }}">发起视频</view>
<!-- wx:if="{{baseInfo.multi_point_status == 1 && baseInfo.inquiry_status==4 && baseInfo.multi_point_enable==1 && videoInfo.is_reservation_time && videoInfo.is_video==0 }}" -->
</view>
<view class="TUI-message-input">
@@ -63,7 +63,7 @@
<image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="{{static_host}}/applet/doctor/static/images/yishi/wenzhenicon.png" />
<view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">问诊表</view>
</view>
<view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showSendTalk" wx:if="{{baseInfo.inquiry_status==5}}">
<view class="TUI-Extension-slot MY-TUI-Extension-slot" bindtap="showSendTalk" >
<image mode="widthFix" class="TUI-Extension-icon MY-TUI-Extension-icon" src="../../../../static/images/talk.png" style="width:70rpx;height:70rpx;padding:18rpx"/>
<view class="TUI-Extension-slot-name MY-TUI-Extension-slot-name">赠送沟通</view>
</view>
@@ -163,9 +163,9 @@
立即发起
</view>
</t-dialog>
<van-overlay show="{{ showTalk }}" z-index="9900">
<van-overlay show="{{ showTalk }}" z-index="9900" bind:click="onClickHide">
<view class="wrapper">
<view class="custombox">
<view class="custombox" catch:tap="noop">
<view class="title">赠送患者免费图文回合沟通数</view>
<view class="roundBox">
<view class="lname">回合数</view>
@@ -208,7 +208,7 @@ z-index="9901"
position="bottom"
custom-style="height: 50%"
>
<van-picker columns="{{ columnsRound }}" show-toolbar
<van-picker columns="{{ columnsRound }}" default-index="{{defaultRoundIndex}}" show-toolbar
title="选择回合天数" bind:cancel="onCancelRound"
bind:confirm="onConfirmRound" />
</van-popup>
TUIChatService/TUIKit/components/TUIChat/components/MessageInput/index.wxss
+1 -1
View File
@@ -282,4 +282,4 @@ color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
}
}
TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.js
+56 -5
View File
@@ -59,6 +59,7 @@ Component({
unreadCount: '',
conversation: {}, // 当前会话
baseInfo:{},
sendTalkEnable:true,
messageList: [],
// 自己的 ID 用于区分历史消息中，哪部分是自己发出的
scrollView: '',
@@ -344,11 +345,27 @@ Component({
let order_inquiry_id = cloudCustomDataJson.order_inquiry_id;
let now_order_inquiry_id = this.data.order_inquiry_id
let payload = message.payload.data;
if(order_inquiry_id != now_order_inquiry_id){
return
return;
// if(payload){
// const payload_Data = JSON.parse(message.payload.data);
// if( payload_Data && payload_Data.message_type!=13){
// return
// }else{
// this.setData({
// message_rounds: 0
// })
// console.log('刷新refreshMessageRounds')
// var myEventOption = {}
// myEventOption.message_rounds = 0
// this.triggerEvent('refreshMessageRounds', myEventOption)
// }
// }
}
let payload = message.payload.data;
if(payload){
const payloadData = JSON.parse(message.payload.data);
if(payloadData){
@@ -390,20 +407,36 @@ Component({
let type = message.type;
// console.log("message type: ", type);
let show_avatar = true;
console.log("执行1——————————————————————")
if(type === "TIMCustomElem"){
const customMessage = JSON.parse(message.payload.data);
if(Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.PRESCRIBE_VERIFY && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.SUGAR_CHECK && Number(customMessage.message_type) != GDXZ_CUSTOM_MSEEAGE.WENZHEN_FORM && message.cloudCustomData){
show_avatar = false;
}
if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.TRABECULA && refreshBaseInfo){
const title = customMessage.title
const title = customMessage.title;
if(title.indexOf("问诊已结束") > -1){
setTimeout(() => {
//收到横条消息去触发父组件getbase方法,演示1秒
this.triggerEvent('getInquiryMessageBasic');
}, 1000);
}
}
};
// if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.SEND_TALK){
// console.log("执行2——————————————————————")
// const title = customMessage.desc;
// console.log(title)
// if(title.indexOf("医生已赠送") > -1){
// setTimeout(() => {
// console.log('已赠送')
// //收到横条消息去触发父组件getbase方法,演示1秒
// // this.triggerEvent('getInquiryMessageBasic', customMessage.data.order_inquiry_id);
// }, 1000);
// }
// }
}
@@ -493,6 +526,24 @@ Component({
}
if(!this.checkShowAvatar(message, true)){
message.no_avatar = true;
};
if(message.type=='TIMCustomElem'){
const customMessage = JSON.parse(message.payload.data);
const info=JSON.parse(message.cloudCustomData);
console.log(customMessage);
console.log(info);
if(Number(customMessage.message_type) == GDXZ_CUSTOM_MSEEAGE.SEND_TALK){
if(info){
wx.showToast({
title: info.inquiry_type,
})
wx.redirectTo({
url: '/TUIChatService/pages/index?order_inquiry_id='+customMessage.data.order_inquiry_id+"&from_account=end&inquiry_type="+info.inquiry_type,
})
}
}
}
wx.$TUIKit.setMessageRead({ conversationID: this.data.conversation.conversationID }).then(() => {
logger.log('| MessageList | setMessageRead | ok');
@@ -1006,7 +1057,7 @@ Component({
},
goMedinceList(){
wx.navigateTo({
url: '/Pages/yishi/medince_list/index',
url: '/user/pages/yishi/medince_list/index',
})
},
},
TUIChatService/TUIKit/components/TUIChat/components/MessageList/index.wxml
+1 -1
View File
@@ -5,7 +5,7 @@
<view style="width: 100%;text-align: center;position: absolute;top: 20rpx;">
<van-loading size="24px" wx:if="{{list_first_loading}}" vertical color="#1989fa">加载中...</van-loading>
</view>
<view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index" hidden="{{!(item.payload.data &&concat.formateText(item.payload.data).message_type!=20 || item.type!='TIMCustomElem')}}" data-index ='{{index}}'>
<view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index" hidden="{{!(item.payload.data && concat.formateText(item.payload.data).message_type!=20 || item.type!='TIMCustomElem') || (item.payload.data && concat.formateText(item.payload.data).message_type==2) }}" data-index ='{{index}}'>
<view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{item.showMessageTime}}">
<view class="showmessagetime 1" wx:if="{{item.isShowTime}}">
<text class="time" wx:if="{{!item.isDeleted && !item.isRevoked}}">{{item.messageTime}} </text>
TUIChatService/TUIKit/components/TUIChat/index.js
+20 -4
View File
@@ -110,7 +110,8 @@ Component({
},
ready() {
console.log('222222222222222o');
console.log(this.data.baseInfo);
let hasTip=wx.getStorageSync('showNewerTip');
if(hasTip){
this.setData({
@@ -155,6 +156,17 @@ Component({
}
},
pageLifetimes: {
show: function() {
// console.log(11111);
// if(this.data.order_inquiry_id){
// this.getAudioMsg();
// }
// 页面被展示
},
},
/**
* 组件的初始数据
*/
@@ -183,6 +195,7 @@ Component({
viewData: {
style: inputStyle,
},
order_inquiry_id:'',
input_area_style:"",
KeyboardHeight: 0,
showTips: false,
@@ -215,6 +228,7 @@ Component({
})
},
getAudioMsg(){
console.log(this.data.order_inquiry_id)
api.getVideoMsg(this.data.order_inquiry_id).then(response => {
let result=response.data
console.log(result);
@@ -406,10 +420,12 @@ Component({
},
//获取问诊订单消息内页基础数据
getInquiryMessageBasic() {
getInquiryMessageBasic(e) {
let id=e.detail?e.detail:this.data.order_inquiry_id;
console.log(id);
// console.log("order_inquiry_id: ", this.data.order_inquiry_id);
api.getInquiryMessageBasic({order_inquiry_id: this.data.order_inquiry_id}).then(response => {
console.log("11111111111111111111111111111111111111")
api.getInquiryMessageBasic({order_inquiry_id:id }).then(response => {
//console.log("11111111111111111111111111111111111111")
// console.log(response);
this.setData({
baseInfo: response.data,
TUIChatService/TUIKit/components/TUIChat/index.wxml
+3 -3
View File
@@ -32,7 +32,7 @@
<view class="status {{baseInfo.inquiry_status==5?'status_complete':''}}" wx:else="{{baseInfo.inquiry_status!=4}}">{{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>
<view class="yuyuetip" bind:tap="openTime" wx:if="{{isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4)}}">
<view class="yuyuetip" bind:tap="openTime" wx:if="{{isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4) && videoInfo.is_video==0}}">
<view >如需要修改视频时间，请点击这里</view>
<van-icon name="arrow" size="14px" style="margin-top: 3rpx;" color="#FF9C00" />
</view>
@@ -43,7 +43,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 {{baseInfo.inquiry_status==4?'- 197rpx':'- 196rpx'}} - 100rpx - {{navbar_height}}px {{(isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4)) ?'- 72rpx':'- 0rpx'}});"><!-- 100vh -input-area高度 - info高度 -navbar高度 -->
<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':'- 196rpx'}} - 100rpx - {{navbar_height}}px {{(isEditTime && videoInfo.is_reservation_time && (baseInfo.inquiry_status==4) && videoInfo.is_video==0) ?'- 72rpx':'- 0rpx'}});"><!-- 100vh -input-area高度 - info高度 -navbar高度 -->
<!-- <view wx:if="{{showTips}}" class="safetytips-box"> -->
<!-- <view class="safetytips">
<text>【安全提示】本 APP 仅用于体验腾讯云即时通信 IM 产品功能，不可用于业务洽谈与拓展。请勿轻信汇款、中奖等涉及钱款等信息，勿轻易拨打陌生电话，谨防上当受骗。</text>
@@ -93,7 +93,7 @@
确定
</view>
</t-dialog>
<van-overlay show="{{ showTip }}" z-index="999">
<van-overlay show="{{ showTip && baseInfo.inquiry_mode==2 }}" z-index="999">
<view class="wrapper">
<view class="block">
<image src="{{static_host}}/applet/doctor/static/images/yishi/yuyue_star.png" mode="" class="star" />