diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 25ab894..45addc6 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -168,6 +168,8 @@ Page({
bconfig: null,
showFold:true,
+
+ ly_map:{}
},
@@ -1036,8 +1038,11 @@ Page({
}
}
- arr[j].exp_type = e_t;
- if (e_t == 0) th.setData({ is_all_zt: 0 });
+ if(car_item.is_gift != 1){
+ arr[j].exp_type = e_t;
+ if (e_t == 0) th.setData({ is_all_zt: 0 });
+ }
+
//else if (e_t == 1) th.setData({ is_all_zt: 1 });
}
@@ -2094,6 +2099,8 @@ Page({
payWithPoints: !(t.detail.value.length > 0)
});
},
+
+
keyUpChangeNum: function (t) {
var index = t.currentTarget.dataset.index;
var txt = "user_note." + index;
@@ -2104,6 +2111,22 @@ Page({
},
+ show_ly:function (t){
+ var index = t.currentTarget.dataset.index;
+ var txt='ly_map['+index+']';
+ this.setData({
+ [txt]:1
+ })
+ },
+
+ hide_ly:function (t){
+ var index = t.currentTarget.dataset.index;
+ var txt='ly_map['+index+']';
+ this.setData({
+ [txt]:0
+ })
+ },
+
//寻找活动在列表中的最后一个
find_pro_last(ord_goods,prom_type,prom_id){
if(!ord_goods || ord_goods.length==0) return -1;
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index ced56d9..17eaaed 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -251,6 +251,68 @@
立即开通
+
+
+
+
+
+ 赠{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
+
+
+
+ x{{send.num}}
+
+
+
+
+
+
+
+
+
+ 赠{{send.monthlbtitle}}
+
+
+
+ x{{send.monthnum}}
+
+
+
+
+
+
+
+
+
+ 赠{{iter.name}} 可选赠品{{iter.zp_num}}个
+
+
+
+ 已选择
+
+
+
+ 未选择
+
+
+
+
+
+
+
+
+
+ 优惠券{{item.can_num}}张可用
+
+ 不使用
+ ￥{{using_quan[item.pickup_id].money}}元优惠券
+ 包邮券
+
+
+
+
+
+
@@ -322,70 +384,8 @@
-
-
-
-
-
- 赠{{send.zxlbtitle?send.zxlbtitle:send.lbtitle}}
-
-
-
- x{{send.num}}
-
-
-
-
-
-
-
-
-
- 赠{{send.monthlbtitle}}
-
-
-
- x{{send.monthnum}}
-
-
-
-
-
-
-
-
-
- 赠{{iter.name}} 可选赠品{{iter.zp_num}}个
-
-
-
- 已选择
-
-
-
- 未选择
-
-
-
-
-
-
-
-
-
- 优惠券{{item.can_num}}张可用
-
- 不使用
- ￥{{using_quan[item.pickup_id].money}}元优惠券
- 包邮券
-
-
-
-
-
-
-
-
+
+
{{bconfig.service_bz}}
@@ -395,11 +395,23 @@
+
留言
-
+
+
+
+
+
+ {{user_note[pidx]?user_note[pidx]:'给商家留言，最多100字'}}
+
+
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 2216961..765e2e7 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -279,6 +279,28 @@ Page({
arr[i].content.gift_name=res.data.data.pageData[0].goods_name;
})
}
+
+ //--送专享礼包--
+ if(parseInt(content.is_zxlibao)) {
+ //-- 获取 --
+ await getApp().request.promiseGet("/api/weshop/marketing/giftbag/detail/getNew1?storeId="+oo.stoid+"&giftBagId="+content.zxlibao, {
+ }).then(res => {
+ if(res.data.code==0 && res.data.data)
+ arr[i].content.zxlb_name=res.data.data.lbTitle;
+ })
+ }
+
+ //--送专享礼包--
+ if(parseInt(content.is_monthgiftbag)) {
+ //-- 获取 --
+ await getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagForm/get/"+oo.stoid+"/"+content.monthgiftbag, {
+ }).then(res => {
+ if(res.data.code==0 && res.data.data)
+ arr[i].content.monthgift_name=res.data.data.act_name;
+ })
+ }
+
+
}
th.setData({prom_goods_list:arr});
},
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 143baad..d130efb 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -13,6 +13,8 @@
送{{item.content.coupon}}元优惠券
送{{item.content.zp_mode==1?'多赠品':item.content.gift_name}}
送{{item.content.lb_name}}
+ 送{{item.content.zxlb_name}}
+ 送{{item.content.monthgift_name}}