Commit 9007ce839e32cb8f37897803ea1a48193376754b
1 parent
a5d71c59
OA搭配购使用优惠卷
Showing
2 changed files
with
12 additions
and
3 deletions
packageB/pages/zuhegou/preindex/index.wxml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | <text class="iconfont icon-arrow_right"></text> | 6 | <text class="iconfont icon-arrow_right"></text> |
| 7 | </view> | 7 | </view> |
| 8 | </view> | 8 | </view> |
| 9 | - <view wx:if="{{djs}}" class="countdown-container">距结束还剩 | 9 | + <view wx:if="{{djs}}" class="countdown-container">距开始还剩 |
| 10 | <text wx:if="{{djs.day}}">{{djs.day}}天</text> | 10 | <text wx:if="{{djs.day}}">{{djs.day}}天</text> |
| 11 | <text class="num-box">{{djs.hou}}</text> | 11 | <text class="num-box">{{djs.hou}}</text> |
| 12 | : | 12 | : |
pages/cart/cart2/cart2.js
| @@ -976,6 +976,12 @@ Page({ | @@ -976,6 +976,12 @@ Page({ | ||
| 976 | if (gg.prom_type == 5) { | 976 | if (gg.prom_type == 5) { |
| 977 | t.data.data.prom_id = gg.prom_id; | 977 | t.data.data.prom_id = gg.prom_id; |
| 978 | t.data.data.prom_type = 5; | 978 | t.data.data.prom_type = 5; |
| 979 | + | ||
| 980 | + console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon) | ||
| 981 | + th.is_coupon = gg.is_coupon; | ||
| 982 | + th.setData({ | ||
| 983 | + is_coupon: gg.is_coupon | ||
| 984 | + }); | ||
| 979 | if (gg.room_id) { | 985 | if (gg.room_id) { |
| 980 | t.data.data.room_id = gg.room_id; | 986 | t.data.data.room_id = gg.room_id; |
| 981 | } | 987 | } |
| @@ -1050,6 +1056,9 @@ Page({ | @@ -1050,6 +1056,9 @@ Page({ | ||
| 1050 | th.calculatePrice2(); | 1056 | th.calculatePrice2(); |
| 1051 | th.get_cart_quan(); | 1057 | th.get_cart_quan(); |
| 1052 | }); | 1058 | }); |
| 1059 | + | ||
| 1060 | + | ||
| 1061 | + | ||
| 1053 | } else { | 1062 | } else { |
| 1054 | //计算价格 | 1063 | //计算价格 |
| 1055 | th.calculatePrice2(); | 1064 | th.calculatePrice2(); |
| @@ -3257,7 +3266,7 @@ Page({ | @@ -3257,7 +3266,7 @@ Page({ | ||
| 3257 | else { | 3266 | else { |
| 3258 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; | 3267 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; |
| 3259 | } | 3268 | } |
| 3260 | - this.setData({using_quan: using_quan, is_coupon: 2222}); | 3269 | + this.setData({using_quan: using_quan, is_coupon: th.is_coupon}); |
| 3261 | return; | 3270 | return; |
| 3262 | } | 3271 | } |
| 3263 | 3272 | ||
| @@ -3323,7 +3332,7 @@ Page({ | @@ -3323,7 +3332,7 @@ Page({ | ||
| 3323 | else { | 3332 | else { |
| 3324 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; | 3333 | using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1}; |
| 3325 | } | 3334 | } |
| 3326 | - this.setData({using_quan: using_quan, is_coupon: 2222}); | 3335 | + this.setData({using_quan: using_quan, is_coupon: th.is_coupon}); |
| 3327 | return; | 3336 | return; |
| 3328 | } | 3337 | } |
| 3329 | 3338 |