Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/controller/Menu.php

@@ -60,7 +60,6 @@ class Menu extends BaseController
             'pid' => 0,
             'private' => '',
             'weight' => '',
-            'is_show' => AdminMenuModel::$show
         ], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.menuEdit'));

app/admin/logic/MenuLogic.php

@@ -55,11 +55,11 @@ class MenuLogic extends BaseLogic
     //获取全部菜单
     public static function All(): Json
     {
-        $list = AdminMenuModel::field('id,menu_name,menu_type,menu_img,menu_route,menu_url,status,weight,addtime')
+        $list = AdminMenuModel::field('id,menu_name,menu_type,menu_img,menu_route,menu_url,status,weight,addtime,is_private private')
             ->where('pid', 0)
             ->append(['child'])
             ->withAttr('child', function ($val, $data) {
-                return AdminMenuModel::field('id,menu_name,menu_type,menu_img,menu_route,menu_url,status,weight,addtime')
+                return AdminMenuModel::field('id,menu_name,menu_type,menu_img,menu_route,menu_url,status,weight,addtime,is_private private')
                     ->where('pid', $data['id'])
                     ->select()
                     ->toArray();
@@ -91,19 +91,15 @@ class MenuLogic extends BaseLogic
     public static function Edit(array $data = []): Json
     {
         $rs = AdminMenuModel::field('id')
-            ->where(['id' => $data['id'], 'is_show' => AdminMenuModel::$show, 'status' => AdminMenuModel::$status_normal])
+            ->where(['id' => $data['id']])
             ->findOrEmpty()
             ->isEmpty();
         if ($rs) return json_show(CommonModel::$error_param, '菜单信息不存在');
 
-        $data = array_merge($data, [
-            'is_private' => $data['private'],
-            'status' => AdminMenuModel::$status_normal,
-        ]);
+        $data = array_merge($data, ['is_private' => $data['private']]);
 
         $res = AdminMenuModel::where('id', $data['id'])->strict(false)->save($data);
 
-        //write_log('菜单{$data['menu_name']}新建成功',$this->userinfo,'order','add','0');
         return $res ? json_show(CommonModel::$success, '编辑菜单成功') : json_show(CommonModel::$error_param, '编辑菜单失败');
     }