Commit 961ce8e2682539b34587feecd8f3c115521622dc
1 parent
afa8cf99
拼团的指定门店
Showing
3 changed files
with
47 additions
and
9 deletions
packageA/pages/details_serviceCard/details_serviceCard.js
| @@ -747,10 +747,24 @@ Page({ | @@ -747,10 +747,24 @@ Page({ | ||
| 747 | return false; | 747 | return false; |
| 748 | } | 748 | } |
| 749 | 749 | ||
| 750 | + //指定门店的控制 | ||
| 751 | + if (act_details.pick_up_lists) { | ||
| 752 | + var idx0=act_details.pick_up_lists.findIndex(function (e){ | ||
| 753 | + return e.pickup_id==it.pickup_id; | ||
| 754 | + }) | ||
| 755 | + if(idx0<0){ | ||
| 756 | + getApp().confirmBox(it.service_name + "拼团活动的门店不可售"); | ||
| 757 | + th.setData({ paying: 0 }); | ||
| 758 | + flag = false; | ||
| 759 | + return false; | ||
| 760 | + } | ||
| 761 | + } | ||
| 762 | + | ||
| 763 | + | ||
| 750 | }; | 764 | }; |
| 751 | }); | 765 | }); |
| 752 | 766 | ||
| 753 | - if(act_details.buy_limit>0){ | 767 | + if(act_details.buy_limit>0 && flag){ |
| 754 | await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { | 768 | await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { |
| 755 | data: { | 769 | data: { |
| 756 | store_id: store_id, | 770 | store_id: store_id, |
pages/user/order_detail/order_detail.js
| @@ -978,14 +978,19 @@ Page({ | @@ -978,14 +978,19 @@ Page({ | ||
| 978 | } | 978 | } |
| 979 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- | 979 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- |
| 980 | if (prom) { | 980 | if (prom) { |
| 981 | - | 981 | + let c_type=parseInt(goodsinfo.prom_type+''); |
| 982 | + var act_type=''; | ||
| 983 | + switch (c_type){ | ||
| 984 | + case 1:act_type='秒杀';break; | ||
| 985 | + case 6:act_type='拼团';break; | ||
| 986 | + } | ||
| 982 | //指定门店的控制 | 987 | //指定门店的控制 |
| 983 | - if (goodsinfo.prom_type == 1 && prom.pick_up_lists) { | 988 | + if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) { |
| 984 | var idx0=prom.pick_up_lists.findIndex(function (e){ | 989 | var idx0=prom.pick_up_lists.findIndex(function (e){ |
| 985 | return e.pickup_id==order.pickup_id; | 990 | return e.pickup_id==order.pickup_id; |
| 986 | }) | 991 | }) |
| 987 | if(idx0<0){ | 992 | if(idx0<0){ |
| 988 | - getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售"); | 993 | + getApp().confirmBox(goodsinfo.goods_name +act_type+"活动的门店不可售"); |
| 989 | th.setData({ paying: 0 }); | 994 | th.setData({ paying: 0 }); |
| 990 | return false; | 995 | return false; |
| 991 | } | 996 | } |
pages/user/order_list/order_list.js
| @@ -1031,8 +1031,7 @@ Page({ | @@ -1031,8 +1031,7 @@ Page({ | ||
| 1031 | } | 1031 | } |
| 1032 | if (prom) { | 1032 | if (prom) { |
| 1033 | var t_now = ut.gettimestamp(); | 1033 | var t_now = ut.gettimestamp(); |
| 1034 | - if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now) { | ||
| 1035 | - | 1034 | + if (prom.is_end == 0 && prom.start_time < t_now && prom.end_time > t_now ) { |
| 1036 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; | 1035 | var content = gg.goods_name + '商品的活动发生了变化,请取消订单重新购买'; |
| 1037 | th.toast(content); | 1036 | th.toast(content); |
| 1038 | th.setData({ paying: 0 }); | 1037 | th.setData({ paying: 0 }); |
| @@ -1292,20 +1291,25 @@ Page({ | @@ -1292,20 +1291,25 @@ Page({ | ||
| 1292 | } | 1291 | } |
| 1293 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- | 1292 | //----------如果有活动，并且在进行中，就不计算线下库存--------------- |
| 1294 | if (prom) { | 1293 | if (prom) { |
| 1294 | + let c_type=parseInt(goodsinfo.prom_type+''); | ||
| 1295 | + var act_type=''; | ||
| 1296 | + switch (c_type){ | ||
| 1297 | + case 1:act_type='秒杀';break; | ||
| 1298 | + case 6:act_type='拼团';break; | ||
| 1299 | + } | ||
| 1295 | 1300 | ||
| 1296 | //指定门店的控制 | 1301 | //指定门店的控制 |
| 1297 | - if (goodsinfo.prom_type == 1 && prom.pick_up_lists) { | 1302 | + if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) { |
| 1298 | var idx0=prom.pick_up_lists.findIndex(function (e){ | 1303 | var idx0=prom.pick_up_lists.findIndex(function (e){ |
| 1299 | return e.pickup_id==order.pickup_id; | 1304 | return e.pickup_id==order.pickup_id; |
| 1300 | }) | 1305 | }) |
| 1301 | if(idx0<0){ | 1306 | if(idx0<0){ |
| 1302 | - getApp().confirmBox(goodsinfo.goods_name + "秒杀活动的门店不可售"); | 1307 | + getApp().confirmBox(goodsinfo.goods_name +act_type+ "活动的门店不可售"); |
| 1303 | th.setData({ paying: 0 }); | 1308 | th.setData({ paying: 0 }); |
| 1304 | return false; | 1309 | return false; |
| 1305 | } | 1310 | } |
| 1306 | } | 1311 | } |
| 1307 | 1312 | ||
| 1308 | - | ||
| 1309 | var now = ut.gettimestamp(); | 1313 | var now = ut.gettimestamp(); |
| 1310 | if (prom.is_end == 1 && prom.end_time < now) { | 1314 | if (prom.is_end == 1 && prom.end_time < now) { |
| 1311 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' | 1315 | var content = goodsinfo.goods_name + '商品的活动已经结束,请取消订单' |
| @@ -2951,6 +2955,21 @@ Page({ | @@ -2951,6 +2955,21 @@ Page({ | ||
| 2951 | flag = false; | 2955 | flag = false; |
| 2952 | return false; | 2956 | return false; |
| 2953 | } | 2957 | } |
| 2958 | + | ||
| 2959 | + //指定门店的控制 | ||
| 2960 | + if (act_details.pick_up_lists) { | ||
| 2961 | + var idx0=act_details.pick_up_lists.findIndex(function (e){ | ||
| 2962 | + return e.pickup_id==it.pickup_id; | ||
| 2963 | + }) | ||
| 2964 | + if(idx0<0){ | ||
| 2965 | + getApp().confirmBox(it.service_name + "拼团活动的门店不可售"); | ||
| 2966 | + th.setData({ paying: 0 }); | ||
| 2967 | + flag = false; | ||
| 2968 | + return false; | ||
| 2969 | + } | ||
| 2970 | + } | ||
| 2971 | + | ||
| 2972 | + | ||
| 2954 | } | 2973 | } |
| 2955 | }); | 2974 | }); |
| 2956 | 2975 |