diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index d3a61b9..2f99c7e 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -124,7 +124,8 @@ Page({
 
                                       //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){
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 6dcb25b..13a4a16 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -139,7 +139,8 @@ Page({
 
                                        //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){
@@ -224,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
                        {
@@ -251,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,{
@@ -294,6 +288,15 @@ Page({
         });
     },
 
+    deleteOrderData2:function(order_id){
+        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;