Commit 4ad1ee750a67ec7bef1eaf024f997b1c29897aea

Authored by WXD-SEASON\season
2 parents bd36bc38 7bc648b0

Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

packageG/pages/user/order_detail/order_detail.js
@@ -347,8 +347,12 @@ Page({ @@ -347,8 +347,12 @@ Page({
347 getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{ 347 getApp().request.post("/api/weshop/order/cancelOrder/"+os.stoid+"/"+o+"/"+getApp().globalData.user_id,{
348 data:{}, 348 data:{},
349 success: function(t) { 349 success: function(t) {
350 - if(t.data.code==0)  
351 - th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0); 350 + if(t.data.code==0) {
  351 + th.requestOrderDetail(o), wx.setStorageSync("order:order_list:update", !0);
  352 + }else{
  353 + getApp().confirmBox(t.data.msg);
  354 + }
  355 +
352 }, 356 },
353 }) 357 })
354 /*---- 358 /*----
@@ -427,100 +431,6 @@ Page({ @@ -427,100 +431,6 @@ Page({
427 var user_id=order.user_id; 431 var user_id=order.user_id;
428 432
429 433
430 - //如果使用预存的话,要重新效验下预存金额是否足够  
431 - if(order.pre_cut && order.pre_json){  
432 - let pickup_id=order.pickup_id  
433 - let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})  
434 - let keyid = res.data.data.keyid  
435 - let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)  
436 - if(resdata.code !=0){  
437 - let msg=resdata.msg || "预存金额不足"  
438 - getApp().confirmBox(msg);  
439 - th.setData({ paying: 0 });  
440 - return false;  
441 - }  
442 -  
443 - var listform=[];  
444 - var adv_num=0;  
445 - order_goods.map(ite => {  
446 - //-- 不是赠品的时候 --  
447 - if(!ite.is_gift) {  
448 - let obj = {  
449 - wareno: ite.goods_sn,  
450 - price: ite.first_account, //account是平摊后的实收价格  
451 - qty: ite.goods_num,  
452 - sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)  
453 - }  
454 -  
455 - adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);  
456 - listform.push(obj)  
457 - }  
458 - })  
459 -  
460 - adv_num=parseFloat(adv_num).toFixed(2);  
461 - let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {  
462 - data: {  
463 - accdb: getApp().globalData.config.erpid,  
464 - ApiName: 'api.pos.shop.advancesum.seek',  
465 - usercode: "admin",  
466 - vipid: getApp().globalData.userInfo.erpvipid,  
467 - oddsum: "0",  
468 - advancesum: adv_num,  
469 - storageid: keyid,  
470 - listform  
471 - },  
472 - is_json: 1  
473 - })  
474 - if(!res1 && res1.data.code!=0 ){  
475 - getApp().confirmBox("获取预存的金额失败");  
476 - th.setData({ paying: 0 });  
477 - return false;  
478 - }  
479 -  
480 - if(res1.data.data.length<=0){  
481 - getApp().confirmBox("每天每人仅能使用1次预存抵扣");  
482 - th.setData({ paying: 0 });  
483 - return false;  
484 - }  
485 -  
486 - var yck=0  
487 - let resData = res1.data.data  
488 - resData.map(ite => {  
489 - yck += ite.advancesum*1  
490 - })  
491 - if(yck<=0){  
492 - getApp().confirmBox("每天每人仅能使用1次预存抵扣");  
493 - th.setData({ paying: 0 });  
494 - return false;  
495 - }  
496 -  
497 - if(order.pre_cut && yck!=order.pre_cut){  
498 - getApp().confirmBox("获取预存的金额不对");  
499 - th.setData({ paying: 0 });  
500 - return false;  
501 - }  
502 -  
503 -  
504 - }  
505 - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}  
506 - if (parseInt(order_goods['0']['prom_type']) == 9) {  
507 - var aid = order_goods['0']['prom_id'];  
508 - var knum = 0;  
509 - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {  
510 - }).then(res => {  
511 - if (res.data.code == 0) {  
512 - knum = res.data.data;  
513 - }  
514 - });  
515 -  
516 - if (knum <= 0) {  
517 - getApp().confirmBox("库存为0,支付失败");  
518 - th.setData({ paying: 0 });  
519 - return false;  
520 - }  
521 -  
522 -  
523 - }  
524 434
525 var wlist = ""; 435 var wlist = "";
526 var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销 436 var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销
pages/user/order_list/order_list.js
@@ -506,7 +506,7 @@ Page({ @@ -506,7 +506,7 @@ Page({
506 0 == e.data.activeCategoryId ? 506 0 == e.data.activeCategoryId ?
507 (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a); 507 (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a);
508 } else { 508 } else {
509 - getApp().confirmBox(e.data.msg); 509 + getApp().confirmBox(t.data.msg);
510 } 510 }
511 }, 511 },
512 }) 512 })
@@ -716,102 +716,8 @@ Page({ @@ -716,102 +716,8 @@ Page({
716 var order = e; 716 var order = e;
717 var order_goods = e.order_goods; 717 var order_goods = e.order_goods;
718 var user_id = getApp().globalData.userInfo.user_id; 718 var user_id = getApp().globalData.userInfo.user_id;
719 -  
720 - //如果使用预存的话,要重新效验下预存金额是否足够  
721 - if(order.pre_cut && order.pre_json){  
722 - let pickup_id=order.pickup_id  
723 - let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})  
724 - let keyid = res.data.data.keyid  
725 - let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)  
726 - if(resdata.code !=0){  
727 - let msg=resdata.msg || "预存金额不足"  
728 - getApp().confirmBox(msg);  
729 - th.setData({ paying: 0 });  
730 - return false;  
731 - }  
732 -  
733 - var listform=[];  
734 - var adv_num=0;  
735 - order_goods.map(ite => {  
736 - //-- 不是赠品的时候 --  
737 - if(!ite.is_gift) {  
738 - let obj = {  
739 - wareno: ite.goods_sn,  
740 - price: ite.first_account, //account是平摊后的实收价格  
741 - qty: ite.goods_num,  
742 - sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)  
743 - }  
744 -  
745 - adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);  
746 - listform.push(obj)  
747 - }  
748 - })  
749 -  
750 - adv_num=parseFloat(adv_num).toFixed(2);  
751 - let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {  
752 - data: {  
753 - accdb: getApp().globalData.config.erpid,  
754 - ApiName: 'api.pos.shop.advancesum.seek',  
755 - usercode: "admin",  
756 - vipid: getApp().globalData.userInfo.erpvipid,  
757 - oddsum: "0",  
758 - advancesum: adv_num,  
759 - storageid: keyid,  
760 - listform  
761 - },  
762 - is_json: 1  
763 - })  
764 - if(!res1 && res1.data.code!=0 ){  
765 - getApp().confirmBox("获取预存的金额失败");  
766 - th.setData({ paying: 0 });  
767 - return false;  
768 - }  
769 -  
770 - if(res1.data.data.length<=0){  
771 - getApp().confirmBox("每天每人仅能使用1次预存抵扣");  
772 - th.setData({ paying: 0 });  
773 - return false;  
774 - }  
775 -  
776 - var yck=0  
777 - let resData = res1.data.data  
778 - resData.map(ite => {  
779 - yck += ite.advancesum*1  
780 - })  
781 - if(yck<=0){  
782 - getApp().confirmBox("每天每人仅能使用1次预存抵扣");  
783 - th.setData({ paying: 0 });  
784 - return false;  
785 - }  
786 -  
787 - if(order.pre_cut && yck!=order.pre_cut){  
788 - getApp().confirmBox("获取预存的金额不对");  
789 - th.setData({ paying: 0 });  
790 - return false;  
791 - }  
792 -  
793 -  
794 - }  
795 -  
796 - // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}  
797 - if (parseInt(order_goods['0']['prom_type']) == 9) {  
798 - var aid = order_goods['0']['prom_id'];  
799 - var knum = 0;  
800 - await r.promiseGet('/api/weshop/activitylist/getActLen/' + os.stoid + '/9/' + aid, {  
801 - }).then(res => {  
802 - if (res.data.code == 0) {  
803 - knum = res.data.data;  
804 - }  
805 - });  
806 -  
807 - if (knum <= 0) {  
808 - getApp().confirmBox("库存为0,支付失败");  
809 - th.setData({ paying: 0 });  
810 - return false;  
811 - }  
812 -  
813 - }  
814 719
  720 +
815 var wlist = ""; 721 var wlist = "";
816 var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销 722 var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销
817 723