Merge branch 'phoenix' into develop

# Conflicts:
#	config/admin.php

config/admin.php

@@ -11,7 +11,7 @@ return [
     | login page.
     |
     */
-    'name' => 'Dcat Admin',
+    'name' => '懒族后台管理系统',
 
     /*
     |--------------------------------------------------------------------------
@@ -22,7 +22,8 @@ return [
     | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
     |
     */
-    'logo' => '<img src="/vendors/dcat-admin/images/logo.png" width="35"> &nbsp;Dcat Admin',
+    // 'logo' => '<img src="/vendors/dcat-admin/images/logo.png" width="35"> &nbsp;懒族',
+    'logo' => '<img src="/vendors/dcat-admin/images/logo-head.png" width="35"> &nbsp;<span style="color:#ed7b1d;"> 懒族 </span>',
 
     /*
     |--------------------------------------------------------------------------
@@ -165,7 +166,7 @@ return [
     |--------------------------------------------------------------------------
     */
     'helpers' => [
-        'enable' => true,
+        'enable' => env('APP_ENV')=='prod'? false:true,
     ],
 
     /*
@@ -221,12 +222,12 @@ return [
     'upload' => [
 
         // Disk in `config/filesystem.php`.
-        'disk' => 'public',
+        'disk' => 'oss',
 
         // Image and file upload path under the disk above.
         'directory' => [
-            'image' => 'images',
-            'file'  => 'files',
+            'image' => 'mp_images',
+            'file'  => 'mp_files',
         ],
     ],
 
@@ -300,18 +301,10 @@ return [
     | Admin map field provider
     |--------------------------------------------------------------------------
     |
-    | Supported: "tencent", "google", "yandex", "baidu".
+    | Supported: "tencent", "google", "yandex".
     |
     */
-    'map' => [
-        'provider' => 'baidu',
-
-        'keys' => [
-            'tencent' => env('TENCENT_MAP_API_KEY'),
-            'google' => env('GOOGLE_API_KEY'),
-            'baidu' => env('BAIDU_MAP_API_KEY'),
-        ],
-    ],
+    'map_provider' => 'tencent',
 
     /*
     |--------------------------------------------------------------------------
@@ -322,19 +315,19 @@ return [
     */
     'layout' => [
         // indigo, blue, blue-light, blue-dark, green
-        'color' => 'indigo',
+        'color' => 'green',
 
+        //'body_class' => 'dark-mode',
         'body_class' => '',
 
         'sidebar_collapsed' => false,
 
-        // light, primary, dark
-        'sidebar_style' => 'light',
+        'sidebar_dark' => false,
 
         'dark_mode_switch' => false,
 
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
-        'navbar_color' => '',
+        'navbar_color' => 'bg-primary',
     ],
 
     /*