From 5facad22e3aa63ed0576bd7c070e7da132a80e8d Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Tue, 7 Nov 2023 17:10:30 +0800
Subject: [PATCH] 服务卡项订单详情页面的跳转优化

---
 pages/user/order_list/ofilter.wxs     |  8 ++++++++
 pages/user/order_list/order_list.wxml |  9 ++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 pages/user/order_list/ofilter.wxs

diff --git a/pages/user/order_list/ofilter.wxs b/pages/user/order_list/ofilter.wxs
new file mode 100644
index 0000000..8968b99
--- /dev/null
+++ b/pages/user/order_list/ofilter.wxs
@@ -0,0 +1,8 @@
+module.exports = {
+	card_url:function (item){
+		var url='/packageA/pages/details_serviceCard/details_serviceCard?order_id='+item.order_id;
+		if(item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0)
+			url='/packageC/pages/presell/cart/cart?is_fwk=1&order_id='+item.order_id
+		return url;
+	}
+}
\ No newline at end of file
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 705788f..685581a 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -1,4 +1,5 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<wxs module="ofil" src="ofilter.wxs"></wxs>
 
 <view class="container">
 		<!-- 一级tabbar -->
@@ -394,7 +395,7 @@
 	  <view class="detail_commoditys">
 	    <!-- 单个商品 -->
 	    <view>
-	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">
+	      <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods"  wx:for-index="pinx" url="{{ofil.card_url(item)}}">
 	        <!-- 商品图片 -->
 	        <navigator class="rel">
 	          <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image>
@@ -457,8 +458,10 @@
 	          <image wx:if="{{(item.order_status==1&&item.pay_status==1 && item.shipping_status==0 && item.exp_type==1 && !(item.order_goods[0].prom_type==9))}}" class="code" src="{{iurl}}miniapp/images/order/code.png" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
 	          <view bindtap="cancle" class="commodity_To_evaluate flex-level View_evaluation" data-id="{{tabIndex}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" wx:if="{{(item.order_status==0)}}" data-index="{{tabIndex}}">取消订单</view>
 
-	       
-				<navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator>	
+	            <!-- 尾款的支付时候，不显示订单详情 -->
+				<navigator class="commodity_To_evaluate flex-level View_evaluation"
+						   hidden="{{item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0}}"
+						   url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator>
 
 
 				<block wx:if="{{item.order_status==1 && item.pay_status==1}}">
--
libgit2 0.21.4