Commit 5facad22e3aa63ed0576bd7c070e7da132a80e8d
1 parent
152bf7b6
服务卡项订单详情页面的跳转优化
Showing
2 changed files
with
14 additions
and
3 deletions
pages/user/order_list/ofilter.wxs
0 → 100644
1 | +module.exports = { | ||
2 | + card_url:function (item){ | ||
3 | + var url='/packageA/pages/details_serviceCard/details_serviceCard?order_id='+item.order_id; | ||
4 | + if(item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0) | ||
5 | + url='/packageC/pages/presell/cart/cart?is_fwk=1&order_id='+item.order_id | ||
6 | + return url; | ||
7 | + } | ||
8 | +} | ||
0 | \ No newline at end of file | 9 | \ No newline at end of file |
pages/user/order_list/order_list.wxml
1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
2 | +<wxs module="ofil" src="ofilter.wxs"></wxs> | ||
2 | 3 | ||
3 | <view class="container"> | 4 | <view class="container"> |
4 | <!-- 一级tabbar --> | 5 | <!-- 一级tabbar --> |
@@ -394,7 +395,7 @@ | @@ -394,7 +395,7 @@ | ||
394 | <view class="detail_commoditys"> | 395 | <view class="detail_commoditys"> |
395 | <!-- 单个商品 --> | 396 | <!-- 单个商品 --> |
396 | <view> | 397 | <view> |
397 | - <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}}"> | 398 | + <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.list}}" wx:for-item="goods" wx:for-index="pinx" url="{{ofil.card_url(item)}}"> |
398 | <!-- 商品图片 --> | 399 | <!-- 商品图片 --> |
399 | <navigator class="rel"> | 400 | <navigator class="rel"> |
400 | <image src="{{resourceUrl+goods.img_url}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].list[{{pinx}}].img_url"></image> | 401 | <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 @@ | @@ -457,8 +458,10 @@ | ||
457 | <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> | 458 | <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> |
458 | <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> | 459 | <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> |
459 | 460 | ||
460 | - | ||
461 | - <navigator class="commodity_To_evaluate flex-level View_evaluation" url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator> | 461 | + <!-- 尾款的支付时候,不显示订单详情 --> |
462 | + <navigator class="commodity_To_evaluate flex-level View_evaluation" | ||
463 | + hidden="{{item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0}}" | ||
464 | + url="/packageA/pages/details_serviceCard/details_serviceCard?order_id={{item.order_id}}">订单详情</navigator> | ||
462 | 465 | ||
463 | 466 | ||
464 | <block wx:if="{{item.order_status==1 && item.pay_status==1}}"> | 467 | <block wx:if="{{item.order_status==1 && item.pay_status==1}}"> |