Commit 90a9d28578b9155bf68d130123025774bb5f7862
1 parent
4922efcf
预售定金未支付，到卡项订单详情页面，再次支付成功后，要跳转到预售服务卡的尾款支付页面
Showing
2 changed files
with
10 additions
and
2 deletions
packageA/pages/details_serviceCard/details_serviceCard.js
| @@ -654,6 +654,7 @@ Page({ | @@ -654,6 +654,7 @@ Page({ | ||
| 654 | // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购 | 654 | // 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购 |
| 655 | let list = this.data.details.list; | 655 | let list = this.data.details.list; |
| 656 | var pt_act=null; //-- 拼团活动的优化 -- | 656 | var pt_act=null; //-- 拼团活动的优化 -- |
| 657 | + var presell=null; //-- 预售活动 -- | ||
| 657 | 658 | ||
| 658 | //秒杀活动和拼团活动要重新计算一下 | 659 | //秒杀活动和拼团活动要重新计算一下 |
| 659 | for (const it of list) { | 660 | for (const it of list) { |
| @@ -896,6 +897,7 @@ Page({ | @@ -896,6 +897,7 @@ Page({ | ||
| 896 | flag = 0; | 897 | flag = 0; |
| 897 | return false; | 898 | return false; |
| 898 | } | 899 | } |
| 900 | + presell=act_data; | ||
| 899 | } | 901 | } |
| 900 | }) | 902 | }) |
| 901 | 903 | ||
| @@ -956,7 +958,13 @@ Page({ | @@ -956,7 +958,13 @@ Page({ | ||
| 956 | wx.redirectTo({ | 958 | wx.redirectTo({ |
| 957 | url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn | 959 | url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn |
| 958 | }); | 960 | }); |
| 959 | - }else{ | 961 | + }else if(presell && presell.presell_type==0){ |
| 962 | + | ||
| 963 | + wx.redirectTo({ | ||
| 964 | + url: "/packageC/pages/presell/cart/cart?is_fwk=1&order_sn=" + order_sn | ||
| 965 | + }); | ||
| 966 | + } | ||
| 967 | + else{ | ||
| 960 | wx.reLaunch({ | 968 | wx.reLaunch({ |
| 961 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, | 969 | url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id, |
| 962 | }) | 970 | }) |
packageA/pages/details_serviceCard/details_serviceCard.wxml
| @@ -81,7 +81,7 @@ | @@ -81,7 +81,7 @@ | ||
| 81 | <!-- 底部按钮栏 --> | 81 | <!-- 底部按钮栏 --> |
| 82 | <view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}"> | 82 | <view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}"> |
| 83 | <!-- 待支付 --> | 83 | <!-- 待支付 --> |
| 84 | - <block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6 }}"> | 84 | + <block wx:if="{{details.pay_status == 0 && details.order_status==0 && details.prom_type!=6 }}"> |
| 85 | <text class="btn btn-border" bindtap="cancle">取消订单</text> | 85 | <text class="btn btn-border" bindtap="cancle">取消订单</text> |
| 86 | <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text> | 86 | <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text> |
| 87 | </block> | 87 | </block> |