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

abson
2 parents 076c0d3a a5d71c59
Showing 3 changed files with 1 additions and 2 deletions
packageA/pages/prom_list/prom_list.js
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
@@ -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;
@@ -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;
@@ -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}}">