Merge branch 'feature/xman' into develop

application/admin/controller/orders/Dispatch.php

@@ -12,6 +12,7 @@ use think\Exception;
 use think\exception\DbException;
 use think\exception\PDOException;
 use think\exception\ValidateException;
+use think\Hook;
 
 /**
  * 派单列管理
@@ -176,7 +177,7 @@ class Dispatch extends Backend
     }
 
     /**
-     * 删除
+     * 取消派单
      *
      * @param $ids
      * @return void
@@ -213,6 +214,12 @@ class Dispatch extends Backend
                 $item->update(['status'=>OrderDispatch::STATUS_CANCEL]);
                 //回退订单状态
                 $order->update(['status'=>Order::STATUS_DISPATCHING]);
+
+                $params['order'] = $order;
+                $params['role'] = 1;
+                $params['auth'] = $this->auth;
+                $params['remark'] = '派单被取消[ID：'.$item->id.']，订单状态回退';
+                Hook::listen('order_change',$params);
             }
             Db::commit();
         } catch (PDOException|Exception $e) {

application/admin/view/orders/auditorder/edit.html

@@ -1,5 +1,81 @@
+
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
+    <table class="table">
+        <tr>
+            <td class="text-right">
+                {:__('Order_no')}
+            </td>
+            <td>
+                {$row.order_no|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Customer')}
+            </td>
+            <td>
+                {$row.customer|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Tel')}
+            </td>
+            <td>
+                {$row.tel|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Address')}
+            </td>
+            <td>
+                {$row.address|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Order_item')}
+            </td>
+            <td>
+                {$row.order_item|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Detail')}
+            </td>
+            <td>
+                {$row.detail|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Remark')}
+            </td>
+            <td>
+                {$row.remark|htmlentities}
+            </td>
+        </tr>
+
+        <tr>
+            <td class="text-right">
+                {:__('Remark')}
+            </td>
+            <td>
+                {$row.remark|htmlentities}
+            </td>
+        </tr>
+
+    </table>
+
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Order_no')}:</label>

application/config.php

@@ -294,15 +294,15 @@ return [
         //登录页默认背景图
         'login_background'      => "",
         //是否启用多级菜单导航
-        'multiplenav'           => false,
+        'multiplenav'           => true,
         //是否开启多选项卡(仅在开启多级菜单时起作用)
         'multipletab'           => true,
         //是否默认展示子菜单
-        'show_submenu'          => false,
+        'show_submenu'          => true,
         //后台皮肤,为空时表示使用skin-black-blue
         'adminskin'             => '',
         //后台是否启用面包屑
-        'breadcrumb'            => false,
+        'breadcrumb'            => true,
         //是否允许未知来源的插件压缩包
         'unknownsources'        => false,
         //插件启用禁用时是否备份对应的全局文件