From c2c416fd9adf0597980c1107b0e868763b872b9b Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Fri, 27 Sep 2019 18:08:56 +0800
Subject: [PATCH] 订单列表，和订单详情，关于退款中不能收货的优化完成

---
 pages/user/order_detail/order_detail.js   |  3 ++-
 pages/user/order_detail/order_detail.wxml |  6 +++++-
 pages/user/order_list/order_list.js       |  2 +-
 pages/user/order_list/order_list.wxml     | 10 ++++++----
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 9fa5676..50e4ab5 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -128,10 +128,11 @@ Page({
                                               ttd.data.data.pageData.forEach(function (eea, ii) {
                                                   var st = eea.status;
                                                   if (eea.goods_id == eeb.goods_id){
-                                                      r['has_rt'] = 1; //有部分退
+
                                                       switch (eea.status){
                                                           case 0:
                                                           case 1://退款处理中
+                                                              r['has_rt'] = 1; //有部分退
                                                               goodslist[iii]['return_btn'] = 2; break;
                                                           case 2://退款完成
                                                               goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index fd4b9f5..558fa9e 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -131,7 +131,11 @@
 
         <view bindtap="zfwk" class="tips-btn" wx:if="{{order.pt_tail_money>0 && order.pt_status==2 }}">支付尾款</view>
         <view bindtap="jumpToCart4" class="tips-btn" hidden="{{!order.pay_btn}}">立即付款</view>
-        <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
+
+        <block wx:if="{{!(order.has_rt || order.return_btn==2 || order.return_btn==4)}}">
+           <navigator bindtap="confirmOrder" class="tips-btn" hidden="{{!order.receive_btn}}">收货确认</navigator>
+        </block>
+
         <navigator class="tips-btn" hidden="{{!order.shipping_btn}}" url="/pages/user/express/express?order_id={{order.order_id}}">查看物流</navigator>
 
           <!---has_rt部分退---->
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 2729a0d..2eacebd 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -143,10 +143,10 @@ Page({
                                                    ttd.data.data.pageData.forEach(function (eea, ii) {
                                                        var st = eea.status;
                                                        if (eea.goods_id == eeb.goods_id){
-                                                           data[ind]['has_rt'] = 1; //有部分退
                                                            switch (eea.status){
                                                                case 0:
                                                                case 1://退款处理中
+                                                                   data[ind]['has_rt'] = 1; //有部分退
                                                                    goodslist[iii]['return_btn'] = 2; break;
                                                                case 2://退款完成
                                                                    goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 83cb7b6..7fa46a4 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -88,11 +88,13 @@
                           <navigator class="order-btn" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator>
                       </block>
-                 
 
-                    <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
-                     <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
-                    <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
+                      <block wx:if="{{!(item.has_rt || item.return_btn==2 || item.return_btn==4)}}">
+                       <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">确认收货</view>
+                       <view bindtap="confirmOrder" data-zsorder="{{item.is_zsorder}}"  class="order-btn white red-b" data-id="{{item.order_id}}" hidden="{{!(item.order_status==1&&item.pay_status==1&&item.shipping_status==2)}}">确认收货</view>
+                      </block>
+
+      <navigator redirect class="order-btn white red-b" hidden="{{!(item.order_status==2)}}" url="/pages/user/comment/comment?status=0">评价</navigator>
                     <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==1)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
                     <navigator class="order-btn" hidden="{{!(item.exp_type==0&&item.pay_status==1&&item.shipping_status==2)}}" url="/pages/user/express/express?order_id={{item.order_id}}">查看物流</navigator>
                     <navigator class="order-btn"  url="/pages/user/order_detail/order_detail?order_id={{item.order_id}}">订单详情</navigator>
--
libgit2 0.21.4