11.1commit

fore-end/API/appraise.js

@@ -9,7 +9,9 @@ const API = {
 	modifyURL: '/user/modify',
 	getOrderURL: '/order/user',
 	getCategoryURL: '/category',
-	getCategoryGoods: '/goods/category'
+	getCategoryGoods: '/goods/category',
+	getUserRelationUrl: '/relation/friend',
+	addUserRelationUrl: '/relation/create'
 	
     //放接口URL
 }
@@ -102,6 +104,24 @@ function getClassifyGoods(data) {
 		API.getCategoryGoods+`/${data.page}/${data.pageSize}`
 	)
 }
+//获取用户好友关系
+function getUserRelation(params) {
+	return request.get(
+		API.getUserRelationUrl,
+		{
+			data:params.data,
+		}
+	)
+}
+
+function addUserRelation(params) {
+	return request.post(
+		API.addUserRelationUrl,
+		{
+			data:params.data,
+		}
+	)
+}
 
 module.exports = {
     createCommont,
@@ -113,6 +133,8 @@ module.exports = {
 	getOrder,
 	getCategoryAPI,
 	getClassifyGoods,
+	getUserRelation,
+	addUserRelation,
 	loginURl: API.loginURL,
 	registerURL: API.registerURL
 }

fore-end/components/messageRecord/messageRecord.wxss

@@ -1,7 +1,9 @@
 /* components/messageRecord/messageRecord.wxss */
 .item{
-	border-bottom: 1px solid rgba(214, 214, 214, 0.4);
+	border-bottom: 1px solid rgba(214, 214, 214, 1);
 	display: flex;
+	background-color: rgb(233, 230, 230);
+	border-radius: 4px;
 }
 
 .message-profile{

fore-end/components/myOrderCard/index.js

@@ -0,0 +1,26 @@
+// components/myOrderCard/index.js
+Component({
+	/**
+	 * 组件的属性列表
+	 */
+	properties: {
+		item: {
+			type:Object,
+			value:{}
+		}
+	},
+
+	/**
+	 * 组件的初始数据
+	 */
+	data: {
+
+	},
+
+	/**
+	 * 组件的方法列表
+	 */
+	methods: {
+
+	}
+})

fore-end/components/myOrderCard/index.json

@@ -0,0 +1,4 @@
+{
+	"component": true,
+	"usingComponents": {}
+}

fore-end/components/myOrderCard/index.wxml

@@ -0,0 +1,21 @@
+<!--components/myOrderCard/index.wxml-->
+<van-swipe-cell right-width="{{ 100 }}"  >
+  <van-cell-group inset class="commodity-card">
+	<van-cell class="commodity-card-title" style="width: 684rpx; height: 92rpx; display: flex; box-sizing: border-box" border="{{false}}">
+		<view class="commodity-card-title-name" style="position: relative; left: 0rpx; top: 5rpx">{{item.merchantName}}></view>
+		<view class="commodity-card-title-status" style="position: relative; left: 453rpx; top: -46rpx; width: 140rpx; height: 50rpx; display: block; box-sizing: border-box">{{item.commodityState}}</view>
+	</van-cell>
+	<van-cell class="commodity-card-body" style="width: 684rpx; height: 211rpx; display: flex; box-sizing: border-box">
+		<van-image radius="15px" width="80" height="80" src="{{item.commodityUrl}}" style="position: relative; left: -450rpx; top: 5rpx"></van-image>
+		<view class="commodity-card-body-info" style="width: 409rpx; height: 165rpx; display: flex; box-sizing: border-box; position: relative; left: 209rpx; top: -180rpx">
+			<view class="commodity-card-body-info-title" style="position: relative; left: 0rpx; top: 38rpx; width: 282rpx; height: 136rpx; display: block; box-sizing: border-box">{{item.commodityTitle}}</view>
+			<van-cell title="￥{{item.commodityPrice}}" title-style="position:relative;text-align:left;color:red;border:none;" style="position: relative; left: 250rpx; top: -48rpx; width: 142rpx; height: 80rpx; display: block; box-sizing: border-box"></van-cell>
+		</view>
+	</van-cell>
+	<van-cell class="commodity-card-footer">
+		<van-button round size="small" class="commodity-card-footer-btn">联系卖家</van-button>
+		<van-button round size="small" class="commodity-card-footer-btn" color="red">评价</van-button>
+	</van-cell>
+  </van-cell-group>
+  <view slot="right" class="van-swipe-cell__right">删除</view>
+</van-swipe-cell>

fore-end/components/myOrderCard/index.wxss

@@ -0,0 +1,68 @@
+/* components/myOrderCard/index.wxss */
+.van-swipe-cell__left{
+	background-color: seagreen;
+	height: inherit;
+	width: 100px;
+	color: white;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.van-swipe-cell__right{
+	background-color: red;
+	height: inherit;
+	width: 100px;
+	color: white;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.commodity-card{
+	display: flex;
+	flex-direction: column;
+}
+
+.commodity-card-title{
+	display: flex;
+	flex-direction: row;
+}
+
+.commodity-card-title>van-cell{
+	border-bottom: none;
+}
+
+.commodity-card-title-name{
+	position: relative;
+	left: 0px;
+	font-weight: 400;
+	text-align: left;
+	width: 200px;
+}
+
+.commodity-card-title-status{
+	position: relative;
+	right: 0;
+	font-weight: 400;
+	text-align: right;
+	width: 50px;
+}
+
+.commodity-card-body{
+	display: flex;
+}
+
+.commodity-card-body-info{
+	display: flex;
+	flex-direction: column;
+}
+
+.commodity-card-body-info-title{
+	font-weight: 400;
+	text-align: left;
+}
+
+.commodity-card-footer-btn{
+	margin: 2px;
+}

fore-end/pages/chat/chat.js

@@ -0,0 +1,23 @@
+// pages/chat/chat.js
+Component({
+	/**
+	 * 组件的属性列表
+	 */
+	properties: {
+
+	},
+
+	/**
+	 * 组件的初始数据
+	 */
+	data: {
+
+	},
+
+	/**
+	 * 组件的方法列表
+	 */
+	methods: {
+
+	}
+})

fore-end/pages/chat/chat.json

@@ -0,0 +1,4 @@
+{
+	"component": true,
+	"usingComponents": {}
+}

fore-end/pages/chat/chat.wxml

@@ -0,0 +1,2 @@
+<!--pages/chat/chat.wxml-->
+

fore-end/pages/chat/chat.wxss

@@ -0,0 +1 @@
+/* pages/chat/chat.wxss */

fore-end/pages/message/message.js

@@ -1,4 +1,19 @@
 // pages/message/message.js
+const {getUserRelation,addUserRelation} = require('../../API/appraise')
+var getRelationOption = {
+	data:{
+		uid: wx.getStorageSync('uid'),
+	}
+}
+
+var addRelationOption = {
+	data:{
+		"goodsId":2,
+		"owner": '7384540497554968576',
+		"target": '7385700531999608832',
+		"type":1
+	}
+}
 Page({
 
     /**
@@ -64,7 +79,16 @@ Page({
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-
+		addUserRelation(addRelationOption).then((res) => {
+			console.log(res);
+		}).catch((err) => {
+			console.log(err);
+		})
+		getUserRelation(getRelationOption).then((res) => {
+			console.log(res);
+		}).catch((err) => {
+			console.log(err);
+		})
     },
 
     /**

fore-end/pages/myOrder/myOrder.js

@@ -5,7 +5,37 @@ Page({
      * 页面的初始数据
      */
     data: {
-		imageURL: "https://img.js.design/assets/img/64ca47253793e163e2c22e5e.jpg",
+		myOrder:[
+			{
+				id:1,
+				item:{
+					merchantName:'商家1',
+					commodityState: '已售出',
+					commodityUrl: 'https://img.js.design/assets/smartFill/img359164da74c4b8.jpg',
+					commodityTitle: '商品标题',
+					commodityPrice: '10.00'
+				}
+			},
+			{
+				id:2,
+				item:{
+					merchantName:'商家2',
+					commodityState: '待售',
+					commodityUrl: 'https://img.js.design/assets/smartFill/img436164da758808.jpg',
+					commodityTitle: '商品标题',
+					commodityPrice: '20.00'
+				}
+			},{
+				id:3,
+				item:{
+					merchantName:'商家3',
+					commodityState: '已购入',
+					commodityUrl: 'https://img.js.design/assets/smartFill/img424164da758808.jpg',
+					commodityTitle: '商品标题',
+					commodityPrice: '30.00'
+				}
+			}
+		]
     },
 
     /**

fore-end/pages/myOrder/myOrder.json

@@ -1,6 +1,6 @@
 {
 	"component":true,
 	"usingComponents": {
-		"commodity_card": "/components/commodity_card/commodity_card"
+		"myOrder-card": "../../components/myOrderCard/index"
 	}
 }

fore-end/pages/myOrder/myOrder.wxml

@@ -1,21 +1,5 @@
 <!--pages/myOrder.wxml-->
-<van-swipe-cell right-width="{{ 100 }}"  >
-  <van-cell-group inset class="commodity-card">
-	<van-cell class="commodity-card-title" style="width: 684rpx; height: 92rpx; display: flex; box-sizing: border-box" border="{{false}}">
-		<view class="commodity-card-title-name" style="position: relative; left: 0rpx; top: 5rpx">店铺名称></view>
-		<view class="commodity-card-title-status" style="position: relative; left: 453rpx; top: -46rpx; width: 140rpx; height: 50rpx; display: block; box-sizing: border-box">商品状态</view>
-	</van-cell>
-	<van-cell class="commodity-card-body" style="width: 684rpx; height: 211rpx; display: flex; box-sizing: border-box">
-		<van-image radius="15px" width="80" height="80" src="{{imageURL}}" style="position: relative; left: -450rpx; top: 5rpx"></van-image>
-		<view class="commodity-card-body-info" style="width: 409rpx; height: 165rpx; display: flex; box-sizing: border-box; position: relative; left: 209rpx; top: -180rpx">
-			<view class="commodity-card-body-info-title" style="position: relative; left: 0rpx; top: 38rpx; width: 282rpx; height: 136rpx; display: block; box-sizing: border-box">商品标题</view>
-			<van-cell title="￥10.00" title-style="position:relative;text-align:left;color:red;border:none;" style="position: relative; left: 250rpx; top: -48rpx; width: 142rpx; height: 80rpx; display: block; box-sizing: border-box"></van-cell>
-		</view>
-	</van-cell>
-	<van-cell class="commodity-card-footer">
-		<van-button round size="small" class="commodity-card-footer-btn">联系卖家</van-button>
-		<van-button round size="small" class="commodity-card-footer-btn" color="red">评价</van-button>
-	</van-cell>
-  </van-cell-group>
-  <view slot="right" class="van-swipe-cell__right">删除</view>
-</van-swipe-cell>
+
+<view wx:for="{{myOrder}}" wx:key="id">
+	<myOrder-card item="{{item.item}}"></myOrder-card>
+</view>

fore-end/pages/myOrder/myOrder.wxss

@@ -1,68 +1 @@
 /* pages/myOrder.wxss */
-.van-swipe-cell__left{
-	background-color: seagreen;
-	height: inherit;
-	width: 100px;
-	color: white;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.van-swipe-cell__right{
-	background-color: red;
-	height: inherit;
-	width: 100px;
-	color: white;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.commodity-card{
-	display: flex;
-	flex-direction: column;
-}
-
-.commodity-card-title{
-	display: flex;
-	flex-direction: row;
-}
-
-.commodity-card-title>van-cell{
-	border-bottom: none;
-}
-
-.commodity-card-title-name{
-	position: relative;
-	left: 0px;
-	font-weight: 400;
-	text-align: left;
-	width: 200px;
-}
-
-.commodity-card-title-status{
-	position: relative;
-	right: 0;
-	font-weight: 400;
-	text-align: right;
-	width: 50px;
-}
-
-.commodity-card-body{
-	display: flex;
-}
-
-.commodity-card-body-info{
-	display: flex;
-	flex-direction: column;
-}
-
-.commodity-card-body-info-title{
-	font-weight: 400;
-	text-align: left;
-}
-
-.commodity-card-footer-btn{
-	margin: 2px;
-}

fore-end/pages/register/register.wxml

@@ -1,7 +1,7 @@
 <!--pages/register.wxml-->
 <view data-weui-theme="{{theme}}">
   <button class="avatar-wrapper" open-type="chooseAvatar"  bindtap="onChooseAvatar1">
-    <image class="avatar" src="{{avatarUrl}}"></image>
+    <image class="avatar" src="{{avatarUrl}}" mode="center" lazy-load></image>
   </button> 
   <mp-form>
     <mp-cells>