Commit 38d768ed2ea0ee3e56f21070abf73172e9a4fa06
1 parent
26b322c4
小程序的优化,优惠促销指定会员参与
Showing
2 changed files
with
20 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -5614,6 +5614,21 @@ Page({ | @@ -5614,6 +5614,21 @@ Page({ | ||
5614 | goods.prom_id = g_item.prom_id; | 5614 | goods.prom_id = g_item.prom_id; |
5615 | break; | 5615 | break; |
5616 | case 3: | 5616 | case 3: |
5617 | + | ||
5618 | + //判断一个优惠促销商品用户参与的问题 | ||
5619 | + let grs= await getApp().request.promiseGet("/api/weshop/promgoods/getUser/" + oo.stoid + "/" + g_item.prom_id+"/"+ getApp().globalData.user_id, {}); | ||
5620 | + if(!grs || grs.data.code==-1){ | ||
5621 | + let error_ts=goods.goods_name + "未找到优惠促销活动"; | ||
5622 | + if(grs && grs.data.msg.indexOf('无权限')>-1){ | ||
5623 | + error_ts=goods.goods_name + "无权限参与优惠促销活动"; | ||
5624 | + } | ||
5625 | + | ||
5626 | + getApp().confirmBox(error_ts); | ||
5627 | + th.data.is_summit_ing = 0; | ||
5628 | + th.setData({ submit: 0 }) | ||
5629 | + return false; | ||
5630 | + } | ||
5631 | + | ||
5617 | goods.prom_type = 3; | 5632 | goods.prom_type = 3; |
5618 | goods.prom_id = g_item.prom_id; | 5633 | goods.prom_id = g_item.prom_id; |
5619 | if (g_item.is_gift) { | 5634 | if (g_item.is_gift) { |
pages/user/order_list/order_list.js
@@ -137,6 +137,10 @@ Page({ | @@ -137,6 +137,10 @@ Page({ | ||
137 | onShow: function () { | 137 | onShow: function () { |
138 | wx.showLoading(); | 138 | wx.showLoading(); |
139 | var th=this; | 139 | var th=this; |
140 | + th.setData({ | ||
141 | + cardList:[], | ||
142 | + list2:[] | ||
143 | + }); | ||
140 | //-- 读取会员的信息先 --,再app.js中有 | 144 | //-- 读取会员的信息先 --,再app.js中有 |
141 | this.check_user_storage(()=> { | 145 | this.check_user_storage(()=> { |
142 | //在界面显示 | 146 | //在界面显示 |
@@ -989,7 +993,7 @@ Page({ | @@ -989,7 +993,7 @@ Page({ | ||
989 | } | 993 | } |
990 | 994 | ||
991 | if (!r_data.promGoodsLists && good.prom_type == 3) { | 995 | if (!r_data.promGoodsLists && good.prom_type == 3) { |
992 | - var content = good.goods_name + '未找到活动,请取消订单重新购买'; | 996 | + var content = good.goods_name + '未找到活动或您无权限参与该活动,请取消订单重新购买'; |
993 | th.toast(content); | 997 | th.toast(content); |
994 | p_ok = 0; | 998 | p_ok = 0; |
995 | }else if(r_data.promGoodsLists && good.prom_type == 3){ | 999 | }else if(r_data.promGoodsLists && good.prom_type == 3){ |