diff --git a/application/admin/controller/school/activity/order/Order.php b/application/admin/controller/school/activity/order/Order.php
index c27769d..9c024f8 100644
--- a/application/admin/controller/school/activity/order/Order.php
+++ b/application/admin/controller/school/activity/order/Order.php
@@ -74,7 +74,7 @@ class Order extends Backend
                 
                 $row->getRelation('user')->visible(['nickname','realname','mobile','avatar']);
 				$row->getRelation('activity')->visible(['title','images']);
-				$row->getRelation('detail')->visible(['title',"feel","price"]);
+				$row->getRelation('detail')->visible(['title',"feel","price","status"]);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
diff --git a/application/common/model/school/activity/order/Order.php b/application/common/model/school/activity/order/Order.php
index 6880830..0e8af3d 100644
--- a/application/common/model/school/activity/order/Order.php
+++ b/application/common/model/school/activity/order/Order.php
@@ -1919,7 +1919,7 @@ class Order extends BaseModel
                 case "wechat": //微信退款
 
 //                    var_dump($refund_money);
-                    self::wechatRefund($order,$refund_money,$oper_type,$oper_id);
+                    self::wechatRefund($order,$refund_money,$refund_desc="",$oper_type,$oper_id);
                     break;
 //                case "alipay": //支付宝退款
 //                    self::alipayRefund($order,$refund_money,$oper_type,$oper_id);
diff --git a/application/manystore/controller/school/activity/order/Order.php b/application/manystore/controller/school/activity/order/Order.php
index df964de..15abd92 100644
--- a/application/manystore/controller/school/activity/order/Order.php
+++ b/application/manystore/controller/school/activity/order/Order.php
@@ -79,7 +79,7 @@ class Order extends ManystoreBase
             foreach ($list as $row) {
                 
                 $row->getRelation('schoolactivity')->visible(['title','images','price']);
-				$row->getRelation('schoolactivityorderdetail')->visible(['title','price']);
+				$row->getRelation('schoolactivityorderdetail')->visible(['title','price',"status"]);
 				$row->getRelation('user')->visible(['nickname','mobile','avatar']);
             }
 
diff --git a/public/assets/js/backend/school/activity/activity.js b/public/assets/js/backend/school/activity/activity.js
index 87a592c..e993f76 100644
--- a/public/assets/js/backend/school/activity/activity.js
+++ b/public/assets/js/backend/school/activity/activity.js
@@ -64,10 +64,19 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
                         {field: 'address_detail', title: __('Address_detail'), operate: 'LIKE'},
                         {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
                         {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-                        {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
                         {field: 'sign_start_time', title: __('Sign_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sign_end_time', title: __('Sign_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+
+                        {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+
+
+
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
                         {field: 'stock', title: __('Stock')},
 
diff --git a/public/assets/js/backend/school/activity/order/order.js b/public/assets/js/backend/school/activity/order/order.js
index 2dfa0f1..6889ac4 100644
--- a/public/assets/js/backend/school/activity/order/order.js
+++ b/public/assets/js/backend/school/activity/order/order.js
@@ -115,8 +115,8 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
 
                                     },
                                     visible: function (row) {
-                                        //只有付费订单有售后
-                                        return (row.status == '2' || row.status == '3'|| row.status == '9')  && row.detail.feel == '0';
+                                        //只有付费订单有售后,只有活动开始后才能发起售后
+                                        return row.detail.status != '2' && (row.status == '2' || row.status == '3'|| row.status == '9')  && row.detail.feel == '0';
                                     }
                                 },
 
@@ -230,7 +230,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
                                     },
                                     visible: function (row) {
                                         //非免费订单只有未支付可取消
-                                        if((row.status == '2'|| row.status == '3' )&& row.detail.feel == '0'){
+                                        if(row.detail.status == '2' && (row.status == '2'|| row.status == '3' )&& row.detail.feel == '0'){
                                             return true;
                                         }
 
diff --git a/public/assets/js/manystore/school/activity/activity.js b/public/assets/js/manystore/school/activity/activity.js
index 1edc593..5ec23b6 100644
--- a/public/assets/js/manystore/school/activity/activity.js
+++ b/public/assets/js/manystore/school/activity/activity.js
@@ -65,10 +65,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'address_detail', title: __('Address_detail'), operate: 'LIKE'},
                         {field: 'longitude', title: __('Longitude'), operate: 'LIKE'},
                         {field: 'latitude', title: __('Latitude'), operate: 'LIKE'},
-                        {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
                         {field: 'sign_start_time', title: __('Sign_start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'sign_end_time', title: __('Sign_end_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+                        {field: 'start_time', title: __('Start_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'end_time', title: __('End_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+
+
+
                         {field: 'price', title: __('Price'), operate:'BETWEEN'},
                         {field: 'stock', title: __('Stock')},
 
diff --git a/public/assets/js/manystore/school/activity/order/order.js b/public/assets/js/manystore/school/activity/order/order.js
index 75f8673..11e629a 100644
--- a/public/assets/js/manystore/school/activity/order/order.js
+++ b/public/assets/js/manystore/school/activity/order/order.js
@@ -193,7 +193,7 @@ define(['jquery', 'bootstrap', 'backend', 'csmtable', 'form'], function ($, unde
                                     },
                                     visible: function (row) {
                                         //非免费订单只有未支付可取消
-                                        if((row.status == '2'|| row.status == '3' )&& row.schoolactivityorderdetail.feel == '0'){
+                                        if(row.schoolactivityorderdetail.status == '2' && (row.status == '2'|| row.status == '3' )&& row.schoolactivityorderdetail.feel == '0'){
                                             return true;
                                         }