diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 9562563..655d83c 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -5614,6 +5614,21 @@ Page({ goods.prom_id = g_item.prom_id; break; case 3: + + //判断一个优惠促销商品用户参与的问题 + let grs= await getApp().request.promiseGet("/api/weshop/promgoods/getUser/" + oo.stoid + "/" + g_item.prom_id+"/"+ getApp().globalData.user_id, {}); + if(!grs || grs.data.code==-1){ + let error_ts=goods.goods_name + "未找到优惠促销活动"; + if(grs && grs.data.msg.indexOf('无权限')>-1){ + error_ts=goods.goods_name + "无权限参与优惠促销活动"; + } + + getApp().confirmBox(error_ts); + th.data.is_summit_ing = 0; + th.setData({ submit: 0 }) + return false; + } + goods.prom_type = 3; goods.prom_id = g_item.prom_id; if (g_item.is_gift) { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 8d3b471..f73b709 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -137,6 +137,10 @@ Page({ onShow: function () { wx.showLoading(); var th=this; + th.setData({ + cardList:[], + list2:[] + }); //-- 读取会员的信息先 --,再app.js中有 this.check_user_storage(()=> { //在界面显示 @@ -989,7 +993,7 @@ Page({ } if (!r_data.promGoodsLists && good.prom_type == 3) { - var content = good.goods_name + '未找到活动,请取消订单重新购买'; + var content = good.goods_name + '未找到活动或您无权限参与该活动,请取消订单重新购买'; th.toast(content); p_ok = 0; }else if(r_data.promGoodsLists && good.prom_type == 3){