Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
闫晓茹 2023-11-09 17:19:17 +08:00
commit 868ad97c51

View File

@ -1,6 +1,6 @@
<template>
<view class="content">
<!-- <view class="title">
<!-- <view class="title">
<image src="../../static/huijiantou.png" @click="back"></image>
{{currentItem.senderName}}
</view> -->
@ -12,15 +12,16 @@
<view style="height: 85vh; padding-top: 200rpx;" @tap='touchend'>
<view class="snedItem" v-for="(item, index) in newsList" :key="index">
<view class="ifSend" v-if="item.senderName == userName">
<view class="sendBox" v-if="item.messageType==1">{{item.content}}</view>
<image v-if="item.messageType==2" :src="baseurl+item.content" class="snedItemimage" />
<view class="sendBox" v-if="Number(item.messageType)==1">{{item.content}}</view>
<image v-if="Number(item.messageType)==2" :src="baseurl+item.content" class="snedItemimage" />
<image class="head" src="@/static/docHead.png"></image>
</view>
<view class="doctorSend" v-else>
<image class="head" src="@/static/headsculpture.png"></image>
<view class="">
<text>{{item.senderName}}</text>
<view class="sendBox" v-if="item.content">{{item.content}}</view>
<view class="sendBox" v-if="Number(item.messageType)==1">{{item.content}}</view>
<image v-if="Number(item.messageType)==2" :src="baseurl+item.content"
class="snedItemimage" />
</view>
</view>
<video v-if="item.video" :src="item.video"></video>
@ -85,7 +86,6 @@
sendMessage,
getChatRecord,
markRead,
} from '@/api/seekadvicefrom/seekadvicefrom.js';
import baseurl from '@/api/baseurl.js'
export default {
@ -158,7 +158,6 @@
});
},
onLoad(options) {
console.log(options, '888')
this.baseurl = baseurl;
// uni.closeSocket()
this.currentItem = JSON.parse(options.item)
@ -214,14 +213,14 @@
})
},
Read() {
console.log(this.currentItem.doctorId,'888888888')
console.log(this.currentItem.doctorId, '888888888')
let markReadData = {
consultationId: this.currentItem.id,
recipientId: Number(this.currentItem.doctorId),
}
console.log(markReadData,'6')
console.log(markReadData, '6')
markRead(markReadData)
},
//
sendconfirm(value) {
@ -492,7 +491,7 @@
that.newsList.push({
senderName: that.currentItem.patientName,
content: JSON.parse(res.data).message,
messageType: JSON.parse(res.data).message
messageType: Number(JSON.parse(res.data).messageType)
})
that.Read()
})