From 90a9d28578b9155bf68d130123025774bb5f7862 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 16 Nov 2023 15:04:20 +0800
Subject: [PATCH] 预售定金未支付，到卡项订单详情页面，再次支付成功后，要跳转到预售服务卡的尾款支付页面

---
 packageA/pages/details_serviceCard/details_serviceCard.js   | 10 +++++++++-
 packageA/pages/details_serviceCard/details_serviceCard.wxml |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 9aa7d3c..e50aa62 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -654,6 +654,7 @@ Page({
 		// 如果是秒杀购买：1、判断活动是否变化；2、是否超出限购
 		let list =  this.data.details.list;
 		var pt_act=null;  //-- 拼团活动的优化 --
+		var presell=null;  //-- 预售活动 --
 
 		//秒杀活动和拼团活动要重新计算一下
 		for (const it of list) {
@@ -896,6 +897,7 @@ Page({
 							flag = 0;
 							return false;
 						}
+						presell=act_data;
 					}
 				})
 
@@ -956,7 +958,13 @@ Page({
 						wx.redirectTo({
 							url: "/packageA/pages/serviceCard_pd/team_success/team_success?ordersn=" + order_sn
 						});
-					}else{
+					}else if(presell && presell.presell_type==0){
+
+						wx.redirectTo({
+							url: 	"/packageC/pages/presell/cart/cart?is_fwk=1&order_sn=" + order_sn
+						});
+					}
+					else{
 						wx.reLaunch({
 							url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + order_id,
 						})
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index c9da4ae..b17d6e3 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -81,7 +81,7 @@
 	<!-- 底部按钮栏 -->
 	<view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
 		<!-- 待支付 -->
-		<block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6  }}">
+		<block wx:if="{{details.pay_status == 0 && details.order_status==0 && details.prom_type!=6  }}">
 			<text class="btn btn-border" bindtap="cancle">取消订单</text>
 			<text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
 		</block>
--
libgit2 0.21.4