diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 3b985e4..9028872 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -108,6 +108,8 @@ Page({
                                       //2.退款被拒绝就要显示可以退款
                                       //3.退款已经完成
                                       r['is_all_return'] = 0;
+                                      var rt_ok_num=0;
+
                                       if(r['order_status'] == 1 && r['pay_status'] == 1) {
                                           goodslist.forEach(function (eeb, iii) {
                                               goodslist[iii]['return_btn'] = 1;
@@ -120,7 +122,7 @@ Page({
                                                           case 1://退款处理中
                                                               goodslist[iii]['return_btn'] = 2; break;
                                                           case 2://退款完成
-                                                              goodslist[iii]['return_btn'] = 4; break;
+                                                              goodslist[iii]['return_btn'] = 4;rt_ok_num++; break;
                                                           case 3://已拒绝，重新退款
                                                               goodslist[iii]['return_btn'] = 3; break;
                                                           default:
@@ -134,6 +136,10 @@ Page({
                                   }
                               }
 
+                              //--如果是全部退款，也就可以删除--
+                              if(rt_ok_num==goodslist.length){
+                                  r['is_all_return_status']=2;
+                              }
                               r['order_goods'] = goodslist;
                               var g_num = 0;
                               goodslist.forEach(function (ee, ii) {
@@ -320,6 +326,28 @@ Page({
     });
   },
 
+    //-----删除订单-----
+    deleteOrderData: function(t) {
+        var th=this;
+        var order_id=t.currentTarget.dataset.order_id;
+        wx.showModal({
+            title: "是否取消订单？",
+            success: function(tt) {
+                t.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: {
+                        order_id: a, order_status: 5
+                    },
+                    success: function (t) {
+                        getApp().my_warnning("删除成功",1,th);
+                        setTimeout(function () {
+                             getApp().goto("/pages/user/order_list/order_list");
+                        },1000);
+                    }
+                })
+            }
+        });
+    },
+
 
 
 });
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.json b/pages/user/order_detail/order_detail.json
index 9a4a86c..c9e22db 100644
--- a/pages/user/order_detail/order_detail.json
+++ b/pages/user/order_detail/order_detail.json
@@ -1,4 +1,7 @@
 {
     "navigationBarTitleText": "订单详情",
-    "enablePullDownRefresh": false
+    "enablePullDownRefresh": false,
+    "usingComponents": {
+        "warn": "/components/long_warn/long_warn"
+    }
 }
\ No newline at end of file
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index bad1a71..fd4b9f5 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -140,9 +140,12 @@
                           <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> 
          <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>
                           <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}"
                                      url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator>
         </block>
     </view>
 </view>
+
+<warn id="warn"></warn>
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 02d7f46..e794b4e 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -31,11 +31,12 @@ Page({
     },
     onLoad: function(t) {
         var e = void 0 === t.type ? this.data.activeCategoryId : t.type;
-        s.init(this, "", "orderList"), this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
+        s.init(this, "", "orderList");
+        //this.requestOrderList(e), wx.removeStorageSync("order:order_list:update");
     },
     onShow: function() {
-        wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1), 
-        this.resetData(), this.requestOrderList(this.data.activeCategoryId));
+        //wx.getStorageSync("order:order_list:update") && (wx.setStorageSync("order:order_list:update", !1),
+        this.resetData(), this.requestOrderList(this.data.activeCategoryId);
     },
     changeTab: function(t) {
         this.resetData(), this.requestOrderList(t.currentTarget.id);
@@ -46,7 +47,8 @@ Page({
     
     /*---------获取订单列表--------*/
     requestOrderList: function(t) {
-        var e = this,th=e, r = e.data.url + "/api/weshop/order/page?1=1", a = "";
+        var rd=Math.random()*100;
+        var e = this,th=e, r = e.data.url + "/api/weshop/order/page?rd="+rd, a = "";
         switch(t){
            case "1":
               r += "&wait_status=0"; break;    
@@ -116,6 +118,8 @@ Page({
                                        //2.退款被拒绝就要显示可以退款
                                        //3.退款已经完成
                                        data[ind]['is_all_return'] = 0;
+                                       var rt_ok_num=0;
+
                                        if(data[ind]['order_status'] == 1 && data[ind]['pay_status'] == 1) {
                                                goodslist.forEach(function (eeb, iii) {
                                                    goodslist[iii]['return_btn'] = 1;
@@ -128,7 +132,7 @@ Page({
                                                                case 1://退款处理中
                                                                    goodslist[iii]['return_btn'] = 2; break;
                                                                case 2://退款完成
-                                                                   goodslist[iii]['return_btn'] = 4; break;
+                                                                   goodslist[iii]['return_btn'] = 4; rt_ok_num++; break;
                                                                case 3://已拒绝，重新退款
                                                                    goodslist[iii]['return_btn'] = 3; break;
                                                                default:
@@ -141,6 +145,11 @@ Page({
                                        }
                                    }
                                }
+
+                               //--如果是全部退款，也就可以删除--
+                               if(rt_ok_num==goodslist.length){
+                                   data[ind]['is_all_return_status']=2;
+                               }
                                
                                data[ind]['order_goods'] = goodslist;
                                var g_num = 0;
@@ -240,12 +249,25 @@ Page({
 
     //-----删除订单-----
     deleteOrderData: function(t) {
-        for (var e = 0; e < this.data.orderList.length; e++) if (this.data.orderList[e].order_id == t) {
-            this.data.orderList.splice(e, 1), this.setData({
-                orderList: this.data.orderList
-            });
-            break;
-        }
+        var order_id=t.currentTarget.dataset.order_id;
+        wx.showModal({
+            title: "是否取消订单？",
+            success: function(tt) {
+                t.confirm && rq.put("/api/weshop/order/updatebyId", {
+                    data: {
+                        order_id: a, order_status: 5
+                    },
+                    success: function (t) {
+                        for (var e = 0; e < this.data.orderList.length; e++) if (this.data.orderList[e].order_id == t) {
+                            this.data.orderList.splice(e, 1), this.setData({
+                                orderList: this.data.orderList
+                            });
+                            break;
+                        }
+                    }
+                })
+            }
+        });
     },
 
     //---判断是不是有退款-----
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index c595a5f..623f041 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -83,6 +83,7 @@
                           <navigator class="order-btn" hidden="{{!(item.order_status==1&&item.pay_status==1)}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">申请退款</navigator>
                       </block> 
                       <block wx:else>
+                          <view class="order-btn" wx:if="{{item.is_all_return_status==2}}"  bindtap="deleteOrderData" data-order_id="{{item.order_id}}" >删除订单</view>
                           <navigator class="order-btn" wx:if="{{item.is_all_return_status==3}}"  url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator>                          
                           <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>