diff --git a/packageD/pages/user/coupons/coupons.wxml b/packageD/pages/user/coupons/coupons.wxml
index 9847e81..5692b70 100644
--- a/packageD/pages/user/coupons/coupons.wxml
+++ b/packageD/pages/user/coupons/coupons.wxml
@@ -37,7 +37,7 @@
- 使用说明:{{filter.showtypeName(detail.type)}}【消费满{{time.toFix(detail.condition,2)}}元可用】
+ 使用说明:{{filter.showtypeName(detail.type)}}【消费满{{time.toFix(detail.condition,2)}}元可用】
@@ -66,8 +66,10 @@
- 使用说明:{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark1}};活动名称:{{detail.ActName}}、活动编号:{{detail.ActNo}}、使用场景:{{ (detail.UseRange && detail.UseRange !=0) ? (detail.UseRange==1 ? '仅线下可用' : '仅线上可用') :'通用'}}
- 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};活动名称:{{detail.ActName}}、活动编号:{{detail.ActNo}}、使用场景:{{(detail.UseRange && detail.UseRange !=0) ? (detail.UseRange==1 ? '仅线下可用' : '仅线上可用') :'通用'}}
+
+ 使用说明:{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark1}};活动名称:{{detail.ActName}}、活动编号:{{detail.ActNo}}、使用场景:{{ (detail.UseRange && detail.UseRange !=0) ? (detail.UseRange==1 ? '仅线下可用' : '仅线上可用') :'通用'}} 取价规则:零售价 实收价
+
+ 使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};活动名称:{{detail.ActName}}、活动编号:{{detail.ActNo}}、使用场景:{{(detail.UseRange && detail.UseRange !=0) ? (detail.UseRange==1 ? '仅线下可用' : '仅线上可用') :'通用'}} 取价规则:零售价 实收价
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index c050d7b..65f05a7 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -9270,7 +9270,6 @@ Page({
var cx_prom_group = this.data.cartlist[idx].show_can_cx[gd_key].act_arr;
var cx_arr = [];
-
for (var h = 0; h < cx_prom_group.length; h++) {
cx_prom_group[h].act.sele = 0;
//-- 看有没有选中的活动 --
@@ -9302,11 +9301,16 @@ Page({
//-- 切换活动的时候,让订单促销参与不选中 --
let tt_wd = "can_use_ord_prom[" + pk + "]";
+
+ let using_quan =this.data.using_quan;
+ using_quan[pk]={};
+
th.setData({
send_lb: {},
month_lb: {},
send_gf: {},
- [tt_wd]: 0
+ [tt_wd]: 0,
+ using_quan:using_quan
})
th.data.prom_goods_map = {};
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 244cdbf..2d9e563 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -924,7 +924,7 @@
-
+
diff --git a/packageE/pages/cart/cart2/remark_part_qj.wxml b/packageE/pages/cart/cart2/remark_part_qj.wxml
new file mode 100644
index 0000000..5dd8cf3
--- /dev/null
+++ b/packageE/pages/cart/cart2/remark_part_qj.wxml
@@ -0,0 +1,10 @@
+
+
+ {{util.format(item.Remark)}}
+
+ 仅{{item.UseObjectName}}使用
+ 全场通用
+
+ 取价规则:零售价实收价
+
+
\ No newline at end of file