Commit 705bedde50b611d30f95ae4c2137a9b2fdaf8d2c
1 parent
7e6a94a4
优化了组合购qa测试的bug
Showing
5 changed files
with
112 additions
and
81 deletions
pages/cart/cart/cart.js
| @@ -241,7 +241,7 @@ Page({ | @@ -241,7 +241,7 @@ Page({ | ||
| 241 | 241 | ||
| 242 | }, | 242 | }, |
| 243 | }).then(res => { | 243 | }).then(res => { |
| 244 | - if(res.data.code && res.data.data && res.data.data.length>0){ | 244 | + if(res.data.code==0 && res.data.data && res.data.data.length>0){ |
| 245 | by_map={}; | 245 | by_map={}; |
| 246 | for(let i in res.data.data){ | 246 | for(let i in res.data.data){ |
| 247 | let item=res.data.data[i]; | 247 | let item=res.data.data[i]; |
| @@ -405,7 +405,6 @@ Page({ | @@ -405,7 +405,6 @@ Page({ | ||
| 405 | pageSize: 2000, | 405 | pageSize: 2000, |
| 406 | store_id: os.stoid, | 406 | store_id: os.stoid, |
| 407 | zh_id: item.prom_id, | 407 | zh_id: item.prom_id, |
| 408 | - goods_id:item.goods_id | ||
| 409 | } | 408 | } |
| 410 | await getApp().request.promiseGet(url1, { | 409 | await getApp().request.promiseGet(url1, { |
| 411 | data: req_data | 410 | data: req_data |
pages/cart/cart2/cart2.js
| @@ -2342,6 +2342,7 @@ Page({ | @@ -2342,6 +2342,7 @@ Page({ | ||
| 2342 | //-------------让商品添加到商品列表-------------------- | 2342 | //-------------让商品添加到商品列表-------------------- |
| 2343 | for (var k = 0; k < t_item.goods.length; k++) { | 2343 | for (var k = 0; k < t_item.goods.length; k++) { |
| 2344 | var g_item = t_item.goods[k]; | 2344 | var g_item = t_item.goods[k]; |
| 2345 | + if(g_item.goods_num<=0) continue; | ||
| 2345 | var goods = { | 2346 | var goods = { |
| 2346 | 'goods_id': g_item.goods_id, | 2347 | 'goods_id': g_item.goods_id, |
| 2347 | 'goods_name': g_item.goods_name, | 2348 | 'goods_name': g_item.goods_name, |
pages/cart/cart2/cart2.wxml
| @@ -76,7 +76,7 @@ | @@ -76,7 +76,7 @@ | ||
| 76 | <!-- <view>门店：{{item.pname}}</view> --> | 76 | <!-- <view>门店：{{item.pname}}</view> --> |
| 77 | <view>{{item.pname}}</view> | 77 | <view>{{item.pname}}</view> |
| 78 | </view> | 78 | </view> |
| 79 | - <view class="order-detail" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> | 79 | + <view class="order-detail" wx:if="{{items.goods_num>0}}" wx:for="{{item.goods}}" wx:for-index="idx" wx:for-item="items"> |
| 80 | <!----商品图片-----> | 80 | <!----商品图片-----> |
| 81 | <view class="goods-img" style="position: relative"> | 81 | <view class="goods-img" style="position: relative"> |
| 82 | <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> | 82 | <image wx:if="{{items.is_gift}}" src="{{imgUrl}}/miniapp/images/giveaway.png" class="gift_image"></image> |
| @@ -104,6 +104,7 @@ | @@ -104,6 +104,7 @@ | ||
| 104 | <view class="goods-num">x{{items.goods_num}}</view> | 104 | <view class="goods-num">x{{items.goods_num}}</view> |
| 105 | </view> | 105 | </view> |
| 106 | </navigator> | 106 | </navigator> |
| 107 | + | ||
| 107 | </view> | 108 | </view> |
| 108 | 109 | ||
| 109 | <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 --> | 110 | <!-- 如果是等级卡的商品，会员没有注册，要提醒注册 --> |
pages/user/order_detail/order_detail.js
| @@ -822,11 +822,16 @@ Page({ | @@ -822,11 +822,16 @@ Page({ | ||
| 822 | moreOrder:function(e){ | 822 | moreOrder:function(e){ |
| 823 | var th=this; | 823 | var th=this; |
| 824 | var item=th.data.order; | 824 | var item=th.data.order; |
| 825 | + | ||
| 826 | + if(this.data.moring) return false; | ||
| 827 | + this.data.moring=1; | ||
| 828 | + | ||
| 825 | th.check_more_order(item); | 829 | th.check_more_order(item); |
| 826 | }, | 830 | }, |
| 827 | 831 | ||
| 828 | check_more_order:async function(item){ | 832 | check_more_order:async function(item){ |
| 829 | var pickup=null,th=this; | 833 | var pickup=null,th=this; |
| 834 | + wx.showLoading(); | ||
| 830 | //--------获取门店----------- | 835 | //--------获取门店----------- |
| 831 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { | 836 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { |
| 832 | 837 | ||
| @@ -1056,40 +1061,7 @@ Page({ | @@ -1056,40 +1061,7 @@ Page({ | ||
| 1056 | b_item.goods_num=good['viplimited']; | 1061 | b_item.goods_num=good['viplimited']; |
| 1057 | } | 1062 | } |
| 1058 | } | 1063 | } |
| 1059 | - | ||
| 1060 | - //--要计算一下限购 -- | ||
| 1061 | - if(b_item.prom_type==7){ | ||
| 1062 | - var url1 = "/api/weshop/prom/zhbuyGoods/page"; | ||
| 1063 | - var req_data = { | ||
| 1064 | - page: 1, | ||
| 1065 | - pageSize: 2000, | ||
| 1066 | - store_id: os.stoid, | ||
| 1067 | - zh_id: b_item.prom_id, | ||
| 1068 | - goods_id:b_item.goods_id | ||
| 1069 | - } | ||
| 1070 | - await getApp().request.promiseGet(url1, { | ||
| 1071 | - data: req_data | ||
| 1072 | - }).then(res => { | ||
| 1073 | - if (ut.ajax_ok(res)) { | ||
| 1074 | - var gdlist = res.data.data.pageData[0]; | ||
| 1075 | - b_item.buyqty=gdlist.buyqty; | ||
| 1076 | - } | ||
| 1077 | - }) | ||
| 1078 | - | ||
| 1079 | - | ||
| 1080 | - //---- 要计算商品的限购 ----- | ||
| 1081 | - if(b_item['buyqty']>0){ | ||
| 1082 | - if(cart_num+buynum>b_item['buyqty']){ | ||
| 1083 | - err_text+= good['goods_name']+"超出限购\n"; | ||
| 1084 | - continue; | ||
| 1085 | - } | ||
| 1086 | - b_item['buyqty']-=(cart_num+buynum); | ||
| 1087 | - if(b_item.goods_num>b_item['buyqty']){ | ||
| 1088 | - b_item.goods_num=b_item['buyqty']; | ||
| 1089 | - } | ||
| 1090 | - } | ||
| 1091 | - } | ||
| 1092 | - | 1064 | + //不需要计算组合购的限购 |
| 1093 | 1065 | ||
| 1094 | back_goods_arr.push(b_item); //返回商品元素 | 1066 | back_goods_arr.push(b_item); //返回商品元素 |
| 1095 | 1067 | ||
| @@ -1218,12 +1190,19 @@ Page({ | @@ -1218,12 +1190,19 @@ Page({ | ||
| 1218 | if (res.confirm) { | 1190 | if (res.confirm) { |
| 1219 | //跳转到登录页 | 1191 | //跳转到登录页 |
| 1220 | th.more_add_cart(); | 1192 | th.more_add_cart(); |
| 1221 | - } | ||
| 1222 | - } | 1193 | + }else{ |
| 1194 | + th.data.moring=0; | ||
| 1195 | + wx.hideLoading(); | ||
| 1196 | + } | ||
| 1197 | + },fail(){ | ||
| 1198 | + th.data.moring=0; | ||
| 1199 | + wx.hideLoading(); | ||
| 1200 | + } | ||
| 1223 | }); | 1201 | }); |
| 1224 | 1202 | ||
| 1225 | } | 1203 | } |
| 1226 | }else{ | 1204 | }else{ |
| 1205 | + th.data.moring=0; | ||
| 1227 | wx.hideLoading(); | 1206 | wx.hideLoading(); |
| 1228 | getApp().confirmBox(err_text); | 1207 | getApp().confirmBox(err_text); |
| 1229 | } | 1208 | } |
| @@ -1319,7 +1298,8 @@ Page({ | @@ -1319,7 +1298,8 @@ Page({ | ||
| 1319 | } | 1298 | } |
| 1320 | } | 1299 | } |
| 1321 | 1300 | ||
| 1322 | - wx.hideLoading(); | 1301 | + wx.hideLoading(); |
| 1302 | + this.data.moring=0; | ||
| 1323 | if(ok_num==0){ | 1303 | if(ok_num==0){ |
| 1324 | //-- 如果没有获取用户信息 -- | 1304 | //-- 如果没有获取用户信息 -- |
| 1325 | wx.showModal({ | 1305 | wx.showModal({ |
pages/user/order_list/order_list.js
| @@ -488,11 +488,78 @@ Page({ | @@ -488,11 +488,78 @@ Page({ | ||
| 488 | 488 | ||
| 489 | var buyed_mum2=goodsbuynum+good.goods_num; | 489 | var buyed_mum2=goodsbuynum+good.goods_num; |
| 490 | if (buyed_mum2 > limit && limit > 0) { | 490 | if (buyed_mum2 > limit && limit > 0) { |
| 491 | - | ||
| 492 | var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; | 491 | var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; |
| 493 | th.toast(content); | 492 | th.toast(content); |
| 494 | return false; | 493 | return false; |
| 495 | } | 494 | } |
| 495 | + | ||
| 496 | + //当是组合优惠的时候 | ||
| 497 | + if(good.prom_type==7){ | ||
| 498 | + //如果有组合购 | ||
| 499 | + var isok = 1; | ||
| 500 | + var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id; | ||
| 501 | + await getApp().request.promiseGet(url, {}).then(res => { | ||
| 502 | + if(res.data.code==0 && res.data.data){ | ||
| 503 | + if(res.data.data.is_show!=1){ | ||
| 504 | + isok=0; | ||
| 505 | + } | ||
| 506 | + //如果活动已经结束 | ||
| 507 | + if(res.data.data.is_end==1){ | ||
| 508 | + isok=0; | ||
| 509 | + } | ||
| 510 | + //已经结束 | ||
| 511 | + if(ut.gettimestamp()>res.data.data.end_time){ | ||
| 512 | + isok=0; | ||
| 513 | + } | ||
| 514 | + //还未开始 | ||
| 515 | + if(ut.gettimestamp()<res.data.data.start_time){ | ||
| 516 | + isok=0; | ||
| 517 | + } | ||
| 518 | + | ||
| 519 | + }else{ | ||
| 520 | + //未找到商品的活动 | ||
| 521 | + isok = 0; | ||
| 522 | + } | ||
| 523 | + | ||
| 524 | + }) | ||
| 525 | + if (!isok){ | ||
| 526 | + var content=gg.goods_name+'活动已经结束,请取消订单'; | ||
| 527 | + th.toast(content); | ||
| 528 | + return false; | ||
| 529 | + } | ||
| 530 | + | ||
| 531 | + var url1 = "/api/weshop/prom/zhbuyGoods/page"; | ||
| 532 | + var req_data = { | ||
| 533 | + page: 1, | ||
| 534 | + pageSize: 1, | ||
| 535 | + store_id: os.stoid, | ||
| 536 | + zh_id: good.prom_id, | ||
| 537 | + goods_id:good.goods_id | ||
| 538 | + } | ||
| 539 | + await getApp().request.promiseGet(url1, { | ||
| 540 | + data: req_data | ||
| 541 | + }).then(res => { | ||
| 542 | + if (ut.ajax_ok(res)) { | ||
| 543 | + var gdlist = res.data.data.pageData[0]; | ||
| 544 | + good.buyqty=gdlist.buyqty; | ||
| 545 | + } | ||
| 546 | + }) | ||
| 547 | + | ||
| 548 | + var num=good['buyqty']; | ||
| 549 | + console.log(1111); | ||
| 550 | + console.log(num); | ||
| 551 | + //---- 要计算商品的限购 ----- | ||
| 552 | + if(good['buyqty']>0){ | ||
| 553 | + if(good.goods_num+promgoodsbuynum>good['buyqty']){ | ||
| 554 | + | ||
| 555 | + var content= good['goods_name']+"超出活动限购\n"; | ||
| 556 | + th.toast(content); | ||
| 557 | + return false; | ||
| 558 | + } | ||
| 559 | + } | ||
| 560 | + } | ||
| 561 | + | ||
| 562 | + | ||
| 496 | 563 | ||
| 497 | //如果优惠促销和搭配购的时候 | 564 | //如果优惠促销和搭配购的时候 |
| 498 | if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){ | 565 | if((good.prom_type==3 || good.prom_type==5) && good.is_gift!=1 && good.is_collocation!=1){ |
| @@ -753,6 +820,8 @@ Page({ | @@ -753,6 +820,8 @@ Page({ | ||
| 753 | } | 820 | } |
| 754 | 821 | ||
| 755 | } | 822 | } |
| 823 | + | ||
| 824 | + return false; | ||
| 756 | 825 | ||
| 757 | th.pay_next(e,o_index); | 826 | th.pay_next(e,o_index); |
| 758 | }, | 827 | }, |
| @@ -923,6 +992,10 @@ Page({ | @@ -923,6 +992,10 @@ Page({ | ||
| 923 | 992 | ||
| 924 | //再来一单的功能的实现 | 993 | //再来一单的功能的实现 |
| 925 | moreOrder:function(e){ | 994 | moreOrder:function(e){ |
| 995 | + | ||
| 996 | + if(this.data.moring) return false; | ||
| 997 | + this.data.moring=1; | ||
| 998 | + | ||
| 926 | var th=this; | 999 | var th=this; |
| 927 | var index=e.currentTarget.dataset.index; | 1000 | var index=e.currentTarget.dataset.index; |
| 928 | var item=th.data.orderList[index]; | 1001 | var item=th.data.orderList[index]; |
| @@ -931,6 +1004,7 @@ Page({ | @@ -931,6 +1004,7 @@ Page({ | ||
| 931 | 1004 | ||
| 932 | check_more_order:async function(item){ | 1005 | check_more_order:async function(item){ |
| 933 | var pickup=null,th=this; | 1006 | var pickup=null,th=this; |
| 1007 | + wx.showLoading(); | ||
| 934 | //--------获取门店----------- | 1008 | //--------获取门店----------- |
| 935 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { | 1009 | await getApp().request.promiseGet("/api/weshop/pickup/get/" + os.stoid + "/" + item.pickup_id, { |
| 936 | 1010 | ||
| @@ -1165,40 +1239,7 @@ Page({ | @@ -1165,40 +1239,7 @@ Page({ | ||
| 1165 | b_item.goods_num=good['viplimited']; | 1239 | b_item.goods_num=good['viplimited']; |
| 1166 | } | 1240 | } |
| 1167 | } | 1241 | } |
| 1168 | - | ||
| 1169 | - //--要计算一下限购 -- | ||
| 1170 | - if(b_item.prom_type==7){ | ||
| 1171 | - var url1 = "/api/weshop/prom/zhbuyGoods/page"; | ||
| 1172 | - var req_data = { | ||
| 1173 | - page: 1, | ||
| 1174 | - pageSize: 2000, | ||
| 1175 | - store_id: os.stoid, | ||
| 1176 | - zh_id: b_item.prom_id, | ||
| 1177 | - goods_id:b_item.goods_id | ||
| 1178 | - } | ||
| 1179 | - await getApp().request.promiseGet(url1, { | ||
| 1180 | - data: req_data | ||
| 1181 | - }).then(res => { | ||
| 1182 | - if (ut.ajax_ok(res)) { | ||
| 1183 | - var gdlist = res.data.data.pageData[0]; | ||
| 1184 | - b_item.buyqty=gdlist.buyqty; | ||
| 1185 | - } | ||
| 1186 | - }) | ||
| 1187 | - | ||
| 1188 | - | ||
| 1189 | - //---- 要计算商品的限购 ----- | ||
| 1190 | - if(b_item['buyqty']>0){ | ||
| 1191 | - if(cart_num+buynum>b_item['buyqty']){ | ||
| 1192 | - err_text+= good['goods_name']+"超出限购\n"; | ||
| 1193 | - continue; | ||
| 1194 | - } | ||
| 1195 | - b_item['buyqty']-=(cart_num+buynum); | ||
| 1196 | - if(b_item.goods_num>b_item['buyqty']){ | ||
| 1197 | - b_item.goods_num=b_item['buyqty']; | ||
| 1198 | - } | ||
| 1199 | - } | ||
| 1200 | - } | ||
| 1201 | - | 1242 | + //不算组合购的限购 |
| 1202 | back_goods_arr.push(b_item); //返回商品元素 | 1243 | back_goods_arr.push(b_item); //返回商品元素 |
| 1203 | 1244 | ||
| 1204 | }else{ | 1245 | }else{ |
| @@ -1324,12 +1365,21 @@ Page({ | @@ -1324,12 +1365,21 @@ Page({ | ||
| 1324 | if (res.confirm) { | 1365 | if (res.confirm) { |
| 1325 | //跳转到登录页 | 1366 | //跳转到登录页 |
| 1326 | th.more_add_cart(); | 1367 | th.more_add_cart(); |
| 1327 | - } | ||
| 1328 | - } | 1368 | + }else{ |
| 1369 | + wx.hideLoading(); | ||
| 1370 | + th.data.moring=0; | ||
| 1371 | + } | ||
| 1372 | + }, | ||
| 1373 | + fail: function (res) { | ||
| 1374 | + wx.hideLoading(); | ||
| 1375 | + th.data.moring=0; | ||
| 1376 | + },//接口调用失败的回调函数 | ||
| 1329 | }); | 1377 | }); |
| 1330 | 1378 | ||
| 1331 | } | 1379 | } |
| 1332 | }else{ | 1380 | }else{ |
| 1381 | + wx.hideLoading(); | ||
| 1382 | + this.data.moring=0; | ||
| 1333 | getApp().confirmBox(err_text); | 1383 | getApp().confirmBox(err_text); |
| 1334 | } | 1384 | } |
| 1335 | }, | 1385 | }, |
| @@ -1338,7 +1388,7 @@ Page({ | @@ -1338,7 +1388,7 @@ Page({ | ||
| 1338 | var back_goods_arr=this.data.back_goods_arr; | 1388 | var back_goods_arr=this.data.back_goods_arr; |
| 1339 | var err_text=""; | 1389 | var err_text=""; |
| 1340 | var ok_num=0; | 1390 | var ok_num=0; |
| 1341 | - | 1391 | + |
| 1342 | for(var i in back_goods_arr){ | 1392 | for(var i in back_goods_arr){ |
| 1343 | //商品ID | 1393 | //商品ID |
| 1344 | var g_item=back_goods_arr[i]; | 1394 | var g_item=back_goods_arr[i]; |
| @@ -1427,8 +1477,9 @@ Page({ | @@ -1427,8 +1477,9 @@ Page({ | ||
| 1427 | } | 1477 | } |
| 1428 | }) | 1478 | }) |
| 1429 | } | 1479 | } |
| 1430 | - } | ||
| 1431 | - | 1480 | + } |
| 1481 | + wx.hideLoading(); | ||
| 1482 | + this.data.moring=0; | ||
| 1432 | if(ok_num==0){ | 1483 | if(ok_num==0){ |
| 1433 | //-- 如果没有获取用户信息 -- | 1484 | //-- 如果没有获取用户信息 -- |
| 1434 | wx.showModal({ | 1485 | wx.showModal({ |
| @@ -1453,7 +1504,6 @@ Page({ | @@ -1453,7 +1504,6 @@ Page({ | ||
| 1453 | }); | 1504 | }); |
| 1454 | 1505 | ||
| 1455 | } | 1506 | } |
| 1456 | - | ||
| 1457 | } | 1507 | } |
| 1458 | }, | 1508 | }, |
| 1459 | 1509 |