diff --git a/.gitignore b/.gitignore index 64a8884d..e3ef3960 100755 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .idea composer.lock *.log +*.css.map thinkphp vendor runtime diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php index 888eb283..2ff9d73c 100644 --- a/application/admin/command/Menu.php +++ b/application/admin/command/Menu.php @@ -180,7 +180,7 @@ class Menu extends Command } } //过滤掉其它字符 - $controllerTitle = trim(preg_replace(array('/^\/\*\*(.*)[\n\r\t]/', '/[\s]+\*\//', '/\*\s@(.*)/', '/[\s|\*]+/'), '', $classComment)); + $controllerTitle = trim(preg_replace(array('/^\/\*\*(.*)[\n\r\t]/u', '/[\s]+\*\//u', '/\*\s@(.*)/u', '/[\s|\*]+/u'), '', $classComment)); //先定入菜单的数据 $pid = 0; $name = "/admin"; diff --git a/application/admin/common.php b/application/admin/common.php index 6257f546..7c11ac1d 100644 --- a/application/admin/common.php +++ b/application/admin/common.php @@ -9,7 +9,8 @@ use think\Db; /** * 重新生成上传的参数配置 - * @return type + * @param array $params + * @return string */ function get_upload_multipart($params = []) { diff --git a/application/admin/view/common/control.html b/application/admin/view/common/control.html index b59c05c7..68d41ffd 100644 --- a/application/admin/view/common/control.html +++ b/application/admin/view/common/control.html @@ -22,7 +22,7 @@

{:__("You can't use fixed and boxed layouts together")}

{:__('Activate the boxed layout')}

{:__("Toggle the left sidebar's state (open or collapse)")}

- +

{:__('Let the sidebar mini expand on hover')}

{:__('Always show sub menu')}

{:__('Disable top menu badge without left menu')}

{:__('Toggle between slide over content and push content effects')}

diff --git a/application/admin/view/common/header.html b/application/admin/view/common/header.html index 5f26928a..f141ed82 100644 --- a/application/admin/view/common/header.html +++ b/application/admin/view/common/header.html @@ -42,6 +42,22 @@ + +
  • diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 193efb97..d318530c 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -1,8 +1,8 @@ - + {include file="common/meta" /} - +