diff --git a/application/admin/controller/aftersales/Aftersale.php b/application/admin/controller/aftersales/Aftersale.php
index aefb257..c2bb753 100644
--- a/application/admin/controller/aftersales/Aftersale.php
+++ b/application/admin/controller/aftersales/Aftersale.php
@@ -133,6 +133,7 @@ class Aftersale extends Backend
                 $params['worker_id'] = $order->dispatch->worker_id;
                 $params['worker_name'] = $order->dispatch->worker_name;
             }
+            $params['refund_amount'] = bcadd($params['company_refund_amount'],$params['worker_refund_amount'],2);
             $result = $this->model->allowField(true)->save($params);
             $order->aftersale_id = $this->model->id;
             $order->save();
@@ -194,6 +195,7 @@ class Aftersale extends Backend
             }
             $params['handle_admin_id'] = $this->auth->id;
             $params['handle_admin_user'] = $this->auth->nickname;
+            $params['refund_amount'] = bcadd($params['company_refund_amount'],$params['worker_refund_amount'],2);
             $result = $row->allowField(true)->save($params);
             Db::commit();
         } catch (ValidateException|PDOException|Exception $e) {
diff --git a/application/admin/lang/zh-cn/aftersales/aftersale.php b/application/admin/lang/zh-cn/aftersales/aftersale.php
index 47dc7a0..1e1f357 100644
--- a/application/admin/lang/zh-cn/aftersales/aftersale.php
+++ b/application/admin/lang/zh-cn/aftersales/aftersale.php
@@ -4,8 +4,8 @@ return [
     'Id'                      => 'ID',
     'Order_id'                => '订单ID',
     'Status'                  => '状态',
-    'Status 1'                => '售后中',
-    'Set status to 1'         => '设为售后中',
+    'Status 1'                => '待处理',
+    'Set status to 1'         => '设为待处理',
     'Status 2'                => '已办结',
     'Set status to 2'         => '设为已办结',
     'Status 3'                => '已退款',
diff --git a/application/admin/view/aftersales/aftersale/add.html b/application/admin/view/aftersales/aftersale/add.html
index de6af27..c30b52a 100644
--- a/application/admin/view/aftersales/aftersale/add.html
+++ b/application/admin/view/aftersales/aftersale/add.html
@@ -34,22 +34,17 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-refund_amount" data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="0.00">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_refund_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-company_refund_amount" data-rule="required" class="form-control" step="0.01" name="row[company_refund_amount]" type="number" value="0.00">
+            <input id="c-company_refund_amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[company_refund_amount]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Worker_refund_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-worker_refund_amount" data-rule="required" class="form-control" step="0.01" name="row[worker_refund_amount]" type="number" value="0.00">
+            <input id="c-worker_refund_amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[worker_refund_amount]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
@@ -76,12 +71,12 @@
 
         </div>
     </div>
-    <div class="form-group">
+<!--    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund_time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-refund_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refund_time]" type="text" value="{:date('Y-m-d H:i:s')}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer_appeal')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -91,7 +86,15 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer_qrcode')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-customer_qrcode" class="form-control" name="row[customer_qrcode]" type="text">
+            <div class="input-group">
+                <input id="c-customer_qrcode" class="form-control" size="50" name="row[customer_qrcode]" type="text" value="">
+                <div class="input-group-addon no-border no-padding">
+                    <span><button type="button" id="faupload-customer_qrcode" class="btn btn-danger faupload" data-input-id="c-customer_qrcode" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp,image/webp" data-multiple=false data-preview-id="p-customer_qrcode"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="fachoose-customer_qrcode" class="btn btn-primary fachoose" data-input-id="c-customer_qrcode" data-mimetype="image/*" data-multiple=false><i class="fa fa-list"></i> {:__('Choose')}</button></span>
+                </div>
+                <span class="msg-box n-right" for="c-customer_qrcode"></span>
+            </div>
+            <ul class="row list-inline faupload-preview" id="p-customer_qrcode"></ul>
         </div>
     </div>
     <div class="form-group">
diff --git a/application/admin/view/aftersales/aftersale/edit.html b/application/admin/view/aftersales/aftersale/edit.html
index 7077adf..5d53809 100644
--- a/application/admin/view/aftersales/aftersale/edit.html
+++ b/application/admin/view/aftersales/aftersale/edit.html
@@ -31,22 +31,17 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Refund_amount')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-refund_amount" data-rule="required" class="form-control" step="0.01" name="row[refund_amount]" type="number" value="{$row.refund_amount|htmlentities}">
-        </div>
-    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Company_refund_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-company_refund_amount" data-rule="required" class="form-control" step="0.01" name="row[company_refund_amount]" type="number" value="{$row.company_refund_amount|htmlentities}">
+            <input id="c-company_refund_amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[company_refund_amount]" type="number" value="{$row.company_refund_amount|htmlentities}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Worker_refund_amount')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-worker_refund_amount" data-rule="required" class="form-control" step="0.01" name="row[worker_refund_amount]" type="number" value="{$row.worker_refund_amount|htmlentities}">
+            <input id="c-worker_refund_amount" data-rule="required" min="0" class="form-control" step="0.01" name="row[worker_refund_amount]" type="number" value="{$row.worker_refund_amount|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -73,12 +68,26 @@
 
         </div>
     </div>
-    <div class="form-group">
+<!--    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Refund_time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-refund_time" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[refund_time]" type="text" value="{$row.refund_time}">
         </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="{$row.company_refund_time}">
+        </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="{$row.worker_refund_time}">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Customer_appeal')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -122,18 +131,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="{$row.company_refund_time}">
-        </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="{$row.worker_refund_time}">
-        </div>
-    </div>
 
 
     <div class="form-group">
diff --git a/public/assets/js/backend/aftersales/aftersale.js b/public/assets/js/backend/aftersales/aftersale.js
index 76bb5d4..083736a 100644
--- a/public/assets/js/backend/aftersales/aftersale.js
+++ b/public/assets/js/backend/aftersales/aftersale.js
@@ -40,7 +40,9 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'worker_refund_amount', title: __('Worker_refund_amount'), operate:false},
                         {field: 'refund_type', title: __('Refund_type'), searchList: {"1":__('Refund_type 1'),"2":__('Refund_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'worker_refund_entry', title: __('Worker_refund_entry'), searchList: {"0":__('Worker_refund_entry 0'),"1":__('Worker_refund_entry 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'refund_time', title: __('Refund_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
+                        {field: 'company_refund_time', title: __('Company_refund_time'), operate:false, addclass:'datetimerange', autocomplete:false},
+                        {field: 'worker_refund_time', title: __('Worker_refund_time'), operate:false, addclass:'datetimerange', autocomplete:false},
+                        //{field: 'refund_time', title: __('Refund_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false},
                         {field: 'customer_appeal', title: __('Customer_appeal'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         //{field: 'customer_qrcode', title: __('Customer_qrcode'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
@@ -48,8 +50,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 
                         {field: 'images', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'remark', title: __('Remark'), operate: false, table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'company_refund_time', title: __('Company_refund_time'), operate:false, addclass:'datetimerange', autocomplete:false},
-                        {field: 'worker_refund_time', title: __('Worker_refund_time'), operate:false, addclass:'datetimerange', autocomplete:false},
+
                         //{field: 'admin_id', title: __('Admin_id')},
                         {field: 'admin_user', title: __('Admin_user'), operate: 'LIKE'},
                         //{field: 'handle_admin_id', title: __('Handle_admin_id')},