second merge

fore-end/API/appraise.js

@@ -19,7 +19,8 @@ const API = {
 	getChattingRecordUrl: '/chat/msg',
 	getGoodsInfoUrl: '/goods/detail',
 	getLatestChattingRecordUrl: '/chat/latest',
-	getUserAllOrderUrl: '/order/user'
+	getUserAllOrderUrl: '/order/user',
+	getUserAllGoodsUrl: '/goods/user'
 	
     //放接口URL
 }
@@ -183,6 +184,13 @@ function getUserAllOrder(params) {
 	)
 }
 
+//根据用户id获取用户的所有商品
+function getUserAllGoods(data) {
+	return request.get(
+		API.getUserAllGoodsUrl+`/${data.id}`
+	)
+}
+
 module.exports = {
     createCommont,
 	getCommentList,
@@ -202,6 +210,7 @@ module.exports = {
 	setWsConnect,
 	getLatestChattingRecord,
 	getUserAllOrder,
+	getUserAllGoods,
 	loginURl: API.loginURL,
 	registerURL: API.registerURL
 }

fore-end/pages/user/user.js

@@ -1,10 +1,15 @@
 // pages/user/user.js
-const {getOrder} = require("../../API/appraise")
+const {getOrder,getUserAllGoods} = require("../../API/appraise")
 var getOrderOption = {
 	data: {
 		id: wx.getStorageSync('uid'),
 	}
 }
+
+var getUserAllGoodsOption = {
+	id:wx.getStorageSync('uid'),
+}
+
 Page({
 
     /**
@@ -14,14 +19,49 @@ Page({
 	  avatarUrl:"https://img.js.design/assets/smartFill/img313164da746310.jpg",
 	  nickName:"Username",
 	  userWxID:"UserWxID",
-	  personalSignatrue:"编辑个性签名，展示我的独特态度"
+	  personalSignatrue:"编辑个性签名，展示我的独特态度",
+	  soldGoodsPic1:'',
+	  soldGoodsPic2:'',
+	  soldGoodsPic3:'',
+	  unsoldGoodsPic1:'',
+	  unsoldGoodsPic2:'',
+	  unsoldGoodsPic3:'',
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+		let soldPic = [];
+		let unsoldPic = [];
+		getUserAllGoods(getUserAllGoodsOption).then((res) => {
+			console.log(res);
+			const Pic = res.data.data;
+			console.log(Pic);
+			let cnt = 0;
+			for(let i = Pic.length-1;i>=0;i--)
+			{
+				if(cnt == 6){
+					break;
+				}else{
+					if(Pic[i].State === 0){
+						soldPic.push(Pic[i].Pic);
+						cnt++;
+					}else if(Pic[i].State === 2){
+						unsoldPic.push(Pic[i].Pic);
+						cnt++;
+					}
+				}
+			}
+			this.setData({
+				soldGoodsPic1:soldPic[0],
+				soldGoodsPic2:soldPic[1],
+				soldGoodsPic3:soldPic[2],
+				unsoldGoodsPic1:unsoldPic[0],
+				unsoldGoodsPic2:unsoldPic[1],
+				unsoldGoodsPic3:unsoldPic[2],
+			})
+		})
     },
 
     /**
@@ -38,7 +78,7 @@ Page({
 		this.setData({
 			avatarUrl: wx.getStorageSync('avatarUrl'),
 			nickName: wx.getStorageSync('nickName'),
-			personalSignatrue: wx.getStorageSync('personalSignatrue'),
+			personalSignatrue: wx.getStorageSync('personalSignatrue')
 		})
     },
 

fore-end/pages/user/user.wxml

@@ -16,14 +16,14 @@
 	</van-cell>
 	<van-cell-group custom-class="pages-user-comdity">
 		<van-cell title="已售商品" value="查看更多" is-link class="pages-user-comdity-1"></van-cell>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img386164da74ff50.jpeg" class="pages-user-comdity-2" style="position: relative; left: -5rpx; top: 0rpx"></van-image>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img430164da758808.jpeg" class="pages-user-comdity-2" style="position: relative; left: -3rpx; top: 0rpx"></van-image>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img355164da74c4b8.jpg" class="pages-user-comdity-2" style="position: relative; left: 434rpx; top: -265rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{soldGoodsPic1}}" class="pages-user-comdity-2" style="position: relative; left: -5rpx; top: 0rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{soldGoodsPic2}}" class="pages-user-comdity-2" style="position: relative; left: -3rpx; top: 0rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{soldGoodsPic3}}" class="pages-user-comdity-2" style="position: relative; left: 434rpx; top: -265rpx"></van-image>
 	</van-cell-group>
 	<van-cell-group custom-class="pages-user-comdity" style="position: relative; left: 0rpx; top: -21rpx">
 		<van-cell title="待售商品" value="查看更多" is-link class="pages-user-comdity-1" style="position: relative; left: 0rpx; top: 0rpx"></van-cell>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img425164da758808.jpg" class="pages-user-comdity-2" style="position: relative; left: -5rpx; top: 0rpx"></van-image>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img434164da758808.jpeg" class="pages-user-comdity-2" style="position: relative; left: -3rpx; top: 0rpx"></van-image>
-		<van-image width="100px" height="120px" fit="cover" src="https://img.js.design/assets/smartFill/img383164da74ff50.jpg" class="pages-user-comdity-2" style="position: relative; left: 434rpx; top: -263rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{unsoldGoodsPic1}}" class="pages-user-comdity-2" style="position: relative; left: -5rpx; top: 0rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{unsoldGoodsPic2}}" class="pages-user-comdity-2" style="position: relative; left: -3rpx; top: 0rpx"></van-image>
+		<van-image width="100px" height="120px" fit="cover" src="{{unsoldGoodsPic3}}" class="pages-user-comdity-2" style="position: relative; left: 434rpx; top: -263rpx"></van-image>
 	</van-cell-group>
 </van-cell-group>

fore-end/utils/util.js

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