From a5d71c59f3a9a336d543175fde5a1f61ad261bb4 Mon Sep 17 00:00:00 2001
From: banche <wxdtest@yolipai.com>
Date: Thu, 30 Dec 2021 11:25:37 +0800
Subject: [PATCH] OA搭配促销增加优惠卷开关

---
 packageA/pages/prom_list/prom_list.js | 1 +
 pages/cart/cart2/cart2.js             | 1 -
 pages/cart/cart2/cart2.wxml           | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index 0c8e2ef..45d30d6 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -269,6 +269,7 @@ Page({
     						if (res.data.code == 0) {
 									var r_data = res.data.data;
 									
+									
 									th.data.is_coupon = r_data.collocationPromList.is_coupon;
 									
 					
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index ec21833..53971ab 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -921,7 +921,6 @@ Page({
                                 th.data.check_quan_price_list = t.data.data.offline_price * gg.goods_num + "";
                                 th.data.check_quan_ware_list = t.data.data.erpwareid + "";
                             }
-
                             t.data.data.prom_id = 0;
                             t.data.data.prom_type = 0;
 
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 7be9d90..ff1b79e 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -341,7 +341,6 @@
 				<view bindtap="buycard" class="card_op">立即开通</view>
 			</view>
 
-
 			<view class="set-mes bdr_b-14">
 
 				<view wx:if="{{order.store_prom}}">
--
libgit2 0.21.4