diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index f6496ff..8c37d26 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -241,7 +241,7 @@ Page({
},
}).then(res => {
- if(res.data.code && res.data.data && res.data.data.length>0){
+ if(res.data.code==0 && res.data.data && res.data.data.length>0){
by_map={};
for(let i in res.data.data){
let item=res.data.data[i];
@@ -405,7 +405,6 @@ Page({
pageSize: 2000,
store_id: os.stoid,
zh_id: item.prom_id,
- goods_id:item.goods_id
}
await getApp().request.promiseGet(url1, {
data: req_data
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index d241d0b..8552068 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2342,6 +2342,7 @@ Page({
//-------------让商品添加到商品列表--------------------
for (var k = 0; k < t_item.goods.length; k++) {
var g_item = t_item.goods[k];
+ if(g_item.goods_num<=0) continue;
var goods = {
'goods_id': g_item.goods_id,
'goods_name': g_item.goods_name,
diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 3f88339..d16b14a 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -76,7 +76,7 @@
{{item.pname}}
-
+
@@ -104,6 +104,7 @@
x{{items.goods_num}}
+
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 49538cd..e7426d4 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -822,11 +822,16 @@ Page({
moreOrder:function(e){
var th=this;
var item=th.data.order;
+
+ if(this.data.moring) return false;
+ this.data.moring=1;
+
th.check_more_order(item);
},
check_more_order:async function(item){
var pickup=null,th=this;
+ wx.showLoading();
//--------获取门店-----------
await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
@@ -1056,40 +1061,7 @@ Page({
b_item.goods_num=good['viplimited'];
}
}
-
- //--要计算一下限购 --
- if(b_item.prom_type==7){
- var url1 = "/api/weshop/prom/zhbuyGoods/page";
- var req_data = {
- page: 1,
- pageSize: 2000,
- store_id: os.stoid,
- zh_id: b_item.prom_id,
- goods_id:b_item.goods_id
- }
- await getApp().request.promiseGet(url1, {
- data: req_data
- }).then(res => {
- if (ut.ajax_ok(res)) {
- var gdlist = res.data.data.pageData[0];
- b_item.buyqty=gdlist.buyqty;
- }
- })
-
-
- //---- 要计算商品的限购 -----
- if(b_item['buyqty']>0){
- if(cart_num+buynum>b_item['buyqty']){
- err_text+= good['goods_name']+"超出限购\n";
- continue;
- }
- b_item['buyqty']-=(cart_num+buynum);
- if(b_item.goods_num>b_item['buyqty']){
- b_item.goods_num=b_item['buyqty'];
- }
- }
- }
-
+ //不需要计算组合购的限购
back_goods_arr.push(b_item); //返回商品元素
@@ -1218,12 +1190,19 @@ Page({
if (res.confirm) {
//跳转到登录页
th.more_add_cart();
- }
- }
+ }else{
+ th.data.moring=0;
+ wx.hideLoading();
+ }
+ },fail(){
+ th.data.moring=0;
+ wx.hideLoading();
+ }
});
}
}else{
+ th.data.moring=0;
wx.hideLoading();
getApp().confirmBox(err_text);
}
@@ -1319,7 +1298,8 @@ Page({
}
}
- wx.hideLoading();
+ wx.hideLoading();
+ this.data.moring=0;
if(ok_num==0){
//-- 如果没有获取用户信息 --
wx.showModal({
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 6aac307..66ebeac 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -488,11 +488,78 @@ Page({
var buyed_mum2=goodsbuynum+good.goods_num;
if (buyed_mum2 > limit && limit > 0) {
-
var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
th.toast(content);
return false;
}
+
+ //当是组合优惠的时候
+ if(good.prom_type==7){
+ //如果有组合购
+ var isok = 1;
+ var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id;
+ await getApp().request.promiseGet(url, {}).then(res => {
+ if(res.data.code==0 && res.data.data){
+ if(res.data.data.is_show!=1){
+ isok=0;
+ }
+ //如果活动已经结束
+ if(res.data.data.is_end==1){
+ isok=0;
+ }
+ //已经结束
+ if(ut.gettimestamp()>res.data.data.end_time){
+ isok=0;
+ }
+ //还未开始
+ if(ut.gettimestamp() {
+ if (ut.ajax_ok(res)) {
+ var gdlist = res.data.data.pageData[0];
+ good.buyqty=gdlist.buyqty;
+ }
+ })
+
+ var num=good['buyqty'];
+ console.log(1111);
+ console.log(num);
+ //---- 要计算商品的限购 -----
+ if(good['buyqty']>0){
+ if(good.goods_num+promgoodsbuynum>good['buyqty']){
+
+ var content= good['goods_name']+"超出活动限购\n";
+ th.toast(content);
+ return false;
+ }
+ }
+ }
+
+
//如果优惠促销和搭配购的时候
if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){
@@ -753,6 +820,8 @@ Page({
}
}
+
+ return false;
th.pay_next(e,o_index);
},
@@ -923,6 +992,10 @@ Page({
//再来一单的功能的实现
moreOrder:function(e){
+
+ if(this.data.moring) return false;
+ this.data.moring=1;
+
var th=this;
var index=e.currentTarget.dataset.index;
var item=th.data.orderList[index];
@@ -931,6 +1004,7 @@ Page({
check_more_order:async function(item){
var pickup=null,th=this;
+ wx.showLoading();
//--------获取门店-----------
await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, {
@@ -1165,40 +1239,7 @@ Page({
b_item.goods_num=good['viplimited'];
}
}
-
- //--要计算一下限购 --
- if(b_item.prom_type==7){
- var url1 = "/api/weshop/prom/zhbuyGoods/page";
- var req_data = {
- page: 1,
- pageSize: 2000,
- store_id: os.stoid,
- zh_id: b_item.prom_id,
- goods_id:b_item.goods_id
- }
- await getApp().request.promiseGet(url1, {
- data: req_data
- }).then(res => {
- if (ut.ajax_ok(res)) {
- var gdlist = res.data.data.pageData[0];
- b_item.buyqty=gdlist.buyqty;
- }
- })
-
-
- //---- 要计算商品的限购 -----
- if(b_item['buyqty']>0){
- if(cart_num+buynum>b_item['buyqty']){
- err_text+= good['goods_name']+"超出限购\n";
- continue;
- }
- b_item['buyqty']-=(cart_num+buynum);
- if(b_item.goods_num>b_item['buyqty']){
- b_item.goods_num=b_item['buyqty'];
- }
- }
- }
-
+ //不算组合购的限购
back_goods_arr.push(b_item); //返回商品元素
}else{
@@ -1324,12 +1365,21 @@ Page({
if (res.confirm) {
//跳转到登录页
th.more_add_cart();
- }
- }
+ }else{
+ wx.hideLoading();
+ th.data.moring=0;
+ }
+ },
+ fail: function (res) {
+ wx.hideLoading();
+ th.data.moring=0;
+ },//接口调用失败的回调函数
});
}
}else{
+ wx.hideLoading();
+ this.data.moring=0;
getApp().confirmBox(err_text);
}
},
@@ -1338,7 +1388,7 @@ Page({
var back_goods_arr=this.data.back_goods_arr;
var err_text="";
var ok_num=0;
-
+
for(var i in back_goods_arr){
//商品ID
var g_item=back_goods_arr[i];
@@ -1427,8 +1477,9 @@ Page({
}
})
}
- }
-
+ }
+ wx.hideLoading();
+ this.data.moring=0;
if(ok_num==0){
//-- 如果没有获取用户信息 --
wx.showModal({
@@ -1453,7 +1504,6 @@ Page({
});
}
-
}
},