last merge

fore-end/pages/chat/chat.js

@@ -213,11 +213,14 @@ Page({
 						avatar: wx.getStorageSync('anotherAvatar')
 					}
 					console.log(msg);
+					let chatList2 = this.data.chatList;
+					chatList2.push(msg);
+					console.log(chatList2);
 					this.setData({
-						chatList: list.concat(msg)
+						chatList: chatList2
 					}, () => {
-						that.scrollToBottom();
-						that.setData({
+						this.scrollToBottom();
+						this.setData({
 							content: ''
 						})
 					})

fore-end/pages/details/details.js

@@ -57,9 +57,20 @@ Page({
 		console.log(addUserRelationOption);
 		addUserRelation(addUserRelationOption).then((res) => {
 			console.log(res);
-			wx.navigateTo({
-				url: '/pages/chat/chat?toUid=' + this.data.uid + '&goodsId=' + this.data.id + '&pic=' + this.data.pic,
-			  })
+			let addUserRelationOptionParse = {
+				goodsId:$id,
+				owner:_this.uid,
+				target:wx.getStorageSync('uid'),
+				type:1
+			}
+			addUserRelation(addUserRelationOptionParse).then((res) => {
+				console.log(res);
+				wx.navigateTo({
+					url: '/pages/chat/chat?toUid=' + this.data.uid + '&goodsId=' + this.data.id + '&pic=' + this.data.pic,
+				  })
+			}).catch((err) => {
+				console.log(err);
+			})
 		}).catch((err) => {
 			console.log(err);
 		})

fore-end/pages/message/message.js

@@ -137,7 +137,7 @@ Page({
 				{
 					message.push({item:{}});
 					message[i][key3] = i+1;
-					message[i].item[key1] = baseUrl+users[i].avatar.slice(25);
+					message[i].item[key1] = users[i].avatar;
 					message[i].item[key2] = users[i].name;
 					message[i].item['targetId'] = users[i].uid;
 					targetIds.push(users[i].uid);