提交

common/user.js

@@ -106,6 +106,10 @@ function loginByWeixin(userInfo) {
 						reject(res);
 					}
 				} else {
+					uni.showToast({
+						icon: 'none',
+						title: res.message
+					});
 					reject(res);
 				}
 			}).catch((err) => {

pages/conversation/conversation.vue

@@ -98,8 +98,8 @@
 				qiehuan: true,
 				index:0,
 				keyword: "",
-				list:[{},{}],
-				listPhone:[{},{}],
+				list:[],
+				listPhone:[],
 			}
 		},
 		methods: {

pages/conversation/conversationWindow.vue

@@ -20,7 +20,7 @@
 				<view class="cu-avatar radius" :style="'background-image:url('+currentUser.avatar+');'"></view>
 			</view>
 			<view class="cu-item" v-else>
-				<view class="cu-avatar radius" style="background-image:url(https://ossweb-img.qq.com/images/lol/web201310/skin/big143004.jpg);"></view>
+				<view class="cu-avatar radius" :style="'background-image:url('+doctorInfo.user_avatar+');'"></view>
 				<view class="main" v-if="item.type=='text'">
 					<view class="content shadow">
 						<text>{{item.payload.text}}</text>
@@ -64,18 +64,22 @@
 			GoEasyAudioPlayer
 		},
 		onLoad :function(op) {
+			
 			if(op.type==2){
 				this.sures=false;
 			}
 			this.imService = getApp().globalData.imService;
 			this.doctorInfo = JSON.parse(op.patient)
+			 this.getMessage("member_" + this.doctorInfo.user_id)
 			//对话数据
 			this.friend = {
 				uuid: "member_" + this.doctorInfo.user_id,
 				name: this.doctorInfo.user_name,
 				avatar: this.doctorInfo.user_avatar
 			};
+			
 			this.currentUser = this.imService.currentUser;
+			console.log('打印数据：',)
 			let privateMessages = this.imService.getPrivateMessages(this.friend.uuid);
 			this.messages = privateMessages.sentMessages;
 			this.pendingMessages = privateMessages.pendingMessages;
@@ -126,6 +130,20 @@
 			}
 		},
 		methods: {
+			
+			getMessage:async function(flag){
+				let res = await this.$request.post("doctor/getImList",{'flag':flag});
+				if(res.status==0){
+					if(res.data.length!=0){
+						let newList = [];
+						for(let i=0;i<res.data.length;i++){
+							this.messages.push(res.data[i]);
+							// newList.push(res.data[i]);
+						}
+					}
+					
+				}
+			},
 			renderMessageDate(message, index) {
 				if (index === 0) {
 					return this.formatDate(message.timestamp)
@@ -230,23 +248,23 @@
 				})
 			},
 			loadMoreHistoryMessage() { //历史消息
-				let lastMessageTimeStamp = Date.now();
-				let lastMessage = this.messages[0];
-				if (lastMessage) {
-					lastMessageTimeStamp = lastMessage.timestamp;
-				}
-				var currentLength = this.messages.length;
-				let promise = this.imService.loadPrivateHistoryMessage(this.friend.uuid, lastMessageTimeStamp);
-				promise.then(messages => {
-					if (messages.length == currentLength) {
-						this.allHistoryLoaded = true
-					}
-					this.messages = messages;
-					uni.stopPullDownRefresh();
-				}).catch(e => {
-					console.log(e)
-					uni.stopPullDownRefresh();
-				})
+				// let lastMessageTimeStamp = Date.now();
+				// let lastMessage = this.messages[0];
+				// if (lastMessage) {
+				// 	lastMessageTimeStamp = lastMessage.timestamp;
+				// }
+				// var currentLength = this.messages.length;
+				// let promise = this.imService.loadPrivateHistoryMessage(this.friend.uuid, lastMessageTimeStamp);
+				// promise.then(messages => {
+				// 	if (messages.length == currentLength) {
+				// 		this.allHistoryLoaded = true
+				// 	}
+				// 	this.messages = messages;
+				// 	uni.stopPullDownRefresh();
+				// }).catch(e => {
+				// 	console.log(e)
+				// 	uni.stopPullDownRefresh();
+				// })
 			},
 		}
 	};

pages/index/index.vue

@@ -37,7 +37,7 @@
 						<!-- 标签 -->
 						<view style="height: 60rpx;padding-left: 40rpx;padding-right: 40rpx;display: flex;" >
 							<view v-for="item,index in doctorlabel" :key="index">
-								<u-tag :show="index<4" style="margin-left: 10rpx;" :text="doctorlabel[index].lable" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff" shape="circle " size="mini"/>
+								<u-tag :show="index<4" style="margin-left: 10rpx;" :text="doctorlabel[index].label_name" bg-color="#E5F5FF" color="#0B73B9" border-color="#ffffff" shape="circle " size="mini"/>
 							</view>
 						</view>
 						<view class="pr m-xcenter plr20">

pages/login/login.vue

@@ -259,7 +259,6 @@
 					} else {
 						uni.showToast({
 							icon: 'none',
-							position: 'bottom',
 							title: res.message
 						});
 						return false;
@@ -325,10 +324,9 @@
 							} else {
 								uni.showToast({
 									icon: 'none',
-									position: 'bottom',
 									title: res.message
 								});
-								return false;
+								return false; 
 							}
 						} else {
 							uni.showToast({
@@ -408,6 +406,13 @@
 							that.openid = res.data.openid
 							that.show = true
 						}
+					}else{
+						console.log('到我了！');
+						uni.showToast({
+							icon: 'none',
+							title: res.message
+						});
+						return false;
 					}
 				})
 			},
@@ -452,6 +457,12 @@
 						
 						}, 2000)
 					}
+				}else{
+					uni.showToast({
+						icon: 'none',
+						title: res.message
+					});
+					return false;
 				}
 			}
 		}