Commit 295ec485ad8379e31533ecd85ce015359fa4436e
1 parent
f2bd08ce
幸运购待支付
Showing
5 changed files
with
35 additions
and
449 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| ... | ... | @@ -3902,7 +3902,7 @@ Page({ |
| 3902 | 3902 | if (a.confirm) { |
| 3903 | 3903 | switOn = false; |
| 3904 | 3904 | wx.navigateTo({ |
| 3905 | - url: "/pages/user/order_detail/order_detail?order_id=" + res.data.data.pageData[0]['order_id'] | |
| 3905 | + url: "/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=" + res.data.data.pageData[0]['order_id'] | |
| 3906 | 3906 | }); |
| 3907 | 3907 | } |
| 3908 | 3908 | } | ... | ... |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
| ... | ... | @@ -318,429 +318,40 @@ Page({ |
| 318 | 318 | |
| 319 | 319 | //--------立即支付---------- |
| 320 | 320 | async jumpToCart4(e) { |
| 321 | - var th=this; | |
| 322 | - if(this.data.optionIsGoup) | |
| 323 | - wx.navigateTo({ | |
| 324 | - url: "/pages/team/team_confirm/team_confirm?orderSn=" + this.data.order.order_sn + "&orderPay=true" | |
| 325 | - }) | |
| 326 | - var order=this.data.order; | |
| 327 | - var order_goods=order.order_goods; | |
| 328 | - var user_id=order.user_id; | |
| 329 | - | |
| 330 | - var wlist=""; | |
| 331 | - for(var i in order_goods){ | |
| 332 | - var good=order_goods[i]; | |
| 333 | - //线下取价功能已经关闭或者过期 | |
| 334 | - if(!th.data.is_open_offline && good.offline_cut>0){ | |
| 335 | - wx.showModal({ | |
| 336 | - title: '提示', | |
| 337 | - content: '线下取价功能已经关闭或者过期！' | |
| 338 | - }); | |
| 339 | - return false; | |
| 340 | - } | |
| 341 | - | |
| 342 | - //要每件每件的商品进行检查，看有么有超出库存，超出限购 | |
| 343 | - var good= order_goods[i],goodsbuynum=0,promgoodsbuynum=0,gg=null; | |
| 344 | - //获取单品的现在的活动状态 | |
| 345 | - await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + good.goods_id, { | |
| 346 | - }).then(res=>{ | |
| 347 | - gg=res.data.data; | |
| 348 | - }) | |
| 349 | - var limit = gg.viplimited; | |
| 350 | - var store_count = gg.store_count; | |
| 351 | - good.erpwareid=gg.erpwareid; | |
| 352 | - | |
| 353 | - //---要获得商品，该用户买了多少件,同步应用--- | |
| 354 | - await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { | |
| 355 | - data: { | |
| 356 | - store_id: os.stoid, | |
| 357 | - user_id: getApp().globalData.user_id, | |
| 358 | - goods_id: good.goods_id, | |
| 359 | - prom_type: good.prom_type, | |
| 360 | - prom_id: good.prom_id | |
| 361 | - }, | |
| 362 | - }).then(res => { | |
| 363 | - var buy_num_data = res.data.data; | |
| 364 | - if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; | |
| 365 | - goodsbuynum = buy_num_data.goodsbuynum; | |
| 366 | - }) | |
| 367 | - | |
| 368 | - var buyed_mum2=goodsbuynum+good.goods_num; | |
| 369 | - if (buyed_mum2 > limit && limit > 0) { | |
| 370 | - | |
| 371 | - var content=gg.goods_name+'购买数量超出商品限购,请取消订单'; | |
| 372 | - th.toast(content); | |
| 373 | - return false; | |
| 374 | - } | |
| 375 | - | |
| 376 | - //当是组合优惠的时候 | |
| 377 | - if(good.prom_type==7){ | |
| 378 | - //如果有组合购 | |
| 379 | - var isok = 1; | |
| 380 | - var url="/api/weshop/prom/zhbuy/get/"+os.stoid+"/"+good.prom_id+"/"+getApp().globalData.userInfo.user_id; | |
| 381 | - await getApp().request.promiseGet(url, {}).then(res => { | |
| 382 | - if(res.data.code==0 && res.data.data){ | |
| 383 | - if(res.data.data.is_show!=1){ | |
| 384 | - isok=0; | |
| 385 | - } | |
| 386 | - //如果活动已经结束 | |
| 387 | - if(res.data.data.is_end==1){ | |
| 388 | - isok=0; | |
| 389 | - } | |
| 390 | - //已经结束 | |
| 391 | - if(ut.gettimestamp()>res.data.data.end_time){ | |
| 392 | - isok=0; | |
| 393 | - } | |
| 394 | - //还未开始 | |
| 395 | - if(ut.gettimestamp()<res.data.data.start_time){ | |
| 396 | - isok=0; | |
| 397 | - } | |
| 398 | - | |
| 399 | - }else{ | |
| 400 | - //未找到商品的活动 | |
| 401 | - isok = 0; | |
| 402 | - } | |
| 403 | 321 | |
| 404 | - }) | |
| 405 | - if (!isok){ | |
| 406 | - var content=gg.goods_name+'活动已经结束,请取消订单'; | |
| 407 | - th.toast(content); | |
| 408 | - return false; | |
| 409 | - } | |
| 410 | - | |
| 411 | - var url1 = "/api/weshop/prom/zhbuyGoods/page"; | |
| 412 | - var req_data = { | |
| 413 | - page: 1, | |
| 414 | - pageSize: 1, | |
| 415 | - store_id: os.stoid, | |
| 416 | - zh_id: good.prom_id, | |
| 417 | - goods_id:good.goods_id | |
| 418 | - } | |
| 419 | - await getApp().request.promiseGet(url1, { | |
| 420 | - data: req_data | |
| 421 | - }).then(res => { | |
| 422 | - if (ut.ajax_ok(res)) { | |
| 423 | - var gdlist = res.data.data.pageData[0]; | |
| 424 | - good.buyqty=gdlist.buyqty; | |
| 425 | - } | |
| 426 | - }) | |
| 427 | - | |
| 428 | - var num=good['buyqty']; | |
| 429 | - console.log(1111); | |
| 430 | - console.log(num); | |
| 431 | - //---- 要计算商品的限购 ----- | |
| 432 | - if(good['buyqty']>0){ | |
| 433 | - if(good.goods_num+promgoodsbuynum>good['buyqty']){ | |
| 322 | + // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} | |
| 323 | + if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { | |
| 324 | + var aid = this.data.order.order_goods['0']['prom_id']; | |
| 325 | + var knum = 0; | |
| 326 | + await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { | |
| 327 | + }).then(res => { | |
| 328 | + if (res.data.code == 0) { | |
| 329 | + knum = res.data.data; | |
| 330 | + } | |
| 331 | + | |
| 332 | + }); | |
| 434 | 333 | |
| 435 | - var content= good['goods_name']+"超出活动限购\n"; | |
| 436 | - th.toast(content); | |
| 437 | - return false; | |
| 438 | - } | |
| 439 | - } | |
| 440 | - } | |
| 334 | + if (knum <= 0) { | |
| 335 | + getApp().confirmBox("库存为0，支付失败"); | |
| 336 | + return false; | |
| 337 | + } | |
| 441 | 338 | |
| 442 | - //如果优惠促销和搭配购的时候 | |
| 443 | - if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ | |
| 444 | - var p_ok=1; | |
| 445 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { | |
| 446 | - if(res.data.code==0){ | |
| 447 | - var r_data=res.data.data; | |
| 448 | - if(!r_data.collocationPromList && good.prom_type==5){ | |
| 449 | - | |
| 450 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | |
| 451 | - th.toast(content); | |
| 452 | - p_ok=0; | |
| 453 | - } | |
| 454 | - if(!r_data.promGoodsLists && good.prom_type==3){ | |
| 455 | - | |
| 456 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | |
| 457 | - th.toast(content); | |
| 458 | - p_ok=0; | |
| 459 | - } | |
| 460 | - }else{ | |
| 461 | - | |
| 462 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | |
| 463 | - th.toast(content); | |
| 464 | - p_ok=0; | |
| 465 | - } | |
| 466 | - }) | |
| 467 | - if(!p_ok) return false; | |
| 468 | 339 | } |
| 469 | - | |
| 470 | - //商品的普通购买 ，不要进行判断 | |
| 471 | - if((good.prom_type==1 || good.prom_type==2 || good.prom_type==6 || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){ | |
| 472 | - if(gg.prom_type!=good.prom_type && gg.prom_type>0) { | |
| 473 | - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; | |
| 474 | - th.toast(content); | |
| 475 | - return false; | |
| 476 | - } | |
| 477 | - }else{ | |
| 478 | - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) | |
| 479 | - && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { | |
| 480 | - var prom=null; | |
| 481 | - //---如果是活动的时候--- | |
| 482 | - var prom=null,th=this; | |
| 483 | - if(gg.prom_type==1){ | |
| 484 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+gg.prom_id,{ | |
| 485 | - }).then(res=>{ | |
| 486 | - if(res.data.code==0){ | |
| 487 | - prom=res.data.data; | |
| 488 | - prom.price=prom.user_price; | |
| 489 | - } | |
| 490 | - }) | |
| 491 | - } | |
| 492 | - | |
| 493 | - if (gg.prom_type == 2) { | |
| 494 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ gg.goods_id + "/" + gg.prom_id, {}).then(res => { | |
| 495 | - if (res.data.code == 0) { | |
| 496 | - prom = res.data.data; | |
| 497 | - prom.price=prom.price; | |
| 498 | - } | |
| 499 | - }) | |
| 500 | - } | |
| 501 | - | |
| 502 | - | |
| 503 | - if(gg.prom_type==6){ | |
| 504 | - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+gg.prom_id,{ | |
| 505 | - }).then(res=>{ | |
| 506 | - if(res.data.code==0){ | |
| 507 | - prom=res.data.data; | |
| 508 | - } | |
| 509 | - }) | |
| 510 | - } | |
| 511 | - | |
| 512 | - if(gg.prom_type==4){ | |
| 513 | - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ | |
| 514 | - data:{store_id:os.stoid,goods_id:gg.goods_id} | |
| 515 | - }).then(res=>{ | |
| 516 | - if(res.data.code==0 && res.data.data && res.data.data.pageData){ | |
| 517 | - prom=res.data.data.pageData[0]; | |
| 518 | - } | |
| 519 | - }) | |
| 520 | - } | |
| 521 | - | |
| 522 | - if(prom){ | |
| 523 | - var t_now=ut.gettimestamp(); | |
| 524 | - if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){ | |
| 525 | - | |
| 526 | - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; | |
| 527 | - th.toast(content); | |
| 528 | - return false; | |
| 529 | - } | |
| 530 | - } | |
| 531 | - } | |
| 532 | - else{ | |
| 533 | - //不是赠品的时候 | |
| 534 | - if(!good.is_gift && good.prom_type!=3){ | |
| 535 | - var t_ok=1; | |
| 536 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { | |
| 537 | - if(res.data.code==0){ | |
| 538 | - var r_data=res.data.data; | |
| 539 | - //-- 参加了全局的优惠活动 -- | |
| 540 | - if(r_data.promGoodsLists){ | |
| 541 | - | |
| 542 | - var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买'; | |
| 543 | - th.toast(content); | |
| 544 | - t_ok=0; | |
| 545 | - } | |
| 546 | - } | |
| 547 | - }) | |
| 548 | - if(!t_ok) return false; | |
| 549 | - } | |
| 550 | 340 | |
| 551 | - //-- 如果有参加线下取价 -- | |
| 552 | - if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; | |
| 553 | - } | |
| 554 | - //赠品和搭配购不判断商品金额 | |
| 555 | - var isok=1; | |
| 556 | - var card_field=th.data.card_field; | |
| 557 | - //如果会员是等级会员,商品有等级价,且不是活动商品 | |
| 558 | - if(!good.is_gift && !good.is_collocation) { | |
| 559 | - if (card_field && gg[card_field] > 0) { | |
| 560 | - if (good.goods_price != gg[card_field] && good.offline_cut<=0) isok = 0; | |
| 561 | - if (good.goods_price >gg[card_field] && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 | |
| 562 | - | |
| 563 | - } else { | |
| 564 | - if (good.goods_price != gg.shop_price && good.offline_cut<=0) isok = 0; | |
| 565 | - if (good.goods_price> gg.shop_price && good.offline_cut>0) isok = 0; //如果线下价格比较贵，则不通过 | |
| 566 | - } | |
| 567 | - var is_h=0; | |
| 568 | - if (!isok) { | |
| 569 | - | |
| 570 | - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; | |
| 571 | - th.toast(content); | |
| 572 | - return false; | |
| 573 | - } | |
| 574 | - } | |
| 575 | - | |
| 576 | - //--如果是线下库存的时候-- | |
| 577 | - if(th.data.conf.sales_rules==2){ | |
| 578 | - var ob={}; | |
| 579 | - await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){ | |
| 580 | - ob=obj; | |
| 581 | - }) | |
| 582 | - if(ob.code==-1){ | |
| 583 | - | |
| 584 | - var content=gg.goods_name+'门店库存不足,请取消订单'; | |
| 585 | - th.toast(content); | |
| 586 | - return false; | |
| 587 | - } | |
| 588 | - | |
| 589 | - }else{ | |
| 590 | - if(good.goods_num>store_count){ | |
| 591 | - | |
| 592 | - var content=gg.goods_name+'商品的库存不足,请取消订单'; | |
| 593 | - th.toast(content); | |
| 594 | - return false; | |
| 595 | - } | |
| 596 | - | |
| 597 | - } | |
| 598 | - } | |
| 599 | - | |
| 600 | - console.log("------------------------------------"); | |
| 601 | - //---如果是活动的时候--- | |
| 602 | - var prom=null,goodsinfo=good,th=this; | |
| 603 | - if(goodsinfo.prom_type==1){ | |
| 604 | - await getApp().request.promiseGet("/api/ms/flash_sale/getNew/"+os.stoid+"/"+user_id+"/"+goodsinfo.prom_id,{ | |
| 605 | - }).then(res=>{ | |
| 606 | - if(res.data.code==0){ | |
| 607 | - prom=res.data.data; | |
| 608 | - prom.price=prom.user_price; | |
| 609 | - } | |
| 610 | - }) | |
| 611 | - } | |
| 612 | - | |
| 613 | - if (goodsinfo.prom_type == 2) { | |
| 614 | - await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/"+ good.goods_id + "/" + goodsinfo.prom_id, {}).then(res => { | |
| 615 | - if (res.data.code == 0) { | |
| 616 | - prom = res.data.data; | |
| 617 | - prom.price=prom.price; | |
| 618 | - } | |
| 619 | - }) | |
| 620 | - } | |
| 621 | - | |
| 622 | - | |
| 623 | - if(goodsinfo.prom_type==6 && !good.is_pd_normal){ | |
| 624 | - await getApp().request.promiseGet("/api/weshop/teamlist/get/"+os.stoid+"/"+goodsinfo.prom_id,{ | |
| 625 | - }).then(res=>{ | |
| 626 | - if(res.data.code==0){ | |
| 627 | - prom=res.data.data; | |
| 628 | - } | |
| 629 | - }) | |
| 630 | - } | |
| 631 | - | |
| 632 | - if(goodsinfo.prom_type==4 && !good.is_integral_normal){ | |
| 633 | - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{ | |
| 634 | - data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} | |
| 635 | - }).then(res=>{ | |
| 636 | - if(res.data.code==0 && res.data.data && res.data.data.pageData){ | |
| 637 | - prom=res.data.data.pageData[0]; | |
| 638 | - } | |
| 639 | - }) | |
| 640 | - } | |
| 641 | - | |
| 642 | - //----------如果有活动，并且在进行中，就不计算线下库存--------------- | |
| 643 | - if(prom){ | |
| 644 | - var now=ut.gettimestamp(); | |
| 645 | - if(prom.is_end==1 && prom.end_time<now){ | |
| 646 | - | |
| 647 | - var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买'; | |
| 648 | - th.toast(content); | |
| 649 | - return false; | |
| 650 | - } | |
| 651 | - | |
| 652 | - buyed_mum2=promgoodsbuynum+good.goods_num; | |
| 653 | - if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) { | |
| 654 | - | |
| 655 | - var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买'; | |
| 656 | - th.toast(content); | |
| 657 | - return false; | |
| 658 | - } | |
| 659 | - //看一下会员的秒杀价格是不是发生了变化 | |
| 660 | - if(goodsinfo.prom_type==1 && goodsinfo.goods_price!=prom.price){ | |
| 661 | - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | |
| 662 | - th.toast(content); | |
| 663 | - return false; | |
| 664 | - } | |
| 665 | - | |
| 666 | - //看一下会员的团购价格是不是发生了变化 | |
| 667 | - if(goodsinfo.prom_type==2 && goodsinfo.goods_price!=prom.price){ | |
| 668 | - var content=goodsinfo.goods_name+'秒杀活动的价格发生了变化'; | |
| 669 | - th.toast(content); | |
| 670 | - return false; | |
| 671 | - } | |
| 672 | - | |
| 673 | - if(goodsinfo.prom_type==4){ | |
| 674 | - if (good.goods_num > prom.limitqty-prom.buy_num) { | |
| 675 | - | |
| 676 | - var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'; | |
| 677 | - th.toast(content); | |
| 678 | - return false; | |
| 679 | - } | |
| 680 | - }else if(goodsinfo.prom_type == 1 || goodsinfo.prom_type == 2 || goodsinfo.prom_type == 6 ) { | |
| 681 | - if(order.add_time+5*60<ut.gettimestamp()) { | |
| 682 | - var content = gg.goods_name + '该订单已经超时无法支付,请取消订单'; | |
| 683 | - th.toast(content); | |
| 684 | - return false; | |
| 685 | - } | |
| 686 | - } | |
| 687 | - | |
| 688 | - } | |
| 689 | - | |
| 690 | - } | |
| 341 | + var order=this.data.order; | |
| 342 | + var order_goods=order.order_goods; | |
| 343 | + var user_id=order.user_id; | |
| 344 | + // 检测活动是否结束 | |
| 345 | + | |
| 691 | 346 | |
| 692 | - //-- 要判断一下线下取价价格是不是发生改变 -- | |
| 693 | - if(wlist!="" && th.data.is_open_offline && th.data.is_open_offline>0){ | |
| 694 | - wlist=ut.sub_last(wlist); | |
| 695 | - var keyid=order.pickup_id; | |
| 696 | - var user_info=getApp().globalData.userInfo; | |
| 697 | - if(!keyid) return false; | |
| 698 | - var offarr=null; | |
| 699 | - await getApp().request.promiseGet("/api/weshop/goods/listWarePrice", { | |
| 700 | - data:{ | |
| 701 | - VIPId:encodeURIComponent(user_info.erpvipid), | |
| 702 | - store_id:os.stoid, | |
| 703 | - PickupId:keyid, | |
| 704 | - WareIds:wlist}, | |
| 705 | - }, | |
| 706 | - ).then(res=>{ | |
| 707 | - if(res.data.code==0 && res.data.data && res.data.data.length>0){ | |
| 708 | - offarr=res.data.data; | |
| 709 | - } | |
| 710 | - }) | |
| 711 | - if(!offarr && offarr.length<=0 ){ | |
| 712 | - wx.showModal({ title: '获取线下取价失败',}); | |
| 713 | - } | |
| 714 | - var newarr=ut.convert_arr_key(offarr,'WareId'); | |
| 715 | - //-- 循环判断线下的价格 -- | |
| 716 | - for(var k in order_goods){ | |
| 717 | - var good=order_goods[k]; | |
| 718 | - //判断线下取价是不是一样 | |
| 719 | - if(newarr[good.erpwareid] && | |
| 720 | - parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){ | |
| 721 | - | |
| 722 | - var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买'; | |
| 723 | - th.toast(content); | |
| 724 | - return false; | |
| 725 | - } | |
| 726 | - } | |
| 727 | - | |
| 728 | - } | |
| 729 | - | |
| 730 | - /*--- | |
| 731 | - o.jumpToCart4({ | |
| 732 | - order_sn: this.data.order.order_sn, | |
| 733 | - order_amount: this.data.order.order_amount, | |
| 734 | - type: 1 //正常单 | |
| 735 | - }, 1);--*/ | |
| 736 | - | |
| 737 | 347 | py.pay(this.data.order.order_sn, function() { |
| 738 | - wx.showToast({title: '支付成功'}) | |
| 739 | - wx.navigateBack(); | |
| 348 | + wx.showToast({title: '支付成功'}) | |
| 349 | + wx.navigateBack(); | |
| 740 | 350 | },null,os.stoid,1); |
| 741 | 351 | |
| 742 | 352 | |
| 743 | - }, | |
| 353 | + }, | |
| 354 | + | |
| 744 | 355 | checkTeam: function() { |
| 745 | 356 | wx.navigateTo({ |
| 746 | 357 | url: "/pages/team/team_detail/team_detail?foundId=" + this.data.order.orderTeamFound.found_id | ... | ... |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
| ... | ... | @@ -173,7 +173,7 @@ |
| 173 | 173 | |
| 174 | 174 | |
| 175 | 175 | |
| 176 | - <!-- <view class="btn-wrap"> | |
| 176 | + <view class="btn-wrap"> | |
| 177 | 177 | |
| 178 | 178 | <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view> |
| 179 | 179 | <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view> |
| ... | ... | @@ -183,9 +183,8 @@ |
| 183 | 183 | </block> |
| 184 | 184 | |
| 185 | 185 | <view class="tips-btn" wx:if="{{order.order_status==3}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 186 | - | |
| 187 | 186 | |
| 188 | - <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> --> | |
| 187 | + <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator> | |
| 189 | 188 | |
| 190 | 189 | <!---has_rt部分退----> |
| 191 | 190 | <!-- <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}"> |
| ... | ... | @@ -197,7 +196,8 @@ |
| 197 | 196 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> |
| 198 | 197 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 199 | 198 | url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 200 | - </block> | |
| 199 | + | |
| 200 | + </block>--> | |
| 201 | 201 | |
| 202 | 202 | |
| 203 | 203 | <block wx:if="{{order.order_status==2 && order.is_zsorder!=4}}"> |
| ... | ... | @@ -205,12 +205,9 @@ |
| 205 | 205 | url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价</navigator> |
| 206 | 206 | <navigator wx:else class="tips-btn" |
| 207 | 207 | url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价</navigator> |
| 208 | - </block> --> | |
| 209 | - <!-- 积分购 拼团 搭配购没有有再来一单 --> | |
| 210 | - <!-- <block wx:if="{{ (order.pay_status==1 || order.order_status==3) && order.pt_prom_id<=0 && order.integral<=0 && order.order_goods[0].prom_type!=5}}"> | |
| 211 | - <view style="background-color: #feca53;" class="tips-btn" bindtap="moreOrder" >再来一单</view> | |
| 212 | - </block> | |
| 213 | - </view> --> | |
| 208 | + </block> | |
| 209 | + | |
| 210 | + </view> | |
| 214 | 211 | </view> |
| 215 | 212 | |
| 216 | 213 | <warn id="warn"></warn> | ... | ... |
pages/user/order_detail/order_detail.js
| ... | ... | @@ -317,26 +317,6 @@ Page({ |
| 317 | 317 | //--------立即支付---------- |
| 318 | 318 | async jumpToCart4(e) { |
| 319 | 319 | |
| 320 | - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id} | |
| 321 | - if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) { | |
| 322 | - var aid = this.data.order.order_goods['0']['prom_id']; | |
| 323 | - var knum = 0; | |
| 324 | - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, { | |
| 325 | - }).then(res => { | |
| 326 | - if (res.data.code == 0) { | |
| 327 | - knum = res.data.data; | |
| 328 | - } | |
| 329 | - | |
| 330 | - }); | |
| 331 | - | |
| 332 | - if (knum <= 0) { | |
| 333 | - getApp().confirmBox("库存为0，支付失败"); | |
| 334 | - return false; | |
| 335 | - } | |
| 336 | - | |
| 337 | - } | |
| 338 | - | |
| 339 | - | |
| 340 | 320 | var th=this; |
| 341 | 321 | if(this.data.optionIsGoup) |
| 342 | 322 | wx.navigateTo({ |
| ... | ... | @@ -588,8 +568,7 @@ Page({ |
| 588 | 568 | return false; |
| 589 | 569 | } |
| 590 | 570 | } |
| 591 | - } | |
| 592 | - else{ | |
| 571 | + }else{ | |
| 593 | 572 | //不是赠品的时候 |
| 594 | 573 | if(!good.is_gift && good.prom_type!=3){ |
| 595 | 574 | var t_ok=1; |
| ... | ... | @@ -613,7 +592,7 @@ Page({ |
| 613 | 592 | } |
| 614 | 593 | //赠品和搭配购不判断商品金额 |
| 615 | 594 | var isok=1; |
| 616 | - var card_field=th.data.card_field; | |
| 595 | + var card_field=th.data.card_field; // 会员等级 | |
| 617 | 596 | //如果会员是等级会员,商品有等级价,且不是活动商品 |
| 618 | 597 | if(!good.is_gift && !good.is_collocation) { |
| 619 | 598 | if (card_field && gg[card_field] > 0) { |
| ... | ... | @@ -627,7 +606,7 @@ Page({ |
| 627 | 606 | var is_h=0; |
| 628 | 607 | if (!isok) { |
| 629 | 608 | |
| 630 | - var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'; | |
| 609 | + var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买22'; | |
| 631 | 610 | th.toast(content); |
| 632 | 611 | return false; |
| 633 | 612 | } | ... | ... |