diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index 624463d..00a1b19 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -134,7 +134,7 @@ class Order extends Backend
         $build = $this->model
             ->field(['id', 'order_no', 'admin_id', 'customer', 'tel', 'status', 'area_id', 'address',
                 'source', 'source_shop', 'source_uid', 'source', 'item_title', 'item_id', 'work_tel_id',
-                'detail', 'remark', 'images', 'create_time', 'update_time', 'admin_id', 'dispatch_type', 'receive_type'])
+                'detail', 'remark', 'images', 'create_time', 'update_time', 'admin_id', 'dispatch_type', 'receive_type','aftersale_id'])
             ->where($where);
 
         if ($type == 1){
@@ -167,6 +167,14 @@ class Order extends Backend
             }])
             ->order($sort, $order)
             ->paginate($limit);
+
+        foreach ($list as &$item){
+            $item->aftersale_btn = false;
+            if($item->status == \app\admin\model\Order::STATUS_FINISHED && $item->aftersale_id==0){
+                $item->aftersale_btn = true;
+            }
+        }
+
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
diff --git a/application/admin/controller/aftersales/Aftersale.php b/application/admin/controller/aftersales/Aftersale.php
index ec94f8a..e0a6a50 100644
--- a/application/admin/controller/aftersales/Aftersale.php
+++ b/application/admin/controller/aftersales/Aftersale.php
@@ -87,6 +87,16 @@ class Aftersale extends Backend
     public function add()
     {
         if (false === $this->request->isPost()) {
+
+            $order_id = $this->request->param('order_id');
+            if(empty($order_id)){
+                $this->error('请选择订单');
+            }
+            $order = Order::get($order_id);
+            if(empty($order)){
+                $this->error('订单不存在');
+            }
+            $this->assign('order',$order);
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
diff --git a/application/admin/view/aftersales/aftersale/add.html b/application/admin/view/aftersales/aftersale/add.html
index 0b8c088..de6af27 100644
--- a/application/admin/view/aftersales/aftersale/add.html
+++ b/application/admin/view/aftersales/aftersale/add.html
@@ -1,9 +1,12 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
+
+    <input type="hidden"  name="row[order_id]" value="{$order.id}">
+
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('选择订单')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('订单编号')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-order_id"  data-field="order_no" data-rule="required" data-source="order/index" class="form-control selectpage" name="row[order_id]" type="text" value="">
+            <input id="c-order_no"  readonly data-rule="required"  class="form-control"  type="text" value="{$order.order_no}">
         </div>
     </div>
 
@@ -112,43 +115,6 @@
         </div>
     </div>
 
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Company_refund_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-company_refund_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[company_refund_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Worker_refund_time')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-worker_refund_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[worker_refund_time]" type="text" value="{:date('Y-m-d H:i:s')}">
-        </div>
-    </div>
-
-
-
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Star')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-star" data-rule="required" class="form-control" name="row[star]" type="number" value="0">
-        </div>
-    </div>
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
-        <div class="col-xs-12 col-sm-8">
-
-            <div class="radio">
-                {foreach name="statusList" item="vo"}
-                <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label>
-                {/foreach}
-            </div>
-
-        </div>
-    </div>
 
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
diff --git a/application/admin/view/aftersales/aftersale/index.html b/application/admin/view/aftersales/aftersale/index.html
index 0ccc004..6a3d3e8 100644
--- a/application/admin/view/aftersales/aftersale/index.html
+++ b/application/admin/view/aftersales/aftersale/index.html
@@ -17,11 +17,11 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('aftersales/aftersale/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                     <!--   <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('aftersales/aftersale/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('aftersales/aftersale/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('aftersales/aftersale/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         
-
+-->
                         <div class="dropdown btn-group {:$auth->check('aftersales/aftersale/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">
diff --git a/public/assets/js/backend/aftersales/aftersale.js b/public/assets/js/backend/aftersales/aftersale.js
index 7a67575..76bb5d4 100644
--- a/public/assets/js/backend/aftersales/aftersale.js
+++ b/public/assets/js/backend/aftersales/aftersale.js
@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'aftersales/aftersale/index' + location.search,
                     add_url: 'aftersales/aftersale/add',
                     edit_url: 'aftersales/aftersale/edit',
-                    del_url: 'aftersales/aftersale/del',
+                   // del_url: 'aftersales/aftersale/del',
                     multi_url: 'aftersales/aftersale/multi',
                     import_url: 'aftersales/aftersale/import',
                     table: 'aftersale',
@@ -57,7 +57,25 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'star', title: __('Star'),operate:false},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'update_time', title: __('Update_time'), operate:false, addclass:'datetimerange', autocomplete:false},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate,
+                            buttons: [
+                                {
+                                    name: 'edit',
+                                    text:"处理",
+                                    title:"售后处理",
+                                    icon: 'fa fa-pencil',
+                                    //title: __('Edit'),
+                                    extend: 'data-toggle="tooltip" data-container="body"',
+                                    classname: 'btn btn-xs btn-success btn-editone',
+                                    /*visible:function(row){
+                                        if(row.status == 50){
+                                            return true;
+                                        }
+                                        return false;
+                                    }*/
+                                }
+                            ],
+                        }
                     ]
                 ]
             });
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js
index 436bc9b..1f28337 100644
--- a/public/assets/js/backend/order.js
+++ b/public/assets/js/backend/order.js
@@ -308,6 +308,26 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
                                         return false;
                                     },
                                 },
+
+                                {
+                                    name: 'saleafter',
+                                    text: '申请售后',
+                                    title: '申请售后',
+                                    classname: 'btn  btn-dialog',
+                                    icon: 'fa fa-pencil',
+                                    url: function(row){
+                                        return 'aftersales/aftersale/add?order_id='+row.id;
+                                    },
+                                    dropdown: "更多",
+
+                                    visible: function (row) {
+                                        if (row.aftersale_btn) {
+                                            return true;
+                                        }
+                                        return false;
+                                    },
+                                },
+
                             ],
                         }
                     ]
@@ -420,6 +440,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'cascader'], function
         copy: function () {
             Controller.api.bindevent();
         },
+        saleafter: function () {
+            Controller.api.bindevent();
+        },
         addabnormal: function () {
             console.log('abnormal');
             Form.api.bindevent($("#add-form"), null, null, function (data) {