Commit 912dffb09ec6db9d2676089645fa98c4a57ed3a9
1 parent
2f17a7bc
1. 拼团的重复支付
2. 会员首页的脚本错误纠正
Showing
2 changed files
with
24 additions
and
12 deletions
pages/cart/cart2_pt/cart2_pt.js
@@ -585,7 +585,7 @@ Page({ | @@ -585,7 +585,7 @@ Page({ | ||
585 | 'content-type': 'application/json' | 585 | 'content-type': 'application/json' |
586 | },// 设置请求的 header | 586 | },// 设置请求的 header |
587 | success: function (res) { | 587 | success: function (res) { |
588 | - th.data.is_summit_ing=0; //是否提交中 | 588 | + |
589 | wx.hideLoading(); | 589 | wx.hideLoading(); |
590 | if (res.statusCode == 200) { | 590 | if (res.statusCode == 200) { |
591 | var data=res.data; | 591 | var data=res.data; |
@@ -613,15 +613,18 @@ Page({ | @@ -613,15 +613,18 @@ Page({ | ||
613 | // }, 1); | 613 | // }, 1); |
614 | util_pay.pay(data.data, function() { | 614 | util_pay.pay(data.data, function() { |
615 | setTimeout(function () { | 615 | setTimeout(function () { |
616 | - wx.navigateTo({ | 616 | + wx.redirectTo({ |
617 | //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, | 617 | //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, |
618 | - url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 618 | + url: "/pages/team/team_success/team_success?ordersn=" + data.data, |
619 | }) | 619 | }) |
620 | },1000) | 620 | },1000) |
621 | }, function () { | 621 | }, function () { |
622 | //支付失败 | 622 | //支付失败 |
623 | setTimeout(function () { | 623 | setTimeout(function () { |
624 | - wx.navigateBack({ delta: 1 }) | 624 | + //wx.navigateBack({ delta: 1 }) |
625 | + wx.redirectTo({ | ||
626 | + url: "/pages/user/order_list/order_list", | ||
627 | + }) | ||
625 | },1000) | 628 | },1000) |
626 | 629 | ||
627 | },oo.stoid,1); | 630 | },oo.stoid,1); |
@@ -647,9 +650,12 @@ Page({ | @@ -647,9 +650,12 @@ Page({ | ||
647 | url: "/pages/user/order_list/order_list", | 650 | url: "/pages/user/order_list/order_list", |
648 | })--*/ | 651 | })--*/ |
649 | var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; | 652 | var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; |
650 | - getApp().goto(url); | 653 | + wx.redirectTo({ |
654 | + url: url | ||
655 | + }) | ||
656 | + | ||
651 | }else{ | 657 | }else{ |
652 | - wx.navigateTo({ | 658 | + wx.redirectTo({ |
653 | url: "/pages/team/team_success/team_success?ordersn=" + data.data, | 659 | url: "/pages/team/team_success/team_success?ordersn=" + data.data, |
654 | }) | 660 | }) |
655 | } | 661 | } |
@@ -661,13 +667,16 @@ Page({ | @@ -661,13 +667,16 @@ Page({ | ||
661 | } | 667 | } |
662 | } | 668 | } |
663 | else{ | 669 | else{ |
670 | + th.data.is_summit_ing=0; //是否提交中 | ||
664 | getApp().confirmBox(data.msg); | 671 | getApp().confirmBox(data.msg); |
665 | } | 672 | } |
666 | } else { | 673 | } else { |
674 | + th.data.is_summit_ing=0; //是否提交中 | ||
667 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); | 675 | console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); |
668 | } | 676 | } |
669 | }, | 677 | }, |
670 | fail: function () { | 678 | fail: function () { |
679 | + th.data.is_summit_ing=0; //是否提交中 | ||
671 | wx.hideLoading(); | 680 | wx.hideLoading(); |
672 | console.log("index.js wx.request CheckCallUser fail"); | 681 | console.log("index.js wx.request CheckCallUser fail"); |
673 | }, | 682 | }, |
pages/user/index/index.js
@@ -143,12 +143,15 @@ Page({ | @@ -143,12 +143,15 @@ Page({ | ||
143 | /*-----获取线下会员的预存款和优惠券的数量-----*/ | 143 | /*-----获取线下会员的预存款和优惠券的数量-----*/ |
144 | rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { | 144 | rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { |
145 | success: function(su) { | 145 | success: function(su) { |
146 | - var data = su.data.data; | ||
147 | - if(!data) data={}; | ||
148 | - data.cashcount = parseInt(data.cashcount); | ||
149 | - s.setData({ | ||
150 | - udata: data, | ||
151 | - }); | 146 | + if(su.data.code==0 && su.data.data ) { |
147 | + var data = su.data.data; | ||
148 | + if(!data) data={}; | ||
149 | + data.cashcount = parseInt(data.cashcount); | ||
150 | + s.setData({ | ||
151 | + udata: data, | ||
152 | + }); | ||
153 | + } | ||
154 | + | ||
152 | } | 155 | } |
153 | }) | 156 | }) |
154 | /*-----获取会员提现金额-----*/ | 157 | /*-----获取会员提现金额-----*/ |