1 participants
-
Status changed to merged
-
mentioned in commit fdfab9a22accd8e085134ac3ebf30fd66c9d8511
Showing
1 changed file
packageC/pages/presell/cart/cart2.js
| @@ -472,13 +472,7 @@ Page({ | @@ -472,13 +472,7 @@ Page({ | ||
| 472 | wx.showToast({title: "未找到商品", icon: 'none', duration: 3000}); | 472 | wx.showToast({title: "未找到商品", icon: 'none', duration: 3000}); |
| 473 | return false; | 473 | return false; |
| 474 | } | 474 | } |
| 475 | - | ||
| 476 | - if(act.is_usecoupon==1){ | ||
| 477 | - th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; | ||
| 478 | - th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; | ||
| 479 | - th.data.check_quan_ware_list = t.data.data.erpwareid + ""; | ||
| 480 | - } | ||
| 481 | - | 475 | + |
| 482 | //这个位置要拿活动的预售价 | 476 | //这个位置要拿活动的预售价 |
| 483 | t.data.data.shop_price = prelist.presell_money; | 477 | t.data.data.shop_price = prelist.presell_money; |
| 484 | th.setData({ | 478 | th.setData({ |
| @@ -492,6 +486,13 @@ Page({ | @@ -492,6 +486,13 @@ Page({ | ||
| 492 | act:act | 486 | act:act |
| 493 | }); | 487 | }); |
| 494 | 488 | ||
| 489 | + if(act.is_usecoupon==1){ | ||
| 490 | + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; | ||
| 491 | + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; | ||
| 492 | + th.data.check_quan_ware_list = t.data.data.erpwareid + ""; | ||
| 493 | + } | ||
| 494 | + | ||
| 495 | + | ||
| 495 | //计算价格 | 496 | //计算价格 |
| 496 | th.calculatePrice2(); | 497 | th.calculatePrice2(); |
| 497 | //获取优惠券,如果有券的钱，就调用 | 498 | //获取优惠券,如果有券的钱，就调用 |