diff --git a/application/admin/view/auth/form.html b/application/admin/view/auth/form.html index 3f1759db6..58387ddc2 100644 --- a/application/admin/view/auth/form.html +++ b/application/admin/view/auth/form.html @@ -1,20 +1,28 @@
-
+ +
+
- -
+
+
+
- -
+
+
+
+
{notempty name='vo.id'}{/notempty} +
diff --git a/application/admin/view/menu/form.html b/application/admin/view/menu/form.html index 53d66e9a3..fd0938fb5 100644 --- a/application/admin/view/menu/form.html +++ b/application/admin/view/menu/form.html @@ -14,7 +14,7 @@ -

必选,请选择上级菜单或顶级菜单(目前最多支持三级菜单)

+

必选,请选择上级菜单或顶级菜单(目前最多支持三级菜单)

@@ -22,7 +22,7 @@
-

必填,请填写菜单名称(如:系统管理),建议字符不要太长,一般4-6个汉字

+

必填,请填写菜单名称(如:系统管理),建议字符不要太长,一般4-6个汉字

@@ -31,7 +31,7 @@

- 必填,请填写系统节点(如:admin/user/index),节点加入权限管理时菜单才会自动隐藏,非规则内的不会隐藏; + 必填,请填写系统节点(如:admin/user/index),节点加入权限管理时菜单才会自动隐藏,非规则内的不会隐藏;
正常情况下,在输入的时候会有自动提示。如果是上级菜单时,请填写"#"符号,不要填写地址或节点地址

@@ -41,7 +41,7 @@
-

可选,设置菜单链接的GET访问参数(如:name=1&age=3)

+

可选,设置菜单链接的GET访问参数(如:name=1&age=3)

@@ -55,16 +55,16 @@ -

可选,设置菜单选项前置图标,目前只支持 Font Awesome 5.2.0 字体图标

+

可选,设置菜单选项前置图标,目前只支持 Font Awesome 5.2.0 字体图标

+ {notempty name='vo.id'}{/notempty}
- {notempty name='vo.id'}{/notempty}
diff --git a/application/admin/view/menu/index.html b/application/admin/view/menu/index.html index 0350a48f0..e30a24ad0 100644 --- a/application/admin/view/menu/index.html +++ b/application/admin/view/menu/index.html @@ -2,12 +2,12 @@ {block name="button"} -{if auth("admin/menu/add")} +{if auth("add")} {/if} -{if auth("admin/menu/remove")} - +{if auth("remove")} + {/if} {/block} @@ -47,7 +47,7 @@ {eq name='vo.status' value='0'}已禁用{else}使用中{/eq} - {if auth("admin/menu/add")} + {if auth("add")} | 添 加 @@ -56,18 +56,18 @@ {/if} - {if auth("admin/menu/edit")} - 编 辑 + {if auth("edit")} + 编 辑 {/if} - {if $vo.status eq 1 and auth("admin/menu/forbid")} - 禁 用 - {elseif auth("admin/menu/resume")} - 启 用 + {if $vo.status eq 1 and auth("forbid")} + 禁 用 + {elseif auth("resume")} + 启 用 {/if} - {if auth("admin/menu/remove")} - 删 除 + {if auth("remove")} + 删 除 {/if} diff --git a/application/admin/view/oplog/index.html b/application/admin/view/oplog/index.html index 39e809c90..3847c0993 100644 --- a/application/admin/view/oplog/index.html +++ b/application/admin/view/oplog/index.html @@ -2,12 +2,12 @@ {block name="button"} -{if auth("admin/oplog/clear")} +{if auth("clear")} {/if} -{if auth("admin/oplog/remove")} - +{if auth("remove")} + {/if} {/block} @@ -51,8 +51,8 @@ 日期:{$vo.create_at|format_datetime|str_replace=' ','
时间:',###|raw} - {if auth("admin/oplog/remove")} - 删 除 + {if auth("remove")} + 删 除 {/if} diff --git a/application/admin/view/user/form.html b/application/admin/view/user/form.html index 6c866f3e3..c769683d1 100644 --- a/application/admin/view/user/form.html +++ b/application/admin/view/user/form.html @@ -1,39 +1,50 @@ -
+
+
- -
+
+ +

用户账号创建后,不允许再次修改。

+
- -
+
+ +

可选,用户联系手机号码,需要填写正确的格式

+
- -
+
+ +

可选,用户联系电子邮箱,需要填写正确的格式

+ {notempty name='authorizes'} -
- -
+ +
+ 访问授权 + Authorization +
{if isset($vo.username) and $vo.username eq 'admin'} - 超级用户不需要配置权限 + 超级用户不需要配置权限 + {elseif empty($authorizes)} + 未配置权限 {else} {foreach $authorizes as $authorize} -
{/notempty} +
- -
+
+
+
+ {notempty name='vo.id'}{/notempty} +
- {notempty name='vo.id'}{/notempty}
- + diff --git a/application/admin/view/user/index.html b/application/admin/view/user/index.html index 2447a9131..e3afc75de 100644 --- a/application/admin/view/user/index.html +++ b/application/admin/view/user/index.html @@ -2,12 +2,12 @@ {block name="button"} -{if auth("admin/user/add")} +{if auth("add")} {/if} -{if auth("admin/user/remove")} - +{if auth("remove")} + {/if} {/block} @@ -46,22 +46,22 @@ {if $vo.login_num>0}{$vo.login_at|format_datetime}{else} - {/if} - {if auth("admin/user/pass")} + {if auth("pass")} 密 码 {/if} - {if auth("admin/user/edit")} + {if auth("edit")} 编 辑 {/if} - {if $vo.status eq 1 and auth("admin/user/forbid")} - 禁 用 - {elseif $vo.status eq 0 and auth("admin/user/resume")} - 启 用 + {if $vo.status eq 1 and auth("forbid")} + 禁 用 + {elseif $vo.status eq 0 and auth("resume")} + 启 用 {/if} - {if auth("admin/user/remove")} - 删 除 + {if auth("remove")} + 删 除 {/if} diff --git a/application/admin/view/user/pass.html b/application/admin/view/user/pass.html index 507263f37..08f89db14 100644 --- a/application/admin/view/user/pass.html +++ b/application/admin/view/user/pass.html @@ -1,51 +1,55 @@
-
+
- -
- +
+ +

用户账号创建后,不允许再次修改。

- -
+
+ +

请输入旧密码来验证修改权限,旧密码不限制格式。

- -
+
+ +

密码必需包含大小写字母、数字、符号的任意两者组合。

- -
+
+ +

密码必需包含大小写字母、数字、符号的任意两者组合。

+ {notempty name='vo.id'}{/notempty}
- {notempty name='vo.id'}{/notempty}
diff --git a/vendor/autoload.php b/vendor/autoload.php index 030c87087..cacccf386 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f::getLoader(); +return ComposerAutoloaderInit3d67c96a2b8de036c09432e1ae9a5210::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index df00aca4c..617d79a56 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f +class ComposerAutoloaderInit3d67c96a2b8de036c09432e1ae9a5210 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit3d67c96a2b8de036c09432e1ae9a5210', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit3d67c96a2b8de036c09432e1ae9a5210', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit51aa80bd984c4321321fc668067c748f::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInit51aa80bd984c4321321fc668067c748f $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit51aa80bd984c4321321fc668067c748f::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire51aa80bd984c4321321fc668067c748f($fileIdentifier, $file); + composerRequire3d67c96a2b8de036c09432e1ae9a5210($fileIdentifier, $file); } return $loader; } } -function composerRequire51aa80bd984c4321321fc668067c748f($fileIdentifier, $file) +function composerRequire3d67c96a2b8de036c09432e1ae9a5210($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 5e3ac04f4..3a66a5887 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit51aa80bd984c4321321fc668067c748f +class ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210 { public static $files = array ( '841780ea2e1d6545ea3a253239d59c05' => __DIR__ . '/..' . '/qiniu/php-sdk/src/Qiniu/functions.php', @@ -314,9 +314,9 @@ class ComposerStaticInit51aa80bd984c4321321fc668067c748f public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit51aa80bd984c4321321fc668067c748f::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit51aa80bd984c4321321fc668067c748f::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit51aa80bd984c4321321fc668067c748f::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit3d67c96a2b8de036c09432e1ae9a5210::$classMap; }, null, ClassLoader::class); }