Commit a43bb75fc15ac763dfedaaa823aed5805563f305

Authored by 尹聃
1 parent cd8561baec
Exists in master

合并

src/pages/cart/cart.vue
... ... @@ -28,11 +28,11 @@
28 28 <image :src="item.img_index_url" mode="aspectFit" style="width: 188rpx;height: 168rpx;"></image>
29 29 </view> -->
30 30 <view class="infoRight">
31   - <view class="goodName" @tap="toGoods(item.pid)">{{item.p_name}}</view>
  31 + <view class="goodName" @tap="toGoods(item.pid,item.sk_id)">{{item.p_name}}</view>
32 32 <!-- <view class="describ"> -->
33 33 <uni-collapse accordion="true" >
34 34 <uni-collapse-item showAnimation='true'
35   - :title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...'" >
  35 + :title="item.tag.prod_tag_fun[0].label+'/'+item.tag.prod_tag_fun[1].label+'/'+item.tag.prod_tag_fun[2].label+'...' || '暂无'" >
36 36 <text class="describ">
37 37 <block v-for="tag in item.tag.prod_tag_fun" :key="tag.value">
38 38 {{tag.label+`&nbsp;&nbsp;`}}
... ... @@ -93,7 +93,7 @@ export default {
93 93 computed: {
94 94  
95 95 cartList() {
96   - console.log('cart-list', this.$store.state.cart.cartList);
  96 + // console.log('cart-list', this.$store.state.cart.cartList);
97 97 return this.$store.state.cart.cartList
98 98 },
99 99 childIsOpen() {
... ... @@ -124,10 +124,11 @@ export default {
124 124  
125 125 methods: {
126 126  
127   - toGoods(id) {
128   - console.log('---', '../frameDetail/frameDetail?pid=' + id)
  127 + toGoods(id, sk_id) {
  128 + console.log('cart-list', this.$store.state.cart.cartList);
  129 + console.log('---', '../frameDetail/frameDetail?pid=' + id +'&sk_id='+sk_id)
129 130 uni.navigateTo({
130   - url: '../frameDetail/frameDetail?pid=' + id,
  131 + url: '../frameDetail/frameDetail?pid=' + id+'&sk_id='+sk_id,
131 132 success: res => {},
132 133 fail: () => {},
133 134 complete: () => {}
... ... @@ -550,4 +551,4 @@ export default {
550 551 }
551 552 }
552 553  
553   -</style>
  554 +</style>
554 555 \ No newline at end of file
... ...
src/pages/frameDetail/frameDetail.vue
... ... @@ -336,7 +336,6 @@ export default {
336 336 // 购物车数据
337 337 addCartList: {
338 338 mp_id: 0,
339   - uid: 0,
340 339 sk_id: 0,
341 340 num: 1,
342 341 price: ''
... ... @@ -400,7 +399,6 @@ export default {
400 399 this.addCartList.price = this.goodInfo.p_sale_price
401 400 this.addCartList.sk_id = this.goodInfo.skuList[0].sk_id
402 401 this.addCartList.mp_id = this.goodInfo.glassData.mp_id
403   - this.addCartList.uid = this.$store.state.user.userInfo.uid
404 402 })
405 403 // console.log(this.$store.state.user.userInfo.uid + 'ssss')
406 404 },
... ...