From 9007ce839e32cb8f37897803ea1a48193376754b Mon Sep 17 00:00:00 2001
From: banche <wxdtest@yolipai.com>
Date: Thu, 30 Dec 2021 17:54:11 +0800
Subject: [PATCH] OA搭配购使用优惠卷

---
 packageB/pages/zuhegou/preindex/index.wxml |  2 +-
 pages/cart/cart2/cart2.js                  | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packageB/pages/zuhegou/preindex/index.wxml b/packageB/pages/zuhegou/preindex/index.wxml
index cf64874..6a7929e 100644
--- a/packageB/pages/zuhegou/preindex/index.wxml
+++ b/packageB/pages/zuhegou/preindex/index.wxml
@@ -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>
         :
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 53971ab..d6f499d 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -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();
@@ -3257,7 +3266,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;
         }
 
@@ -3323,7 +3332,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;
         }
 
--
libgit2 0.21.4