完善功能

app/admin/controller/member/WellnessRecordController.php

@@ -286,7 +286,7 @@ class WellnessRecordController extends Curd
                 $item->wellness_record_file_json = json_decode($item->wellness_record_file_json, true);
                 if (isset($item->wellness_record_file_json['file_filename']) && isset($item->wellness_record_file_json['file_savepath'])) {
                     $itemNew['wellness_record_file_json'][] = [
-                        'url' => getenv('STORAGE_DOMAIN') . '/app/'.$item->wellness_record_file_json['file_savepath'].$item->wellness_record_file_json['file_savename'],
+                        'url' => getenv('APP_IMAGE_DOMAIN') .$item->wellness_record_file_json['file_savepath'].$item->wellness_record_file_json['file_savename'],
                         'name' => $item->wellness_record_file_json['file_filename']
                     ];
                 } else if (isset($item->wellness_record_file_json['url']) && isset($item->wellness_record_file_json['name'])) {

app/admin/controller/sys_manage/MenuController.php

@@ -197,7 +197,7 @@ class MenuController extends Curd
                 'meta' => [
                     'icon' => $item->menu_icon,
                     'title' => $item->menu_title,
-                    'type' => $item->menu_is_menu == 1 ? 'menu' : 'permission',
+                    'type' => $item->menu_is_menu == 1 ? 'menu' : 'button',
                     'status' => $item->menu_status == 1 ? true : false,
                     'sort' => $item->menu_sort,
                     'hidden' => $item->menu_is_show == 1 ? false : true,
@@ -234,7 +234,7 @@ class MenuController extends Curd
                 'meta' => [
                     'icon' => $item->menu_icon,
                     'title' => $item->menu_title,
-                    'type' => $item->menu_is_menu == 1 ? 'menu' : 'permission',
+                    'type' => $item->menu_is_menu == 1 ? 'menu' : 'button',
                     'status' => $item->menu_status == 1 ? true : false,
                     'sort' => $item->menu_sort,
                     'hidden' => $item->menu_is_show == 1 ? false : true,
@@ -261,14 +261,14 @@ class MenuController extends Curd
         }
         $user = SysUser::where('user_id', $adminId)->first();
         if (empty($user->join_user_role_id)) {
-            return json_fail('权限不足');
+            throw new BusinessException("权限不足");
         }
-        $permission = [];
-
         $role = SysRole::where('role_id', $user->join_user_role_id)->first();
         $permission = json_decode($role->role_permission,true);
         if (!empty($permission)){
             $where['menu_name'] = ['in', implode(',', $permission)];
+        }else{
+            throw new BusinessException("权限不足");
         }
 
         $format = $request->get('format', 'tree');