11.5commit message finished

fore-end/components/messageRecord/messageRecord.js

@@ -25,5 +25,6 @@ Component({
 	 */
 	methods: {
 
-	}
+	},
+	
 })

fore-end/pages/chat/chat.wxml

@@ -1,2 +1,8 @@
 <!--pages/chat/chat.wxml-->
-
+<view>
+	<van-cell-group>
+		<van-image></van-image>
+		<van-cell></van-cell>
+		<van-button></van-button>
+	</van-cell-group>
+</view>

fore-end/pages/message/message.js

@@ -27,18 +27,7 @@ var getGoodsInfoListOption = {
 	}
 }
 
-var message = [
-	{
-		// id:0,
-		item:{
-			// avatarUrl:'',
-			// merchantName:'',
-			// lastMessageRecord:'',
-			// messageTime: '',
-			// commodityPicture: ''
-		}
-	}
-]
+
 var key = "commodityPicture";
 let key1 = "avatarUrl";
 let key2 = "merchantName";
@@ -49,32 +38,19 @@ Page({
      * 页面的初始数据
      */
     data: {
-		// message:message
-		message: [
-			{
-				id:1,
-				item:{
-					avatarUrl: "http://192.168.31.28:8084/pics/1698753512AiD8PaNrvqsDb1493fda534929a5b5d05f80a8cf3d16.jpg",
-					commodityPicture: "https://img.js.design/assets/img/6229b69ff89eeaf3b7fd1919.jpg",
-					merchantName: "daisy",
-				}
-			},
-			{
-				id:2,
-				item:{
-					avatarUrl: "http://192.168.31.28:8084/pics/1698845584tmp_69fe84d4b7b444512c31c8693e95336113d42d50aaca0699.jpg",
-					commodityPicture: "https://img.js.design/assets/img/64ca428a87e21a113298b895.jpg",
-					merchantName: "cherry"
-				}
-			}
-		]
-		
+		message:[]		
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+		var message = this.data.message;
 		// addUserRelation(addRelationOption).then((res) => {
 		// 	console.log(res);
 		// }).catch((err) => {
@@ -82,17 +58,17 @@ Page({
 		// })
 		getUserRelation(getRelationOption).then((res) => {
 			console.log(res);
-			console.log(res.data.data.fUid.length);
-			var fUidLength = res.data.data.fUid.length;
-			var target = [];
-			for(var i=0;i<fUidLength;i++)
+			const fUid = res.data.data.fUid;
+			let fUidLength = fUid.length;
+			let target = [];
+			for(let i=0;i<fUidLength;i++)
 			{
-				target[i] = res.data.data.fUid[i].target;
+				target[i] = fUid[i].target;
 			}
 			var goodsId = [];
-			for(var i=0;i<fUidLength;i++)
+			for(let i=0;i<fUidLength;i++)
 			{
-				goodsId[i] = res.data.data.fUid[i].goodsId;
+				goodsId[i] = fUid[i].goodsId;
 			}
 			console.log(target);
 			console.log(goodsId);
@@ -100,22 +76,27 @@ Page({
 			console.log(getUserInfoListOption);
 			getUserInfoList(getUserInfoListOption).then((res) => {
 				console.log(res);
-				for(var i=0;i<res.data.data.users.length;i++)
+				const users = res.data.data.users;
+				for(let i=0;i<users.length;i++)
 				{
-					message[i][key3] = i+1;
-					message[i].item[key1] = res.data.data.users[i].avatar;
-					message[i].item[key2] = res.data.data.users[i].name;
 					message.push({item:{}});
+					message[i][key3] = i+1;
+					message[i].item[key1] = users[i].avatar;
+					message[i].item[key2] = users[i].name;
+					
 				}
 				console.log(message);
 				getGoodsInfoListOption.data.id = goodsId;
 				getGoodsInfoList(getGoodsInfoListOption).then((res => {
 					console.log(res);
-					for(var i=0;i<res.data.data.goods.length;i++)
+					const goods = res.data.data.goods;
+					for(let i=0;i<goods.length;i++)
 					{
-						message[i].item[key] = res.data.data.goods[i].Pic;
+						message[i].item[key] = goods[i].Pic;
 					}
-					console.log(message);
+					this.setData({
+						message:message
+					})
 				})).catch((err) => {
 					console.log(err);
 				})
@@ -125,26 +106,13 @@ Page({
 		}).catch((err) => {
 			console.log(err);
 		})
-		this.setData({
-			message:message,
-		})
-    },
-
-    /**
-     * 生命周期函数--监听页面初次渲染完成
-     */
-    onReady() {
-		
     },
 
     /**
      * 生命周期函数--监听页面显示
      */
     onShow() {
-		// console.log(message);
-		// this.setData({
-		// 	message:message,
-		// })
+		
     },
 
     /**

fore-end/pages/message/message.wxml

@@ -7,7 +7,7 @@
 		<image src="../../assets/tabBar_img/通知.png" class="left-icon"/>
 	</view>
 </van-notice-bar>
-<view class="item" wx:for="{{message}}" wx:key="id">
-	<message-record item="{{item.item}}"></message-record>
+<view class="item" wx:for="{{message}}" wx:key="id" >
+	<message-record item="{{item.item}}" test="{{test}}"></message-record>
 </view>
 <view class="bottom">已经到底啦~</view>

fore-end/utils/util.js

@@ -1,6 +1,6 @@
 import Toast from '@vant/weapp/toast/toast';
 const { loginURL, registerURL } = require('../API/appraise')
-const baseURL = "http://192.168.31.28:8084";//后台服务提供的地址
+const baseURL = "http://192.168.31.30:8084";//后台服务提供的地址
 const uploadUrl = "/pic/upload";
 const formatTime = date => {
   const year = date.getFullYear()