From a43bb75fc15ac763dfedaaa823aed5805563f305 Mon Sep 17 00:00:00 2001
From: yr <1308291615@qq.com>
Date: Wed, 27 May 2020 16:51:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/cart/cart.vue               | 15 ++++++++-------
 src/pages/frameDetail/frameDetail.vue |  2 --
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/pages/cart/cart.vue b/src/pages/cart/cart.vue
index 1414d54..8018652 100644
--- a/src/pages/cart/cart.vue
+++ b/src/pages/cart/cart.vue
@@ -28,11 +28,11 @@
 							<image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
 						</view> -->
 						<view class="infoRight">
-							<view class="goodName" @tap="toGoods(item.pid)">{{item.p_name}}</view>
+							<view class="goodName" @tap="toGoods(item.pid,item.sk_id)">{{item.p_name}}</view>
 							<!-- <view class="describ"> -->
 								<uni-collapse accordion="true" >
 									<uni-collapse-item showAnimation='true'
-									:title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...'" >
+									:title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...' || '暂无'" >
 										<text class="describ">
 											<block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
 												{{tag.label+`&nbsp;&nbsp;`}}
@@ -93,7 +93,7 @@ export default {
   computed: {
 
     cartList() {
-      console.log('cart-list', this.$store.state.cart.cartList);
+      // console.log('cart-list', this.$store.state.cart.cartList);
       return this.$store.state.cart.cartList
     },
     childIsOpen() {
@@ -124,10 +124,11 @@ export default {
 
   methods: {
 
-    toGoods(id) {
-	  console.log('---', '../frameDetail/frameDetail?pid=' + id)
+    toGoods(id, sk_id) {
+	  console.log('cart-list', this.$store.state.cart.cartList);
+	  console.log('---', '../frameDetail/frameDetail?pid=' + id +'&sk_id='+sk_id)
 	  uni.navigateTo({
-	    url: '../frameDetail/frameDetail?pid=' + id,
+	    url: '../frameDetail/frameDetail?pid=' + id+'&sk_id='+sk_id,
 	    success: res => {},
 	    fail: () => {},
 	    complete: () => {}
@@ -550,4 +551,4 @@ export default {
 		}
 	}
 
-</style>
+</style>
\ No newline at end of file
diff --git a/src/pages/frameDetail/frameDetail.vue b/src/pages/frameDetail/frameDetail.vue
index d9cc741..f7fdcc4 100644
--- a/src/pages/frameDetail/frameDetail.vue
+++ b/src/pages/frameDetail/frameDetail.vue
@@ -336,7 +336,6 @@ export default {
       // 购物车数据
       addCartList: {
         mp_id: 0,
-        uid: 0,
         sk_id: 0,
         num: 1,
         price: ''
@@ -400,7 +399,6 @@ export default {
       this.addCartList.price = this.goodInfo.p_sale_price
       this.addCartList.sk_id = this.goodInfo.skuList[0].sk_id
       this.addCartList.mp_id = this.goodInfo.glassData.mp_id
-      this.addCartList.uid = this.$store.state.user.userInfo.uid
     })
     // console.log(this.$store.state.user.userInfo.uid + 'ssss')
   },
-- 
2.0.0