wxd / MShopWeApp

Commit 674beb60b6b7147dae0ce0e22fc7be01a08f8fb1

Authored by yvan.ni
1 parent 6517842c

服务卡项的订单详情

Inline Side-by-side
Showing 2 changed files with 25 additions and 6 deletions
packageA/pages/details_serviceCard/details_serviceCard.js
  View file @674beb6
@@ -70,8 +70,12 @@ Page({ @@ -70,8 +70,12 @@ Page({
70 }).then(res => { 70 }).then(res => {
71 if (res.data.code == 0) { 71 if (res.data.code == 0) {
72 // console.log('请求成功', res); 72 // console.log('请求成功', res);
  73 + var dd=res.data.data.pageData[0];
  74 + dd.prom_type=dd.list[0].prom_type;
  75 + dd.pt_status=dd.list[0].pt_status;
  76 +
73 this.setData({ 77 this.setData({
74 - details: res.data.data.pageData[0], 78 + details: dd,
75 }); 79 });
76 } else { 80 } else {
77 throw (res); 81 throw (res);
packageA/pages/details_serviceCard/details_serviceCard.wxml
  View file @674beb6
@@ -8,8 +8,17 @@ @@ -8,8 +8,17 @@
8 <view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view> 8 <view class="ellipsis-1 pdr40 fs30"><text class="iconfont icon-shop c-red pdr10"></text>{{item.pickup_name}}</view>
9 <!-- 订单状态 --> 9 <!-- 订单状态 -->
10 <block> 10 <block>
11 - <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 0}}">待支付</text>  
12 - <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1}}">待评价</text> 11 + <text class="c-red shrink0 fs26" wx:if="{{details.order_status<2 && details.pay_status==0 }}">
  12 + <block wx:if="{{details.prom_type==6}}">
  13 + <block wx:if="{{details.pt_status==0}}" >未支付</block>
  14 + <block wx:if="{{details.pt_status==1}}" >组团中</block>
  15 + <block wx:if="{{details.pt_status==2 && details.pt_tail_money>0}}">待支付尾款</block>
  16 + </block>
  17 + <block wx:else>
  18 + 待支付
  19 + </block>
  20 + </text>
  21 + <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 1 && details.pay_status==1}}">待评价</text>
13 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text> 22 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 2}}">已评价</text>
14 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text> 23 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 3}}">已取消</text>
15 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text> 24 <text class="c-red shrink0 fs26" wx:if="{{details.order_status == 5}}">已作废</text>
@@ -68,14 +77,20 @@ @@ -68,14 +77,20 @@
68 </view> 77 </view>
69 78
70 <!-- 底部按钮栏 --> 79 <!-- 底部按钮栏 -->
71 - <view class="btn-bar t-r bg-white pd20"> 80 + <view class="btn-bar t-r bg-white pd20" hidden="{{details.pt_status == 1 && details.order_status<2 }}">
72 <!-- 待支付 --> 81 <!-- 待支付 -->
73 - <block wx:if="{{details.order_status == 0}}"> 82 + <block wx:if="{{details.pay_status == 0 && details.order_status<2 && details.prom_type!=6 }}">
74 <text class="btn btn-border" bindtap="cancle">取消订单</text> 83 <text class="btn btn-border" bindtap="cancle">取消订单</text>
75 <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text> 84 <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
76 </block> 85 </block>
  86 +
  87 + <block wx:if="{{details.pt_status == 0 && details.order_status<2 && details.prom_type==6 }}">
  88 + <text class="btn btn-border" bindtap="cancle">取消订单</text>
  89 + <text class="btn bg-red white mgl20" bindtap="pay">立即支付</text>
  90 + </block>
  91 +
77 <!-- 已支付/未评价 --> 92 <!-- 已支付/未评价 -->
78 - <block wx:if="{{details.order_status == 1}}"> 93 + <block wx:if="{{details.order_status == 1 && details.pay_status == 1 }}">
79 <text class="btn bg-orange white" bindtap="buy2">再来一单</text> 94 <text class="btn bg-orange white" bindtap="buy2">再来一单</text>
80 <text class="btn bg-red white mgl20" bindtap="access">立即评价</text> 95 <text class="btn bg-red white mgl20" bindtap="access">立即评价</text>
81 </block> 96 </block>