Commit 3c6218638d5a99b2b7d8da7f68a3a6f5ee28023f

Authored by 后端研发-苏明海
2 parents 58dd73cb cf6b974f

Merge branch 'test' into 'qa'

Test

See merge request !44
pages/user/order_list/order_list.wxml
... ... @@ -71,7 +71,7 @@
71 71 <view class="check-btn">
72 72 <navigator url="/pages/cart/cart_wk/cart_wk?order_id={{item.order_id}}"
73 73 class="order-btn order-btn-pay" data-idx="{{index}}" wx:if="{{item.pt_status==2 && item.pt_tail_money>0}}">支付尾款</navigator>
74   - <navigator bindtap="jumpToCart4 white red-b" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
  74 + <navigator bindtap="jumpToCart4" class="order-btn order-btn-pay " data-idx="{{index}}" hidden="{{!(item.order_status==0&&item.pay_status==0)}}">立即付款</navigator>
75 75 <view class="order-btn" data-id="{{item.order_id}}" wx:if="{{item.order_status==3 && item.pt_status!=3 }}">已取消</view>
76 76 <view bindtap="cancelOrder" class="order-btn" data-id="{{item.order_id}}" data-zsorder="{{item.is_zsorder}}" data-orderindex="{{index}}"
77 77 hidden="{{!(item.order_status==0 &&item.pay_status==0)}}">取消订单</view>
... ...