From db5b5fe00da234e8f2903f7076f3a6204d656da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=96=BB=E9=B9=8F?= <1242402566@qq.com>
Date: Thu, 14 May 2020 18:29:01 +0800
Subject: [PATCH] =?UTF-8?q?"=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/myOrderPaying/myOrderPaying.vue |  2 +-
 src/pages/user/user.vue                   | 17 +++++++++++++----
 src/store/url.js                          |  7 +++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/pages/myOrderPaying/myOrderPaying.vue b/src/pages/myOrderPaying/myOrderPaying.vue
index 2805b99..e82cf6f 100644
--- a/src/pages/myOrderPaying/myOrderPaying.vue
+++ b/src/pages/myOrderPaying/myOrderPaying.vue
@@ -16,7 +16,7 @@
 				</view>
 				<view class="order-user-body">	
 					<image src="../../static/myorder-paying-location.png"></image>
-					<text class="p3">四川省 德阳市 旌阳区</br>黄河西路碧桂园3期 4单元 202</text>
+					<text class="p3">四川省 德阳市 旌阳区\n黄河西路碧桂园3期 4单元 202</text>
 				</view>
 			</view>
 			<view class="order-info">
diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue
index d10a01c..8760cab 100644
--- a/src/pages/user/user.vue
+++ b/src/pages/user/user.vue
@@ -27,7 +27,7 @@
 						<text>待付款</text>
 					</view>
 					<view class="item waitDeliver" @click="toPredelivery" >
-						<image src="../../static/waitDeliver.png" mode="aspectFill"></image>
+						<image src="../../static/waitPay.png" mode="aspectFill"></image>
 						<text>待发货</text>
 					</view>
 					<view class="item waitReceive" @click="torefunProgress">
@@ -62,7 +62,8 @@
 </template>
 
 <script>
-	import Card from "@/components/CommodityCard/CommodityCard.vue"
+	import Card from "@/components/CommodityCard/CommodityCard.vue";
+	import store from '@/store';
 	export default {
 		components: {
 			'Card':Card
@@ -87,8 +88,16 @@
 				userName:'Adam'
 			}
 		},
-		onLoad() {
-
+		onLoad: function() {
+			store.dispatch('userRecommand/getRecommandList', {
+				uid: 2,
+			});
+		},
+		computed: {
+			userRecommandList() {
+				console.log('recommandList', this.$store.state.userRecommand.recommandList);
+				return this.$store.state.userRecommand.recommandList;
+			}
 		},
 		methods: {
 			toMyOrder(){
diff --git a/src/store/url.js b/src/store/url.js
index 23e6d40..942e9dc 100644
--- a/src/store/url.js
+++ b/src/store/url.js
@@ -6,6 +6,13 @@ const urlAlias = {
 
     // 我的订单
     orderList: '/app/order/list', // 获取订单列表
+	
+	
+	// 购物车
+	cartList: '/app/cart/list', // 获取购物车列表
+	
+	// 我的
+	recommandList:'/app/prod/recommand', // 获取用户个性化推荐商品
 }
 
 export default  urlAlias;
-- 
2.0.0