From 3ae5a2e5343d0d3914fbb607c254eefa72fc4947 Mon Sep 17 00:00:00 2001
From: yvan <yvan.ni@yolipai.com>
Date: Mon, 17 Feb 2020 15:55:25 +0800
Subject: [PATCH] 第一次成为分销商的订单不能退款

---
 pages/user/order_detail/order_detail.wxml | 18 +++++++++---------
 pages/user/order_list/order_list.wxml     |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 3cc3117..a3c5550 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -15,7 +15,7 @@
         </view>
     </view>
     <view class="order-meg">
-        <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>    
+        <view class="order-state"><view class="shop_name">门店：{{order.pickname}}</view>
              <view>{{order.order_status_detail}}</view>
         </view>
         <view class="order-detail" wx:for="{{order.order_goods}}" wx:key="{{index}}"  wx:if="{{item.return_btn!=4}}"  >
@@ -37,7 +37,7 @@
                 <!-- 不是整单退的时候 -->
                 <block wx:if="{{order.is_all_return!=1}}">
                     <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
-                          data-recid="{{item.goods_id}}"  wx:if="{{item.return_btn==1}}">申请退款</view>
+                          data-recid="{{item.goods_id}}"  wx:if="{{item.return_btn==1 && !order.is_bedistri}}">申请退款</view>
                     <view bindtap="gotoreturn" class="return-btn" data-oid="{{item.order_id}}"
                           data-recid="{{item.goods_id}}" wx:if="{{item.return_btn==2}}">退款中</view>
                     <view bindtap="checkReturnGoodsStatus" class="goods-num" data-oid="{{item.order_id}}"
@@ -52,8 +52,8 @@
         <view class="order-operate">
             <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
             <view bindtap="contactService" class="contact-us goods-btn">联系客服</view>
-            <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}" 
-              hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>       
+            <view bindtap="cancelOrder" class="cancel-order goods-btn" data-id="{{order.order_id}}"
+              hidden="{{!(order.order_status==0&&order.pay_status==0)}}">取消订单</view>
         </view>
     </view>
     <view class="basic-information information">
@@ -66,7 +66,7 @@
             <view>下单时间</view>
             <view>{{order.addTimeFormat}}</view>
         </view>
-       
+
         <view class="item" wx:if="{{order.order_prom_type!=5}}">
             <view>配送方式</view>
             <view>{{(order.shipping_name!=''&& order.shipping_name!=null) ?order.shipping_name:'无'}}</view>
@@ -114,7 +114,7 @@
                 <view>订单优惠</view>
                 <view>￥ {{order.order_prom_amount}}元</view>
             </view>
-          
+
             <view class="item">
               <view>订单总价</view>
               <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money,2)}}元</view>
@@ -142,9 +142,9 @@
 
           <!---has_rt部分退---->
          <block wx:if="{{order.return_btn==undefined && order.is_all_return!=1 && order.has_rt!=1}}">
-                          <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>
-                          <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>
-         </block> 
+                          <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>
+                          <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>
+         </block>
          <block wx:else>
                           <view class="tips-btn" wx:if="{{order.is_all_return_status==2}}"  bindtap="deleteOrderData" order_id="{{order.order_id}}" >删除订单</view>
                           <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>
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 5b6d399..078d4b9 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -64,7 +64,7 @@
               <view class="flex-level-right fs26 refund">
                 <!-- 不是整单退的时候 -->
                 <block wx:if="{{item.is_all_return!=1}}">
-                  <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==1}}">申请退款</view>
+                  <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>
                   <view catchtap="gotoreturn" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==2}}">退款中</view>
                   <view catchtap="checkReturnGoodsStatus" class="return-btn" data-oid="{{goods.order_id}}" data-recid="{{goods.goods_id}}" wx:if="{{goods.return_btn==3}}">重新退款</view>
                   <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 @@
           <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.pt_status==3}}">拼团失败</view>
           <!---has_rt部分退---->
           <block wx:if="{{item.return_btn==undefined && item.is_all_return!=1 && item.has_rt!=1}}">
-            <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>
-            <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>
+            <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>
+            <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>
           </block>
           <block wx:else>
             <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 @@
   </view>
 </view>
 <!-- 弹出框扫描 -->
-<qr_code id="qc_com"></qr_code>
\ No newline at end of file
+<qr_code id="qc_com"></qr_code>
--
libgit2 0.21.4