1.22
This commit is contained in:
+1
-1
@@ -318,7 +318,7 @@ Component({
|
||||
goReport(event){
|
||||
let {url,id} = event.currentTarget.dataset;
|
||||
app.method.navigateTo({
|
||||
url: '/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+id
|
||||
url: '/sugarCheck/pages/checkOrderDetail/checkOrderDetail?order_detection_id='+id
|
||||
})
|
||||
},
|
||||
goPrescriptDetail(event) {
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@
|
||||
<view wx:if="{{renderDom[0].type ==='group_create'}}" class="custom-message {{isMine?'my-custom':''}}">
|
||||
<view class="custom-content-text">{{renderDom[0].text}}</view>
|
||||
</view>
|
||||
<view wx:if="{{renderDom[0].type ==='c2cCalling' || renderDom[0].type ==='groupCalling'}}" class="custom-message {{isMine?'my-custom':''}}">
|
||||
<view wx:if="{{renderDom[0].type ==='c2cCalling' || renderDom[0].type ==='groupCalling'}}" class="call-message {{isMine?'my-text':'your-text'}}">
|
||||
<view class="custom-content-text">{{renderDom[0].text}}</view>
|
||||
</view>
|
||||
<view wx:if="{{renderDom[0].type ==='notSupport'}}" class="message-body-span text-message">
|
||||
|
||||
+45
-1
@@ -378,4 +378,48 @@ color: #666666;
|
||||
background: #3CC7C0;
|
||||
border: 1rpx solid #1ACAD3;
|
||||
border-style: none none solid solid
|
||||
}
|
||||
}
|
||||
.call-message.my-text {
|
||||
max-width: 60vw;
|
||||
min-height: 50rpx;
|
||||
padding: 10rpx 24rpx;
|
||||
line-height: 50rpx;
|
||||
position: relative;
|
||||
border-radius: 10px 10px 10px 10px;
|
||||
background: rgb(212, 239, 241);
|
||||
border: 1rpx solid #1ACAD3;
|
||||
}
|
||||
.call-message.my-text::after{
|
||||
content:'';
|
||||
position: absolute;
|
||||
top: 35rpx;
|
||||
right: -19rpx;
|
||||
transform: translate(-50%,-50%) rotate(-135deg);
|
||||
width: 16rpx;
|
||||
height: 16rpx;
|
||||
background: rgb(212, 239, 241);
|
||||
border: 1rpx solid #1ACAD3;
|
||||
border-style: none none solid solid
|
||||
}
|
||||
.call-message.your-text {
|
||||
max-width: 60vw;
|
||||
min-height: 50rpx;
|
||||
padding: 10rpx 24rpx;
|
||||
line-height: 50rpx;
|
||||
position: relative;
|
||||
border-radius: 10px 10px 10px 10px;
|
||||
background: rgb(255, 255, 255);
|
||||
border: 1rpx solid #D8D8D8;
|
||||
}
|
||||
.call-message.your-text::after{
|
||||
content:'';
|
||||
position: absolute;
|
||||
top: 35rpx;
|
||||
left: 0;
|
||||
transform: translate(-50%,-50%) rotate(45deg);
|
||||
width: 16rpx;
|
||||
height: 16rpx;
|
||||
background: rgb(255, 255, 255);
|
||||
border: 1rpx solid #D8D8D8;
|
||||
border-style: none none solid solid
|
||||
}
|
||||
@@ -261,23 +261,10 @@ pageLifetimes:{
|
||||
*/
|
||||
methods: {
|
||||
async call() {
|
||||
await TUICallKitServer.setSelfInfo( "典韦222", "http://xxx"
|
||||
)
|
||||
await TUICallKitServer.call({
|
||||
userID: this.data.doctor_user_id,
|
||||
type: 2,
|
||||
timeout:60,
|
||||
offlinePushInfo:{
|
||||
title:'22222'
|
||||
},
|
||||
userData:JSON.stringify({
|
||||
order_inquiry_id:this.data.order_inquiry_id,
|
||||
inquiry_type:this.data.inquiry_type,
|
||||
inquiry_mode:this.data.inquiry_mode,
|
||||
message_rounds:this.data.msgData.msg_round,
|
||||
patient_family_data:this.data.patient_family_data,
|
||||
is_system:0
|
||||
}),
|
||||
timeout:60
|
||||
});
|
||||
},
|
||||
showTooltip(){
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<scroll-view class="message-list-container" scroll-y="true" scroll-into-view="{{jumpAim}}" refresher-enabled="{{true}}" bindrefresherrefresh="refresh" refresher-triggered="{{triggered}}" lower-threshold="200" bindscrolltolower="scrollHandler">
|
||||
<view class="no-message" wx:if="{{isCompleted}}">没有更多啦</view>
|
||||
<!-- <text style="display: none;">{{filter.toS(messageList[messageList.length-1])}}</text> -->
|
||||
<view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index" data-index ='{{index}}' >
|
||||
<view class="t-message" wx:if="{{conversation.type !== '@TIM#SYSTEM'}}" wx:for="{{messageList}}" wx:key="index" data-index ='{{index}}' hidden="{{!(item.payload.data && (filter.formateText(item.payload.data).message_type!=20) || item.type!='TIMCustomElem') }}">
|
||||
<view class="time-pop-mask" data-value="{{item.time}}" wx:if="{{showMessageTime}}">
|
||||
<view class="showmessagetime" wx:if="{{item.isShowTime}}">
|
||||
<text class="time" wx:if="{{!item.isDeleted && !item.isRevoked}}">{{messageTime}} </text>
|
||||
@@ -36,7 +36,7 @@
|
||||
<TipMessage wx:if="{{item.type === 'TIMGroupTipElem'}}" message="{{item}}"/>
|
||||
<view wx:if="{{item.type !== 'TIMGroupTipElem'}}" class="{{item.flow === 'out' ? 't-self-message':'t-recieve-message'}} {{item.type=='TIMCustomElem'?'custom_center':''}}" >
|
||||
|
||||
<image class="t-message-avatar" wx:if="{{(item.flow === 'in' && item.type!='TIMCustomElem') || (item.flow === 'in' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==7) || (item.flow === 'in' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==12)}}" src="{{item.avatar || img_host+'/doctor_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
|
||||
<image class="t-message-avatar" wx:if="{{(item.flow === 'in' && item.type!='TIMCustomElem') || (item.flow === 'in' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==7) || (item.flow === 'in' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==12) || (item.flow === 'in' && item.type=='TIMCustomElem' && !item.cloudCustomData)}}" src="{{item.avatar || img_host+'/doctor_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile" />
|
||||
<view class="read-receipts" wx:if="{{conversation.type === 'C2C' && item.flow==='out' }}">
|
||||
<view wx:if="{{item.isPeerRead}}" >已读</view>
|
||||
<view wx:else>未读</view>
|
||||
@@ -49,12 +49,12 @@
|
||||
<ImageMessage wx:if="{{item.type === 'TIMImageElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}" />
|
||||
<VideoMessage wx:if="{{item.type === 'TIMVideoFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<AudioMessage wx:if="{{item.type === 'TIMSoundElem'}}" message="{{item}}" data-index ='{{index}}' messageList="{{messageList}}" bind:closeAudio="closeAudio" id="audio{{item.ID}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<CustomMessage style="width:100vw" bind:popComment="popComment" wx:if="{{item.type === 'TIMCustomElem' && filter.formateText(item.payload.data).message_type!=6 && filter.formateText(item.payload.data).message_type!=11}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" class="{{(item.type === 'TIMCustomElem' && filter.formateText(item.payload.data).message_type==2)?'custom'+filter.formateText(item.payload.data).data.order_inquiry_id:''}}" patient_data="{{filter.formateText(item.cloudCustomData).patient_family_data}}"/>
|
||||
<CustomMessage style="width:100vw" bind:popComment="popComment" wx:if="{{item.type === 'TIMCustomElem' && filter.formateText(item.payload.data).message_type!=6 && filter.formateText(item.payload.data).message_type!=11 && filter.formateText(item.payload.data).message_type!=20 && filter.formateText(item.payload.data).message_type!==0}}" message="{{item}}" isMine="{{item.flow === 'out'}}" bindtap="handleJumpLink" data-value = "{{item}}" class="{{(item.type === 'TIMCustomElem' && filter.formateText(item.payload.data).message_type==2)?'custom'+filter.formateText(item.payload.data).data.order_inquiry_id:''}}" patient_data="{{filter.formateText(item.cloudCustomData).patient_family_data}}"/>
|
||||
<FaceMessage wx:if="{{item.type === 'TIMFaceElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<FileMessage wx:if="{{item.type === 'TIMFileElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
<MergerMessage wx:if="{{item.type === 'TIMRelayElem'}}" message="{{item}}" isMine="{{item.flow === 'out'}}"/>
|
||||
</view>
|
||||
<image class="t-message-avatar" wx:if="{{(item.flow === 'out' && item.type!='TIMCustomElem') || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==10) || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==12)}}" src="{{item.avatar || 'https://img.applets.igandanyiyuan.com/applet/patient/static/patient_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile"/>
|
||||
<image class="t-message-avatar" wx:if="{{(item.flow === 'out' && item.type!='TIMCustomElem') || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==10) || (item.flow=== 'out' && item.type=='TIMCustomElem' && filter.formateText(item.payload.data).message_type==12) || (item.flow === 'out' && item.type=='TIMCustomElem' && !item.cloudCustomData)}}" src="{{item.avatar || 'https://img.applets.igandanyiyuan.com/applet/patient/static/patient_avatar.png'}}" data-value="{{item}}" bindtap="getMemberProfile"/>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -305,7 +305,7 @@ Component({
|
||||
// url: "/pages/expertDetail/expertDetail?doctor_id=" + id
|
||||
// })
|
||||
app.method.navigateTo({
|
||||
url: "/pages/expertDetail/expertDetail?doctor_id=" + id
|
||||
url: "/patient/pages/expertDetail/expertDetail?doctor_id=" + id
|
||||
})
|
||||
}),
|
||||
loopArr(arr,type){
|
||||
@@ -406,7 +406,7 @@ Component({
|
||||
// })
|
||||
console.log("订单详情");
|
||||
app.method.navigateTo({
|
||||
url: '/pages/orderDetail/orderDetail?order_inquiry_id='+order_inquiry_id
|
||||
url: '/patient/pages/orderDetail/orderDetail?order_inquiry_id='+order_inquiry_id
|
||||
})
|
||||
}),
|
||||
getMessageRounds(event) {
|
||||
|
||||
Reference in New Issue
Block a user