diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 9fa5676..2f99c7e 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -122,29 +122,32 @@ Page({
                                       r['is_all_return'] = 0;
                                       var rt_ok_num=0;
 
-                                      if(r['order_status'] == 1 && r['pay_status'] == 1) {
+                                      //if(r['order_status'] == 1 && r['pay_status'] == 1) {
                                           goodslist.forEach(function (eeb, iii) {
-                                              goodslist[iii]['return_btn'] = 1;
+                                              if(r['order_status'] == 1 && r['pay_status'] == 1)
+                                                  goodslist[iii]['return_btn'] = 1; //申请退款
                                               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;
                                                           case 3://已拒绝，重新退款
                                                               goodslist[iii]['return_btn'] = 3; break;
                                                           default:
-                                                              goodslist[iii]['return_btn'] = 1; //申请退款
+                                                              if(r['order_status'] == 1 && r['pay_status'] == 1)
+                                                                   goodslist[iii]['return_btn'] = 1; //申请退款
                                                       }
                                                       return;
                                                   }
                                               });
                                           });
-                                      }
+                                      //}
                                   }
                               }
 
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..517a8d0 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -137,29 +137,31 @@ Page({
                                        data[ind]['is_all_return'] = 0;
                                        var rt_ok_num=0;
 
-                                       if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
+                                       //if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
                                                goodslist.forEach(function (eeb, iii) {
-                                                   goodslist[iii]['return_btn'] = 1;
+                                                   if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                                                        goodslist[iii]['return_btn'] = 1; //申请退款
                                                    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;
                                                                case 3://已拒绝，重新退款
                                                                    goodslist[iii]['return_btn'] = 3; break;
                                                                default:
-                                                                   goodslist[iii]['return_btn'] = 1; //申请退款
+                                                                   if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1)
+                                                                       goodslist[iii]['return_btn'] = 1; //申请退款
                                                            }
                                                            return;
                                                        }
                                                   });
                                               });
-                                       }
+                                       //}
                                    }
                                }
 
@@ -223,7 +225,7 @@ Page({
                        if(t.data.code==0)
                        {
                           0 == e.data.activeCategoryId ?
-                            (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData(a);
+                            (e.resetData(), e.requestOrderList(e.data.activeCategoryId)) : e.deleteOrderData2(a);
                        }
                        else
                        {
@@ -250,14 +252,7 @@ Page({
                         order_id: a,order_status:2
                     },
                     success: function(t) {
-                        //e.deleteOrderData(a);
-                        for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id ==a ) {
-                            th.data.orderList.splice(e, 1), th.setData({
-                                orderList: th.data.orderList
-                            });
-                            break;
-                        }
-                        
+                        e.deleteOrderData2(a);
                         //如果是会员团订单
                         if(is_zsorder==3){
                           getApp().request.post("/api/weshop/order/vipTuanTebate/"+os.stoid+"/"+a,{
@@ -293,6 +288,16 @@ Page({
         });
     },
 
+    deleteOrderData2:function(order_id){
+        var th=this;
+        for (var e = 0; e < th.data.orderList.length; e++) if (th.data.orderList[e].order_id == order_id) {
+            th.data.orderList.splice(e, 1), th.setData({
+                orderList: this.data.orderList
+            });
+            break;
+        }
+    },
+
     //---判断是不是有退款-----
     checkReturnGoodsStatus: function(t) {
         var e = t.currentTarget.dataset.recid;
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>