diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml
index 0840d24..0311530 100644
--- a/packageA/pages/quan_list/quan_list.wxml
+++ b/packageA/pages/quan_list/quan_list.wxml
@@ -19,11 +19,11 @@
{{item.name}}
所有门店通用
有效期
- {{filters.format_time(getcurday+3600*24*item.startdays)}}
+ {{filters.format_time(getcurday+3600*24*item.startdays)}}
{{filters.format_time(item.use_start_time)}}至
{{filters.format_time(item.use_end_time)}}不限
- 有效期 {{filters.format_time(getcurday+3600*24*item.startdays)}}至 {{filters.format_time(getcurday+3600*24*item.days)}}不限
+ 有效期 {{filters.format_time(getcurday+3600*24*item.startdays)}}至 {{filters.format_time(getcurday+3600*24*item.days)}}不限
每人限领:{{item.everyone_num}}不限
diff --git a/packageA/pages/quan_pro/quan_pro.js b/packageA/pages/quan_pro/quan_pro.js
index 6484b13..15a91bf 100644
--- a/packageA/pages/quan_pro/quan_pro.js
+++ b/packageA/pages/quan_pro/quan_pro.js
@@ -96,10 +96,8 @@ Page({
th.data.linging = 0;
if (res.data.code == 0) {
item.lqnum++;
- var text = "dataList[" + index + "].is_get";
- var text2 = "dataList[" + index + "].linging";
var text3="q_data";
- var obj = {};obj[text] = 1; obj[text2] = 0;obj[text3] = item;obj['show_success']=1;
+ var obj = {};obj[text3] = item;obj['show_success']=1;
th.setData(obj);
} else {
app.confirmBox(res.data.msg);
diff --git a/packageA/pages/quan_pro/quan_pro.wxml b/packageA/pages/quan_pro/quan_pro.wxml
index e2c79f5..219c326 100644
--- a/packageA/pages/quan_pro/quan_pro.wxml
+++ b/packageA/pages/quan_pro/quan_pro.wxml
@@ -13,7 +13,7 @@
{{q_data.name}}
-
+
全场通用
仅限{{q_data.useobjectname}}使用
@@ -24,13 +24,13 @@
有效期
- {{filters.format_time(getcurday+3600*24*q_data.startdays)}}
+ {{filters.format_time(getcurday+3600*24*q_data.startdays)}}
{{filters.format_time(q_data.use_start_time)}}至
{{filters.format_time(q_data.use_end_time)}}不限
有效期
- {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至
+ {{filters.format_time(getcurday+3600*24*q_data.startdays)}}至
{{filters.format_time(getcurday+3600*24*q_data.days)}}不限
@@ -57,7 +57,7 @@
- 恭喜您获得【{{get_item.name}}】优惠券
+ 恭喜您获得【{{q_data.name}}】优惠券
查看我的优惠券
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 376b3f8..742e1c1 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2200,8 +2200,8 @@ Page({
var by_cart_list=this.data.by_quan_list_cart;
if(by_cart_list){
//---所有的券的显示红色选择都清理一遍---
- for(var ind in by_cart_list){
- by_cart_list[ind].show_red=0;
+ for(var inc in by_cart_list){
+ by_cart_list[inc].show_red=0;
}
this.setData({by_quan_list_cart:by_cart_list});
}
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 135e67a..d14dfd5 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -172,9 +172,8 @@ Page({
var arr = [1219, 2089, 3031];
var new_arr = new Array();
for (var i = 0; i < plusCard.length; i++) {
- //plusCard[i].free=arr[i];
-
-
+ //plusCard[i].free=arr[i];
+ if(plusCard[i].IsStopBuy) { continue; }
if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1";
var item = {"fee": plusCard[i].CardFee, 'index': i}
new_arr.push(item);
@@ -190,6 +189,14 @@ Page({
return 1;
}
});
+
+ //里面和外面要显示统一
+ switch (new_arr.length) {
+ case 1:arr=[3031]; break;
+ case 2: arr = [2089, 3031]; break;
+ case 3: arr = [1219, 2089, 3031];break;
+ }
+
//---给数组添加立省多少钱---
for (i = 0; i < plusCard.length; i++) {
//判断是否停用