diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index 636ecc3..9a4e7cc 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -46,7 +46,7 @@
搭配价￥{{filters.toFix(data.shop_price+dp_price,2)}}
- 已省￥{{cut_price}}
+ 已省￥{{filters.toFix(cut_price,2)}}
立即购买
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 0e836d6..698cb94 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -55,9 +55,9 @@ Page({
},
onShow: function() {
var th = this;
- th.setData({
- isTabBar: getApp().globalData.isTabBar,
- });
+ //th.setData({
+ // isTabBar: getApp().globalData.isTabBar,
+ //});
t.editTabBar(); //显示自定义的底部导航
this.getCardList();
@@ -78,7 +78,6 @@ Page({
})
}
});
- isTabBar
},
@@ -1191,8 +1190,9 @@ Page({
}).then(res=>{
if(res.data.code==0) discount=res.data.data;
})
- //---如果有打折的信息，赠送的信息---
- if(discount && discount['goods_id']){
+
+ //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
+ if(discount && discount['goods_id'] && discount.limit_num>=discount.bs && discount.gift_storecount>=discount.bs){
var o=discount.goodsinfo;
var newd = {
goods_id: o.goods_id,
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 1644ffd..4d59822 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -717,7 +717,7 @@ Page({
if(item_map.s_coupon_id){
if(!cart_item.s_coupon_id) {
cart_item.s_coupon_id=item_map.s_coupon_id+"";
- cart_item.g_coupon_num=[{'c_id':item_map.s_coupon_id,"num": item_map.s_coupon_num}];
+ cart_item.g_coupon_num=[{'c_id':item_map.s_coupon_id,"num": item_map.s_coupon_nums_coupon_num}];
}
else{
cart_item.s_coupon_id+=","+item_map.s_coupon_id;
@@ -840,12 +840,12 @@ Page({
if(o_price>=freight_free && freight_free>0 && !is_good_no_by && th.data.is_no_by[pickid]!=1){
continue;
}
-
//--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算--
if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1 && !is_good_no_by){
continue;
}
+
//----------------如果是选择了物流---------------------
if(cart_item.exp_type == 0 && item[j].is_free_shipping==0){
//如果地址不为空
@@ -2364,6 +2364,7 @@ Page({
//-----获取购物车进来的劵-------
get_cart_quan:function () {
var th=this;
+ var is_xz_yh=1;
//等待值的出现
getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
var arr=th.data.order_prom_list_cart;
@@ -2387,6 +2388,7 @@ Page({
//如果有限制使用优惠券，就要返回
if(gd.prom_type==3){
if(th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue;
+ is_xz_yh=0;
th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele=1;
}
var item_price=gd.goods_price*gd.goods_num;
@@ -2418,7 +2420,7 @@ Page({
arr[ind].check_quan_price_list=check_quan_price_list;
//是否关闭使用优惠券
- if (th.data.is_close_quan != 1) {
+ if (th.data.is_close_quan != 1 && !is_xz_yh) {
//--调用接口，获取优惠券的列表，3秒钟内控制接口请求--
var url="/api/weshop/couponList/getUseCouponList";
await app.request.promiseGet(url,{ data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:ckeck_quan_price,WareIds:check_quan_ware_list,pageSize:100}}).then(res=>{
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 2ddd364..2193860 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -235,15 +235,13 @@ Page({
if(!e.confirm) return false;
//如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
//if(is_skill==1 || is_zsorder>=2){
-
- getApp().request.delete("/api/weshop/order/cancelTeamOrder/"+os.stoid+"/"+o,{
+ getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
data:{},
success: function(t) {
if(t.data.code==0)
th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
},
})
-
/*----
}else{
getApp().request.put("/api/weshop/order/updatebyId", {
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 7e87bc6..bf1d6dd 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -261,7 +261,7 @@ Page({
//如果是秒杀和拼单的商品，取消订单要返回redis,并取消订单
if (t.confirm) {
//if(is_skill==1 || is_zsorder>=2){
- getApp().request.delete("/api/weshop/order/cancelTeamOrder/" + os.stoid + "/" + a, {
+ getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+a+"/"+getApp().globalData.user_id, {
data: {},
success: function(t) {
if (t.data.code == 0) {
@@ -600,6 +600,7 @@ Page({
pay_next(e){
+ var th=this;
if (e.order_amount == 0) {
var dd = {
parent_sn: e.order_sn,