Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents ad422e94 c5f945f6
Showing 2 changed files with 12 additions and 3 deletions
packageB/pages/zuhegou/preindex/index.wxml
pages/cart/cart2/cart2.js
@@ -6,7 +6,7 @@
             <text class="iconfont icon-arrow_right"></text>
         </view>
     </view>
-    <view wx:if="{{djs}}" class="countdown-container">距结束还剩
+    <view wx:if="{{djs}}" class="countdown-container">距开始还剩
         <text wx:if="{{djs.day}}">{{djs.day}}天</text>
         <text class="num-box">{{djs.hou}}</text>
         :
@@ -976,6 +976,12 @@ Page({
                                 if (gg.prom_type == 5) {
                                     t.data.data.prom_id = gg.prom_id;
                                     t.data.data.prom_type = 5;
+
+                                    // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
+                                    th.is_coupon = gg.is_coupon;
+                                    th.setData({
+                                        is_coupon: gg.is_coupon
+                                    });
                                     if (gg.room_id) {
                                         t.data.data.room_id = gg.room_id;
                                     }
@@ -1050,6 +1056,9 @@ Page({
                                         th.calculatePrice2();
                                         th.get_cart_quan();
                                     });
+
+                                    
+
                                 } else {
                                     //计算价格
                                     th.calculatePrice2();
@@ -3263,7 +3272,7 @@ Page({
             else {
                 using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
             return;
         }
  
@@ -3329,7 +3338,7 @@ Page({
             else {
                 using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
             return;
         }