hope last merge

fore-end/pages/chat/chat.js

@@ -10,6 +10,7 @@ const {
 	formatTime
 } = require('../../utils/util')
 import messageMap from '../../utils/util'
+import Toast from '@vant/weapp/toast/toast';
 var socketMsgQueue = {
 	from: wx.getStorageSync('uid'),
 	to: '',
@@ -332,6 +333,18 @@ Page({
 		})
 	},
 
+	buy:function(){
+		Toast({
+			type:'success',
+			message:'交易成功',
+			onClose:() => {
+				wx.switchTab({
+				  url: '/pages/home/home',
+				})
+			}
+		})
+	},
+
 
 
 	// 滑动到最底部

fore-end/pages/chat/chat.wxml

@@ -13,7 +13,7 @@
 		<view class="chat-card-info" style="position: relative; left: 48rpx; top: 0rpx">
 			<view class="chat-card-info-title" style="width: 373rpx; height: 96rpx; display: block; box-sizing: border-box; left: 0rpx; top: 21rpx">{{goods.name}}</view>
 			<view class="chat-card-info-price" style="position: relative; left: 0rpx; top: 80rpx; width: 153rpx; height: 59rpx; display: block; box-sizing: border-box">￥{{goods.price}}</view>
-		<van-button round size="normal" color="rgba(245, 56, 56, 0.91)" custom-class="chat-card-btn" style="position: relative; left: 186rpx; top: -5rpx; width: 192rpx; height: 96rpx; display: block; box-sizing: border-box">点击购买</van-button>
+		<van-button round size="normal" color="rgba(245, 56, 56, 0.91)" custom-class="chat-card-btn" style="position: relative; left: 186rpx; top: -5rpx; width: 192rpx; height: 96rpx; display: block; box-sizing: border-box" bind:tap="buy">点击购买</van-button>
 	</view>
 	</van-cell-group>
 	<view class="scroll-list" style="position: relative; left: -7rpx; top: 30rpx">
@@ -44,4 +44,5 @@
 			</view>
 		</view>
 	</view>
+	<van-toast id="van-toast" />
 </view>

fore-end/pages/message/message.js

@@ -137,7 +137,7 @@ Page({
 				{
 					message.push({item:{}});
 					message[i][key3] = i+1;
-					message[i].item[key1] = users[i].avatar;
+					message[i].item[key1] = users[i];
 					message[i].item[key2] = users[i].name;
 					message[i].item['targetId'] = users[i].uid;
 					targetIds.push(users[i].uid);
@@ -162,6 +162,7 @@ Page({
 				getGoodsInfoList(getGoodsInfoListOption).then((res => {
 					console.log(res);
 					const goods = res.data.data.goods;
+					console.log(message);				
 					for(let i=0;i<goods.length;i++)
 					{
 						message[i].item[key] = goods[i].Pic;