修改会话显示逻辑

pages/conversation/conversation.vue

@@ -19,13 +19,13 @@
 					</view>
 					<view class="text-gray text-sm flex">
 						<!-- 信息发送者：最近一条消息 -->
-						<text class="text-cut" v-if="item.lastMessage.type=='text'">{{item.lastMessage.payload.text}}</text>
+						<text class="text-cut" v-if="item.lastMessage.type=='text'">{{item.lastMessage==undefined?'':item.lastMessage.payload.text}}</text>
 						<view class="item-info-top_content" v-else-if="item.lastMessage.type == 'audio'">[语音消息]</view>
 						<view class="item-info-top_content" v-else-if="item.lastMessage.type == 'image'">[图片消息]</view>
 					</view>
 				</view>
 				<view class="action">
-					<view class="text-grey text-xs">{{formatDate(item.lastMessage.timestamp)}}</view>
+					<view class="text-grey text-xs">{{item.lastMessage==undefined?'':formatDate(item.lastMessage.timestamp)}}</view>
 				</view>
 			</view>
 			<view v-else>
@@ -76,20 +76,23 @@
 		computed: {
 			formatData() {
 				let arr = []
+				arr = this.list
+				console.log("conversations长度", this.conversations.conversations.length)
+				console.log("数据conversations", this.conversations.conversations)
+				console.log("数据list", this.list)
 				this.list.forEach(item => {
-					console.log(this.conversations.conversations.length)
-					if(this.conversations.conversations.length==0){
-						return this.list
+					if (this.conversations.conversations.length != 0) {
+						this.conversations.conversations.forEach(ite => {
+							if (item.flag == ite.userId ) {
+								item.unread = ite.unread
+								item.lastMessage = ite.lastMessage
+								// arr.push(item)
+								console.log("显示conversations");
+							}
+						})
 					}
-					this.conversations.conversations.forEach(ite => {
-						if (item.flag == ite.userId) {
-							item.unread = ite.unread
-							item.lastMessage = ite.lastMessage
-							arr.push(item)
-							console.log(arr);
-						}
-					})
 				})
+				console.log("显示的数据", arr)
 				return arr
 			}
 		},
@@ -171,7 +174,7 @@
 								name: data[i].user.nickname, //名字
 								remark: data[i].user.remark, //备注
 								date: data[i].user.dates, //日期
-								id:data[i].user.id
+								id: data[i].user.id
 								// id: data[i].user.id, //日期
 							})
 						}
@@ -224,16 +227,16 @@
 					url: urls
 				})
 			},
-			call(img, name,id,remark) {
+			call(img, name, id, remark) {
 				let callObject = {
-					img: img+'',
-					name: name+'',
-					id:id,
-					remark:remark
+					img: img + '',
+					name: name + '',
+					id: id,
+					remark: remark
 				}
 				// console.log(callObject)
 				uni.navigateTo({
-					url: 'call?callObject=' +  JSON.stringify(callObject),//跳转页面不能传对象，只能转为字符串
+					url: 'call?callObject=' + JSON.stringify(callObject), //跳转页面不能传对象，只能转为字符串
 				})
 			},
 			getcnversationList: async function() {

pages/conversation/conversationWindow.vue

@@ -5,7 +5,7 @@
 				<view class="time-lag">
 					{{renderMessageDate(item, index)}}
 				</view>
-				<view class="main" v-if="item.type=='text'">
+				<view class="main" style="width: 500rpx;word-break:break-all;display: flex;justify-content: flex-end;" v-if="item.type=='text'">
 					<view class="content bg-green shadow">
 						<text>{{item.payload.text}}</text>
 					</view>
@@ -21,7 +21,7 @@
 			</view>
 			<view class="cu-item" v-else>
 				<view class="cu-avatar radius" :style="'background-image:url('+doctorInfo.user_avatar+');'"></view>
-				<view class="main" v-if="item.type=='text'">
+				<view class="main" style="width: 500rpx;word-break:break-all;" v-if="item.type=='text'">
 					<view class="content shadow">
 						<text>{{item.payload.text}}</text>
 					</view>
@@ -67,6 +67,7 @@
 		onLoad: function(op) {
 			this.messages = []
 			this.self_messages = []
+			console.log('聊天状态',op)
 			if (op.type == 2) {
 				this.sures = false;
 			}

pages/scheduling/month_Scheduling.vue

@@ -183,10 +183,9 @@
 		},
 		methods: {
 			closePopup(){
-				saveDayType.mon = 0
-				saveDayType.aft = 0
-				saveDayType.nig = 0
-				
+				this.saveDayType.mon = 0
+				this.saveDayType.aft = 0
+				this.saveDayType.nig = 0
 			},
 			
 			close: async function() {
@@ -558,48 +557,48 @@
 				this.saveDay = this.monthList[this.day + this.empty - 1];
 				if (id == 0) {
 					this.monthList[this.day + this.empty - 1].mon = 1 //
-					// this.schedulingList[this.day - 1].mon = this.hospitalID
+					this.schedulingList[this.day - 1].mon = this.hospitalID
 					this.saveDayType.mon = this.hospitalID;
 
 					this.monthList[this.day + this.empty - 1].aft = 1 //
-					// this.schedulingList[this.day - 1].aft = this.hospitalID
+					this.schedulingList[this.day - 1].aft = this.hospitalID
 					this.saveDayType.aft = this.hospitalID;
 
 					this.monthList[this.day + this.empty - 1].nig = 1 //
-					// this.schedulingList[this.day - 1].nig = this.hospitalID
+					this.schedulingList[this.day - 1].nig = this.hospitalID
 					this.saveDayType.nig = this.hospitalID;
 				} else {
 					switch (id) {
 						case 1:
 							if (this.monthList[this.day + this.empty - 1].mon == 1) { //当这个按钮状态为1 选择了医院且是当前医院
 								this.monthList[this.day + this.empty - 1].mon = 0 //就取消选择
-								// this.schedulingList[this.day - 1].mon = 0
+								this.schedulingList[this.day - 1].mon = 0
 								this.saveDayType.mon = 0;
 							} else if (this.monthList[this.day + this.empty - 1].mon == 0) {
 								this.monthList[this.day + this.empty - 1].mon = 1 //
-								// this.schedulingList[this.day - 1].mon = this.hospitalID
+								this.schedulingList[this.day - 1].mon = this.hospitalID
 								this.saveDayType.mon = this.hospitalID;
 							}
 							break;
 						case 2:
 							if (this.monthList[this.day + this.empty - 1].aft == 1) { //当这个按钮状态为1 选择了医院且是当前医院
 								this.monthList[this.day + this.empty - 1].aft = 0 //就取消选择
-								// this.schedulingList[this.day - 1].aft = 0
+								this.schedulingList[this.day - 1].aft = 0
 								this.saveDayType.aft = 0;
 							} else if (this.monthList[this.day + this.empty - 1].aft == 0) {
 								this.monthList[this.day + this.empty - 1].aft = 1 //
-								// this.schedulingList[this.day - 1].aft = this.hospitalID
+								this.schedulingList[this.day - 1].aft = this.hospitalID
 								this.saveDayType.aft = this.hospitalID;
 							}
 							break;
 						case 3:
 							if (this.monthList[this.day + this.empty - 1].nig == 1) { //当这个按钮状态为1 选择了医院且是当前医院
 								this.monthList[this.day + this.empty - 1].nig = 0 //就取消选择
-								// this.schedulingList[this.day - 1].nig = 0
+								this.schedulingList[this.day - 1].nig = 0
 								this.saveDayType.nig = 0;
 							} else if (this.monthList[this.day + this.empty - 1].nig == 0) {
 								this.monthList[this.day + this.empty - 1].nig = 1 //
-								// this.schedulingList[this.day - 1].nig = this.hospitalID
+								this.schedulingList[this.day - 1].nig = this.hospitalID
 								this.saveDayType.nig = this.hospitalID;
 							}
 							break;