wxd / MShopWeApp

Commit 3ae5a2e5343d0d3914fbb607c254eefa72fc4947

Authored by 后端研发-倪永富
1 parent 2a61d132

第一次成为分销商的订单不能退款

Inline Side-by-side
Showing 2 changed files with 13 additions and 13 deletions
pages/user/order_detail/order_detail.wxml
  View file @3ae5a2e
... ... @@ -15,7 +15,7 @@
15 15 </view>
16 16 </view>
17 17 <view class="order-meg">
18   - <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>
  18 + <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>
19 19 <view>{{order.order_status_detail}}</view>
20 20 </view>
21 21 <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}" wx:if="{{item.return_btn!=4}}" >
... ... @@ -37,7 +37,7 @@
37 37 <!-- 不是整单退的时候 -->
38 38 <block wx:if="{{order.is_all_return!=1}}">
39 39 <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
40   - data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==1}}">申请退款</view>
  40 + data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==1 && !order.is_bedistri}}">申请退款</view>
41 41 <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
42 42 data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==2}}">退款中</view>
43 43 <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
... ... @@ -52,8 +52,8 @@
52 52 <view class="order-operate">
53 53 <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
54 54 <view bindtap="contactService" class="contact-us goods-btn">联系客服</view>
55   - <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}"
56   - hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
  55 + <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}"
  56 + hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
57 57 </view>
58 58 </view>
59 59 <view class="basic-information information">
... ... @@ -66,7 +66,7 @@
66 66 <view>下单时间</view>
67 67 <view>{{order.addTimeFormat}}</view>
68 68 </view>
69   -
  69 +
70 70 <view class="item" wx:if="{{order.order_prom_type!=5}}">
71 71 <view>配送方式</view>
72 72 <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}}</view>
... ... @@ -114,7 +114,7 @@
114 114 <view>订单优惠</view>
115 115 <view>￥ {{order.order_prom_amount}}元</view>
116 116 </view>
117   -
  117 +
118 118 <view class="item">
119 119 <view>订单总价</view>
120 120 <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
... ... @@ -142,9 +142,9 @@
142 142  
143 143 <!---has_rt部分退---->
144 144 <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
145   - <navigator class="tips-btn" hidden="{{!(order.order_status==0&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
146   - <navigator class="tips-btn" hidden="{{!(order.order_status==1&&order.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
147   - </block>
  145 + <navigator class="tips-btn" wx:if="{{(order.order_status==0&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
  146 + <navigator class="tips-btn" wx:if="{{(order.order_status==1&&order.pay_status==1) && !order.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">申请退款</navigator>
  147 + </block>
148 148 <block wx:else>
149 149 <view class="tips-btn" wx:if="{{order.is_all_return_status==2}}" bindtap="deleteOrderData" order_id="{{order.order_id}}" >删除订单</view>
150 150 <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator>
... ...
pages/user/order_list/order_list.wxml
  View file @3ae5a2e
... ... @@ -64,7 +64,7 @@
64 64 <view class="flex-level-right fs26 refund">
65 65 <!-- 不是整单退的时候 -->
66 66 <block wx:if="{{item.is_all_return!=1}}">
67   - <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1}}">申请退款</view>
  67 + <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1 && !item.is_bedistri }}">申请退款</view>
68 68 <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
69 69 <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
70 70 <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==4}}">退款完成</view>
... ... @@ -132,8 +132,8 @@
132 132 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
133 133 <!---has_rt部分退---->
134 134 <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
135   - <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.order_status==0&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
136   - <navigator class="commodity_To_evaluate flex-level View_evaluation" hidden="{{!(item.order_status==1&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
  135 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==0&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
  136 + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{(item.order_status==1&&item.pay_status==1) && !item.is_bedistri}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
137 137 </block>
138 138 <block wx:else>
139 139 <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}">删除订单</view>
... ... @@ -185,4 +185,4 @@
185 185 </view>
186 186 </view>
187 187 <!-- 弹出框扫描 -->
188   -<qr_code id="qc_com"></qr_code>
189 188 \ No newline at end of file
  189 +<qr_code id="qc_com"></qr_code>
... ...