diff --git a/addons/address/bootstrap.js b/addons/address/bootstrap.js
index 9d832ac..d87e3f8 100644
--- a/addons/address/bootstrap.js
+++ b/addons/address/bootstrap.js
@@ -1,7 +1,5 @@
 require([], function () {
     //绑定data-toggle=addresspicker属性点击事件
-    console.log('111');
-
     $(document).on('click', "[data-toggle='addresspicker']", function () {
         var that = this;
         var callback = $(that).data('callback');
diff --git a/application/admin/controller/orders/Auditorder.php b/application/admin/controller/orders/Auditorder.php
index 31d9eec..c9e8b66 100644
--- a/application/admin/controller/orders/Auditorder.php
+++ b/application/admin/controller/orders/Auditorder.php
@@ -108,8 +108,9 @@ class Auditorder extends Backend
             $this->error(__('You have no permission'));
         }
         if (false === $this->request->isPost()) {
+            $order = Order::where('id',$ids)->find();
             $this->view->assign('row', $row);
-            $this->view->assign('worker',Worker::where('status',$order->worker_id)->find());
+            $this->view->assign('worker',Worker::where('id',$order->worker_id)->find());
             return $this->view->fetch();
         }
         $params = $this->request->post('row/a');
diff --git a/application/admin/controller/orders/Configorder.php b/application/admin/controller/orders/Configorder.php
index 235e1a1..2f96d10 100644
--- a/application/admin/controller/orders/Configorder.php
+++ b/application/admin/controller/orders/Configorder.php
@@ -136,8 +136,8 @@ class Configorder extends Backend
                 'amount_images'     =>  $params['amount_images'],
                 'material_cost'     =>  $params['material_cost'],
                 'cost_rate'         =>  $params['cost_rate'],
-                'cost_remark'       =>  $params['cost_remark'],
-                'material_images'            =>  $params['material_images'],
+                'cost_remark'       =>  $params['cost_remark'] ?? '',
+                'material_images'            =>  $params['material_images'] ?? '',
             ];
 
             $last_amount = bcadd($params['online_amount_last'],$params['offline_amount'],2);
diff --git a/application/admin/view/orders/auditorder/edit.html b/application/admin/view/orders/auditorder/edit.html
index 6e261d9..b2637b0 100644
--- a/application/admin/view/orders/auditorder/edit.html
+++ b/application/admin/view/orders/auditorder/edit.html
@@ -126,10 +126,18 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">师傅名称:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input  readonly  class="form-control" type="text" value="{$worker.name|htmlentities}">
+        </div>
+    </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input  readonly  class="form-control" step="0.01" type="number" value="{$row.cost_rate|htmlentities}">
+            <input  readonly  class="form-control" step="0.01" type="number" value="{$worker.rate|htmlentities}">
         </div>
     </div>
 
diff --git a/application/admin/view/orders/configorder/edit.html b/application/admin/view/orders/configorder/edit.html
index 20eef6b..092c19f 100644
--- a/application/admin/view/orders/configorder/edit.html
+++ b/application/admin/view/orders/configorder/edit.html
@@ -92,12 +92,27 @@
 
 
     <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-cost_rate" data-rule="required" name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$rate|htmlentities}">
+            <input  readonly  min="0" max="100" step="1" class="form-control" value="{$worker->name}" />
         </div>
     </div>
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input  readonly name="row[cost_rate]" type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}" />
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('分成备注')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input  readonly type="text" class="form-control" value="{$worker.rate_remark}">
+        </div>
+    </div>
+
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Cost')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -105,16 +120,6 @@
         </div>
     </div>
 
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('分成备注')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-cost_remark" data-rule="required" name="row[cost_remark]" type="text" class="form-control" value="{$row.cost_remark}">
-        </div>
-    </div>
-
-
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('材料成本')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -184,11 +189,17 @@
         </div>
     </div>
 
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">师傅名称:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input  readonly  min="0" max="100" step="1" class="form-control" value="{$worker->name}" />
+        </div>
+    </div>
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('师傅提点(%)')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input  name="row[cost_rate]" readonly type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}">
+            <input  name="row[cost_rate]" readonly type="number" min="0" max="100" step="1" class="form-control" value="{$worker.rate|htmlentities}" />
         </div>
     </div>
 
diff --git a/public/assets/js/addons.js b/public/assets/js/addons.js
index 844ff8c..6299f6b 100755
--- a/public/assets/js/addons.js
+++ b/public/assets/js/addons.js
@@ -1,7 +1,6 @@
 define([], function () {
     require([], function () {
     //绑定data-toggle=addresspicker属性点击事件
-    console.log('111');
 
     $(document).on('click', "[data-toggle='addresspicker']", function () {
         var that = this;