diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 50e4ab5..d3a61b9 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -122,9 +122,9 @@ 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;
+                                              //goodslist[iii]['return_btn'] = 1;
                                               ttd.data.data.pageData.forEach(function (eea, ii) {
                                                   var st = eea.status;
                                                   if (eea.goods_id == eeb.goods_id){
@@ -139,13 +139,14 @@ Page({
                                                           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_list/order_list.js b/pages/user/order_list/order_list.js
index 2eacebd..6dcb25b 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -137,9 +137,9 @@ 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;
+                                                   //goodslist[iii]['return_btn'] = 1;
                                                    ttd.data.data.pageData.forEach(function (eea, ii) {
                                                        var st = eea.status;
                                                        if (eea.goods_id == eeb.goods_id){
@@ -153,13 +153,14 @@ Page({
                                                                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;
                                                        }
                                                   });
                                               });
-                                       }
+                                       //}
                                    }
                                }