diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 83bd301..73a41f7 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1129,7 +1129,14 @@ Page({
map.set(item.prom_id+"",ob);
}
}
+
+ if(item.is_gift==1){
+ var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
+ getApp().request.delete(url, {});
+ list.goods.splice(i,1);
+ }
}
+
var map2=new Map();
//请那些是赠品,但是优惠活动并没有被选中的商品要删除,同时满足条件的要放到map2,
for(var i in list.goods){
@@ -1229,17 +1236,9 @@ Page({
}
}
}
- else{
- //---条件不到,删除相应的赠品---
- for(var gi in list.goods){
- var item=list.goods[gi];
- if(item.is_gift==1 && item.prom_id==discount.prom_id){
- var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id;
- getApp().request.delete(url, {});
- list.goods.splice(gi,1);
- }
- }
- }
+
+
+
//-- 获取 --
await getApp().request.promiseGet("/api/weshop/promgoodslist/list",{
data:{prom_id:prom.id}
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index e3b798b..79a0ab8 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -311,12 +311,12 @@
优惠活动
- - ¥ {{formData.cut_price}}元
+ - ¥ {{filters.toFix(formData.cut_price,2)}}元
订单优惠
- - ¥ {{formData.order_prom_amount}}元
+ - ¥ {{filters.toFix(formData.order_prom_amount,2)}}元
使用余额
diff --git a/pages/cart/cart2/cart2.wxss b/pages/cart/cart2/cart2.wxss
index cb34f2a..c10b952 100644
--- a/pages/cart/cart2/cart2.wxss
+++ b/pages/cart/cart2/cart2.wxss
@@ -346,7 +346,7 @@ margin:auto;
}
.xc-frame{
width: 100%;
- height:68.9%;
+ height:60%;
}
.xc-frame .list-frame{
@@ -480,11 +480,7 @@ padding-left: 40rpx;
margin-top: 30rpx;
}
-.cx-popup.radius{
-
-height: 650rpx;
-}
.xc-hook {
width: 33rpx;
height: 33rpx;