From 13942c36fa35f869f7f295434a0c36fb23488405 Mon Sep 17 00:00:00 2001 From: Karson Date: Mon, 15 May 2017 00:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dnice-validator=E5=9C=A8?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=90=8E=E5=8F=B0=E7=A9=BA=E7=99=BD=E7=9A=84?= =?UTF-8?q?BUG=20=E5=B0=86AdminLTE=E5=92=8CEcharts=E4=BB=8EBower=E4=B8=AD?= =?UTF-8?q?=E7=A7=BB=E9=99=A4,=E6=9E=81=E5=A4=A7=E7=BC=A9=E5=87=8F?= =?UTF-8?q?=E6=89=A9=E5=B1=95=E8=B5=84=E6=BA=90=E5=8C=85=E7=9A=84=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=20=E6=96=B0=E5=A2=9E=E5=89=8D=E5=8F=B0Ajax=E7=9A=84?= =?UTF-8?q?=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E7=AC=AC=E4=B8=89=E6=96=B9=E6=89=A9?= =?UTF-8?q?=E5=B1=95=E5=8C=85=20=E5=9B=BA=E5=AE=9AJS=E4=B8=AD=E7=AC=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=9A=84=E8=AF=AD=E8=A8=80=E7=9A=84=E6=A0=87?= =?UTF-8?q?=E8=AF=86,=E5=A6=82=E6=9E=9C=E9=9C=80=E8=A6=81=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E8=AF=AD=E8=A8=80,JS=E4=B8=AD=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E6=89=8B=E5=8A=A8=E4=BF=AE=E6=94=B9=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E6=B3=A8=E5=86=8C=E7=99=BB=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=94=99=E8=AF=AF=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=9C=A8=E6=9E=81?= =?UTF-8?q?=E7=AB=AF=E6=83=85=E5=86=B5=E4=B8=8B=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + application/admin/command/Menu.php | 2 +- application/admin/common.php | 3 +- application/admin/view/common/control.html | 2 +- application/admin/view/common/header.html | 16 + application/admin/view/index/index.html | 6 +- application/common/controller/Backend.php | 3 +- application/index/controller/Ajax.php | 119 + application/index/controller/Index.php | 6 + application/index/controller/User.php | 4 +- bower.json | 13 +- .../client/uc_client/data/cache/apps.php | 2 +- public/assets/css/backend-func.css | 22 + public/assets/css/backend.min.css | 2 +- public/assets/css/dropzone.css | 388 --- public/assets/css/frontend-func.css | 451 +++ .../assets/js/backend/general/attachment.js | 3 - public/assets/js/backend/index.js | 70 +- public/assets/js/bootstrap-checkbox.js | 112 - public/assets/js/bootstrap-radio.js | 144 - public/assets/js/bootstrap-switch.js | 251 -- .../js/bootstrap-table-advancedsearch.js | 10 +- .../assets/js/bootstrap-table-commonsearch.js | 14 +- public/assets/js/echarts.min.js | 35 + public/assets/js/jquery.jcrop.min.js | 6 - public/assets/js/require-backend.js | 14 +- public/assets/js/require-backend.min.js | 2413 +---------------- public/assets/js/require-frontend.js | 13 +- public/assets/js/require-frontend.min.js | 13 +- public/assets/js/require-table.js | 5 +- public/assets/less/backend-func.less | 22 + 31 files changed, 864 insertions(+), 3301 deletions(-) create mode 100644 application/index/controller/Ajax.php delete mode 100644 public/assets/css/dropzone.css delete mode 100644 public/assets/js/bootstrap-checkbox.js delete mode 100644 public/assets/js/bootstrap-radio.js delete mode 100644 public/assets/js/bootstrap-switch.js create mode 100644 public/assets/js/echarts.min.js delete mode 100755 public/assets/js/jquery.jcrop.min.js 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" /} - +