diff --git a/app/controller/Admin.php b/app/controller/Admin.php index 668ed168..5ad25a62 100644 --- a/app/controller/Admin.php +++ b/app/controller/Admin.php @@ -17,9 +17,9 @@ use think\facade\Cache; class Admin extends BaseController { protected $middleware = [ - '\app\middleware\Validate', - '\app\middleware\AdminAuth' => ['except' => ['login']], - '\app\middleware\Admin' + '\app\http\middleware\Validate', + '\app\http\middleware\AdminAuth' => ['except' => ['login']], + '\app\http\middleware\Admin' ]; protected $data = ['data' => [], 'code' => 0, 'msg' => '']; @@ -33,17 +33,17 @@ class Admin extends BaseController { $this->data['config'] = $config; } - protected function success($msg, $url){ + protected function success($msg, $url = ''){ $this->data['code'] = 0; $this->data['msg'] = $msg; $this->data['url'] = $url->__toString(); return $this->data; } - protected function error($msg, $url){ + protected function error($msg, $url = ''){ $this->data['code'] = 1; $this->data['msg'] = $msg; - $this->data['url'] = $url->__toString(); + $this->data['url'] = $url ? $url->__toString() : ''; return $this->data; } } diff --git a/app/controller/Index.php b/app/controller/Index.php index c1ba1d02..b21fd7a1 100644 --- a/app/controller/Index.php +++ b/app/controller/Index.php @@ -5,7 +5,7 @@ use app\BaseController; class Index extends BaseController { - protected $middleware = ['\app\middleware\Front']; + protected $middleware = ['\app\http\middleware\Front']; /** * @title 网站首页 diff --git a/app/controller/admin/Group.php b/app/controller/admin/Group.php index 1a239c43..77acffbc 100644 --- a/app/controller/admin/Group.php +++ b/app/controller/admin/Group.php @@ -16,6 +16,17 @@ class Group extends Admin{ * @title 系统首页 */ public function index(){ - + if ($this->request->isAjax()) { + # code... + } + } + + /** + * @title 权限列表 + */ + public function access(){ + if ($this->request->isAjax()) { + # code... + } } } \ No newline at end of file diff --git a/app/controller/admin/Index.php b/app/controller/admin/Index.php index 2c5d3f37..7e045528 100644 --- a/app/controller/admin/Index.php +++ b/app/controller/admin/Index.php @@ -69,6 +69,7 @@ class Index extends Admin{ public function logout(){ Session::set('user', null); $this->data['code'] = 0; + $this->data['msg'] = "成功退出！"; return $this->data; } } diff --git a/app/controller/admin/Menu.php b/app/controller/admin/Menu.php index d6505b98..264328a6 100644 --- a/app/controller/admin/Menu.php +++ b/app/controller/admin/Menu.php @@ -19,8 +19,9 @@ class Menu extends Admin{ public function index(){ if($this->request->isAjax()){ $menu = new MenuModel(); + $map = array(); - $res = $menu->select(); + $res = $menu->where($map)->order('sort asc, id asc')->select(); $this->data['data'] = $res; return $this->data; @@ -31,14 +32,28 @@ class Menu extends Admin{ * @title 编辑菜单 */ public function edit(){ + $menu = new MenuModel(); if($this->request->isAjax()){ - $menu = new MenuModel(); + $data = $this->request->post(); - $res = $menu->select(); - - $this->data['data'] = $res; + $result = $menu->where('id', $data['id'])->save($data); + if (false !== $result) { + $this->data['code'] = 0; + $this->data['msg'] = '更新成功！'; + }else{ + $this->data['code'] = 1; + $this->data['msg'] = '更新失败！'; + } return $this->data; }else{ + $id = $this->request->param('id', 0); + + if (!$id) { + return $this->error('非法操作！'); + } + $info = $menu->where('id', $id)->find(); + + $this->data['data'] = array('info'=>$info); return $this->data; } } @@ -48,11 +63,6 @@ class Menu extends Admin{ */ public function add(){ if($this->request->isAjax()){ - $menu = new MenuModel(); - - $res = $menu->select(); - - $this->data['data'] = $res; return $this->data; }else{ $this->data['template'] = 'edit'; @@ -65,11 +75,6 @@ class Menu extends Admin{ */ public function remove(){ if($this->request->isAjax()){ - $menu = new MenuModel(); - - $res = $menu->select(); - - $this->data['data'] = $res; return $this->data; } } diff --git a/app/middleware/Admin.php b/app/http/middleware/Admin.php similarity index 83% rename from app/middleware/Admin.php rename to app/http/middleware/Admin.php index 194fa288..b53ac5ec 100644 --- a/app/middleware/Admin.php +++ b/app/http/middleware/Admin.php @@ -6,7 +6,7 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\middleware; +namespace app\http\middleware; use think\facade\View; @@ -19,6 +19,7 @@ class Admin { public function handle($request, \Closure $next) { $response = $next($request); + if (is_array($response->getData())) { $this->data = array_merge($this->data, $response->getData()); } else { @@ -52,10 +53,10 @@ class Admin { $template = (isset($this->data['template']) && $this->data['template']) ? $this->data['template'] : $template; - return View::config($config) - ->assign('sent_version', sent_version) - ->assign('config', (isset($this->data['config']) ? $this->data['config'] : [])) - ->assign((isset($this->data['data']) ? $this->data['data'] : [])) - ->fetch($template); + View::config($config); + View::assign('sent_version', sent_version); + View::assign('config', (isset($this->data['config']) ? $this->data['config'] : [])); + View::assign((isset($this->data['data']) ? $this->data['data'] : [])); + return View::fetch($template); } } \ No newline at end of file diff --git a/app/middleware/AdminAuth.php b/app/http/middleware/AdminAuth.php similarity index 98% rename from app/middleware/AdminAuth.php rename to app/http/middleware/AdminAuth.php index 15b4c69b..20b0d920 100644 --- a/app/middleware/AdminAuth.php +++ b/app/http/middleware/AdminAuth.php @@ -6,7 +6,7 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\middleware; +namespace app\http\middleware; use think\facade\Cache; use think\facade\Session; diff --git a/app/middleware/Front.php b/app/http/middleware/Front.php similarity index 79% rename from app/middleware/Front.php rename to app/http/middleware/Front.php index 18d2f2c5..24e91003 100644 --- a/app/middleware/Front.php +++ b/app/http/middleware/Front.php @@ -6,7 +6,7 @@ // +---------------------------------------------------------------------- // | Author: molong // +---------------------------------------------------------------------- -namespace app\middleware; +namespace app\http\middleware; use think\facade\View; @@ -36,15 +36,17 @@ class Front { $config = array( 'tpl_replace_string' => array( '__static__' => '/static', - '__img__' => '/static/admin/images', - '__css__' => '/static/admin/css', - '__js__' => '/static/admin/js', - '__public__' => '/static/admin', + '__img__' => '/static/front/images', + '__css__' => '/static/front/css', + '__js__' => '/static/front/js', + '__public__' => '/static/front', ) ); if (is_string($this->data)) { $this->data = array('data' => $this->data); } - return View::config($config)->assign($this->data)->fetch($template); + View::config($config); + View::assign($this->data); + return View::engine('Think')->fetch($template); } } \ No newline at end of file diff --git a/app/middleware/Validate.php b/app/http/middleware/Validate.php similarity index 94% rename from app/middleware/Validate.php rename to app/http/middleware/Validate.php index 6f93df1e..9e47da1f 100644 --- a/app/middleware/Validate.php +++ b/app/http/middleware/Validate.php @@ -7,7 +7,7 @@ // | Author: molong // +---------------------------------------------------------------------- -namespace app\middleware; +namespace app\http\middleware; use think\Response; class Validate { @@ -24,7 +24,7 @@ class Validate { $controller = strtr(strtolower($request->controller()), '.', '\\'); //获取操作名,用于验证场景scene $scene = $request->action(); - $validate = "app\\validate\\" . $controller; + $validate = "app\\http\\validate\\" . $controller; //仅当验证器存在时 进行校验 if (class_exists($validate) && $request->isPost()) { $v = new $validate; diff --git a/app/validate/admin/Index.php b/app/http/validate/admin/Index.php similarity index 95% rename from app/validate/admin/Index.php rename to app/http/validate/admin/Index.php index 46b46718..4f178227 100644 --- a/app/validate/admin/Index.php +++ b/app/http/validate/admin/Index.php @@ -7,7 +7,7 @@ // | Author: molong // +---------------------------------------------------------------------- -namespace app\validate\admin; +namespace app\http\validate\admin; use think\Validate; diff --git a/config/middleware.php b/config/middleware.php new file mode 100644 index 00000000..ce508376 --- /dev/null +++ b/config/middleware.php @@ -0,0 +1,8 @@ + [], + //优先级设置，此数组中的中间件会按照数组中的顺序优先执行 + 'priority' => [], +]; diff --git a/config/session.php b/config/session.php index 7abf056d..c1ef6e16 100644 --- a/config/session.php +++ b/config/session.php @@ -5,13 +5,15 @@ return [ // session name - 'name' => '', + 'name' => 'PHPSESSID', // SESSION_ID的提交变量,解决flash上传跨域 'var_session_id' => '', - // 驱动方式 支持file redis memcache memcached + // 驱动方式 支持file cache 'type' => 'file', + // 存储连接标识 当type使用cache的时候有效 + 'store' => null, // 过期时间 - 'expire' => 0, + 'expire' => 1440, // 前缀 'prefix' => '', ]; diff --git a/config/template.php b/config/view.php similarity index 63% rename from config/template.php rename to config/view.php index 51a42117..469eb64d 100644 --- a/config/template.php +++ b/config/view.php @@ -5,23 +5,23 @@ return [ // 模板引擎类型使用Think - 'type' => 'Think', + 'type' => 'Think', // 默认模板渲染规则 1 解析为小写+下划线 2 全部转换小写 3 保持操作方法 - 'auto_rule' => 1, - // 模板基础路径 - 'view_base' => '', + 'auto_rule' => 1, + // 模板目录名 + 'view_dir_name' => 'view', // 模板路径 - 'view_path' => '', + 'view_path' => '', // 模板后缀 - 'view_suffix' => 'html', + 'view_suffix' => 'html', // 模板文件名分隔符 - 'view_depr' => DIRECTORY_SEPARATOR, + 'view_depr' => DIRECTORY_SEPARATOR, // 模板引擎普通标签开始标记 - 'tpl_begin' => '{', + 'tpl_begin' => '{', // 模板引擎普通标签结束标记 - 'tpl_end' => '}', + 'tpl_end' => '}', // 标签库标签开始标记 - 'taglib_begin' => '{', + 'taglib_begin' => '{', // 标签库标签结束标记 - 'taglib_end' => '}', + 'taglib_end' => '}', ]; diff --git a/public/favicon.ico b/public/favicon.ico index e71815a6..08e45002 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/static/admin/js/app.js b/public/static/admin/js/app.js index e69de29b..5d7a096f 100644 --- a/public/static/admin/js/app.js +++ b/public/static/admin/js/app.js @@ -0,0 +1,14 @@ +$(function(){ + +}) + +function submitHandler(index, layero){ + var url = ''; + var data = {}; + $.each($('form').serializeArray(), function(i, field) { + data[field.name] = field.value; + }); + $.operate.submit(url, 'post', 'json', data, function(){ + layer.close(index); + }); +} \ No newline at end of file diff --git a/public/static/admin/js/index.js b/public/static/admin/js/index.js index 0937231c..d56e7776 100644 --- a/public/static/admin/js/index.js +++ b/public/static/admin/js/index.js @@ -220,7 +220,9 @@ $(function () { $.page.createMenuItem($(this).attr('href'), $(this).html()); }else if(type == 'open'){ $.model.open($(this).text(), $(this).attr('href')); - }else if(type == 'msg'){} + }else if(type == 'msg'){ + $.operate.get($(this).attr('href')) + } }) $('span[data-action=scroll]').click(function(e){ @@ -249,4 +251,8 @@ $(function () { } }) } + + if (self != top) { + parent.location.reload(); + } }) \ No newline at end of file diff --git a/public/static/common/js/core.js b/public/static/common/js/core.js index 488aae87..607b0720 100644 --- a/public/static/common/js/core.js +++ b/public/static/common/js/core.js @@ -566,7 +566,7 @@ }, // 成功提示 alertSuccess: function(content) { - $.model.alert(content, modal_status.SUCCESS); + layer.msg(content); }, // 警告提示 alertWarning: function(content) { @@ -1484,6 +1484,20 @@ $(function() { } expandFlag = expandFlag ? false: true; }) + + $('button.ajax-post,.ajax-get').click(function(e){ + e.preventDefault(); + var type = 'post',url = ''; + if ($(this).hasClass('ajax-get')) { + type = 'get' + } + var data = {}; + $.each($($(this).attr('target-form')).serializeArray(), function(i, field) { + data[field.name] = field.value; + }); + $.operate.submit(url, type, 'json', data); + }); + // 按下ESC按钮关闭弹层 $('body', document).on('keyup', function(e) { if (e.which === 27) { @@ -1503,7 +1517,7 @@ table_type = { /** 消息状态码 */ web_status = { SUCCESS: 0, - FAIL: 500, + FAIL: 1, WARNING: 301 }; @@ -1544,10 +1558,10 @@ $.ajaxSetup({ } } }); -layer.config({ - extend: 'moon/style.css', - skin: 'layer-ext-moon' -}); +// layer.config({ +// extend: 'moon/style.css', +// skin: 'layer-ext-moon' +// }); /** * Get a prestored setting diff --git a/public/static/plugins/layer/theme/moon/default.png b/public/static/plugins/layer/theme/moon/default.png deleted file mode 100644 index 77dfaf30..00000000 Binary files a/public/static/plugins/layer/theme/moon/default.png and /dev/null differ diff --git a/public/static/plugins/layer/theme/moon/style.css b/public/static/plugins/layer/theme/moon/style.css deleted file mode 100644 index 4bb62e46..00000000 --- a/public/static/plugins/layer/theme/moon/style.css +++ /dev/null @@ -1,138 +0,0 @@ -/** - * layer皮肤 - * Copyright (c) 2019 ruoyi - */ -html #layui_layer_skinmoonstylecss { - display: none; - position: absolute; - width: 1989px; -} - -body .layer-ext-moon[type="dialog"] { - min-width: 320px; -} -body .layer-ext-moon-msg[type="dialog"]{min-width:200px;} -body .layer-ext-moon .layui-layer-title { - background: #F8F8F8; - color: #333; - font-size: 14px; - height: 42px; - line-height: 42px; - border: none; -} - -body .layer-ext-moon .layui-layer-content .layui-layer-ico { - height: 32px; - width: 32px; - top:18.5px; -} -body .layer-ext-moon .layui-layer-ico0 { - background: url(default.png) no-repeat -96px 0; - ; -} -body .layer-ext-moon .layui-layer-ico1 { - background: url(default.png) no-repeat -224px 0; - ; -} -body .layer-ext-moon .layui-layer-ico2 { - background: url(default.png) no-repeat -192px 0; -} -body .layer-ext-moon .layui-layer-ico3 { - background: url(default.png) no-repeat -160px 0; -} -body .layer-ext-moon .layui-layer-ico4 { - background: url(default.png) no-repeat -320px 0; -} -body .layer-ext-moon .layui-layer-ico5 { - background: url(default.png) no-repeat -288px 0; -} -body .layer-ext-moon .layui-layer-ico6 { - background: url(default.png) -256px 0; -} -body .layer-ext-moon .layui-layer-ico7 { - background: url(default.png) no-repeat -128px 0; -} -body .layer-ext-moon .layui-layer-setwin { - top: 15px; - right: 15px; -} -body .layer-ext-moon .layui-layer-setwin a { - width: 16px; - height: 16px; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-min cite:hover { - background-color: #56abe4; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-max { - background: url(default.png) no-repeat -80px 0; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-max:hover { - background: url(default.png) no-repeat -64px 0; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin { - background: url(default.png) no-repeat -32px 0; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-maxmin:hover { - background: url(default.png) no-repeat -16px 0; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-close1,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2 { - background: url(default.png) 0 0; -} -body .layer-ext-moon .layui-layer-setwin .layui-layer-close1:hover,body .layer-ext-moon .layui-layer-setwin .layui-layer-close2:hover { - background: url(default.png) -48px 0; -} -body .layer-ext-moon .layui-layer-padding{padding-top: 24px;} -body .layer-ext-moon .layui-layer-btn { - text-align: right; - padding: 10px 15px 12px; - background: #f0f4f7; - border-top: 1px #c7c7c7 solid; -} -body .layer-ext-moon .layui-layer-btn a { - font-size: 12px; - font-weight: normal; - margin: 0 3px; - margin-right: 7px; - margin-left: 7px; - padding: 0 15px; - color: #fff; - border: 1px solid #0064b6; - background: #0071ce; - border-radius: 3px; - display: inline-block; - height: 30px; - line-height: 30px; - text-align: center; - vertical-align: middle; - background-repeat: no-repeat; - text-decoration: none; - outline: none; - -moz-box-sizing: content-box; - -webkit-box-sizing: content-box; - box-sizing: content-box; -} -body .layer-ext-moon .layui-layer-btn .layui-layer-btn0 { - background: #0071ce; -} -body .layer-ext-moon .layui-layer-btn .layui-layer-btn1 { - background: #fff; - color: #404a58; - border: 1px solid #c0c4cd; - border-radius: 3px; -} -body .layer-ext-moon .layui-layer-btn .layui-layer-btn2 { - background: #f60; - color: #fff; - border: 1px solid #f60; - border-radius: 3px; -} -body .layer-ext-moon .layui-layer-btn .layui-layer-btn3 { - background: #f00; - color: #fff; - border: 1px solid #f00; - border-radius: 3px; -} - -body .layer-ext-moon .layui-layer-title span.layui-layer-tabnow{ - height:47px; -} diff --git a/view/README.md b/view/README.md deleted file mode 100644 index 360eb246..00000000 --- a/view/README.md +++ /dev/null @@ -1 +0,0 @@ -如果不使用模板，可以删除该目录 \ No newline at end of file diff --git a/view/admin/ad/index.html b/view/admin/ad/index.html index c100b982..fd5dc5a2 100644 --- a/view/admin/ad/index.html +++ b/view/admin/ad/index.html @@ -1,78 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 新 增 -
-
- - - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - - {/volist} - -
ID名称标识创建时间更新时间操作
{$item['id']}{$item['title']}{$item['name']}{$item['create_time']|date='Y-m-d H:i',###}{$item['update_time']|date='Y-m-d H:i',###} - 广告列表 - 编辑 - 删除 -
- {$page|raw} + + + +
+
{/block} {block name="script"} - - + + + + - if(url != undefined && url != ''){ - window.location.href = url + '/ids/' + param; - } + {/block} \ No newline at end of file diff --git a/view/admin/addons/hooks.html b/view/admin/addons/hooks.html index adf60113..fd5dc5a2 100644 --- a/view/admin/addons/hooks.html +++ b/view/admin/addons/hooks.html @@ -1,75 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 新 增 -
-
- - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - {/volist} - -
ID名称描述类型操作
{$item['id']|default=0}{$item['name']}{$item['description']}{$item['type_text']} - 编辑 - 删除 -
- {$page|raw} + + + +
+
{/block} {block name="script"} - - + + + + - if(url != undefined && url != ''){ - window.location.href = url + '/ids/' + param; - } + {/block} \ No newline at end of file diff --git a/view/admin/addons/index.html b/view/admin/addons/index.html index 606367de..fd5dc5a2 100644 --- a/view/admin/addons/index.html +++ b/view/admin/addons/index.html @@ -1,91 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 更 新 - 新 增 -
-
- - - - - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - - - - {/volist} - -
ID名称标识描述状态作者版本操作
{$item['id']|default=0}{$item['title']}{$item['name']}{$item['description']}{$item['status_text']}{$item['author']}{$item['version']} - {if !$item['isinstall']} - 安装 - {else/} - 卸载 - {if $item['status']} - 禁用 - {else/} - 启用 - {/if} - 设置 - {/if} -
- {$page|raw} + + + +
+
{/block} {block name="script"} - - + + + + - if(url != undefined && url != ''){ - window.location.href = url + '/ids/' + param; - } + {/block} \ No newline at end of file diff --git a/view/admin/base.html b/view/admin/base.html index 0d50320c..3ec7eba1 100644 --- a/view/admin/base.html +++ b/view/admin/base.html @@ -19,6 +19,7 @@ folder instead of downloading all of them to reduce the load. --> + @@ -56,10 +57,10 @@ folder instead of downloading all of them to reduce the load. -->
- - + + - + {block name="script"}{/block} \ No newline at end of file diff --git a/view/admin/form/index.html b/view/admin/form/index.html index 3705fa2b..fd5dc5a2 100644 --- a/view/admin/form/index.html +++ b/view/admin/form/index.html @@ -1,67 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 新 增 -
-
- - - - - - - - - - - - - {notempty name="list"} - {volist name="list" id="item"} - - - - - - - - - - {/volist} - {else/} - - {/notempty} - -
ID名称排序时间操作
- - {$item['id']}{$item['name']} - {$item['title']} - - {$item.create_time|time_format} - - {if $item['status']} - {$item['status_text']} - {else/} - {$item['status_text']} - {/if} - - 字段 - {$item['status']|show_status_op} - 编辑 - 删除 - 数据 -
aOh! 暂时还没有创建模型!
- {$page|raw} + + + +
+
+{/block} +{block name="script"} + + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/group/access.html b/view/admin/group/access.html index 38e2e773..fd5dc5a2 100644 --- a/view/admin/group/access.html +++ b/view/admin/group/access.html @@ -4,72 +4,84 @@

{$meta_title|default='新功能'}

- - - 添加节点 - - - - 更新节点 -
-
-
    - {volist name=":config('user_group_type')" id="item"} -
  • - {$item} -
    • - {/volist} -
-
-
- {if condition="empty($list)"} -

暂无数据！

- {else/} -
- - - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - - {/volist} - -
ID组名标识分组状态操作
{$item['id']}{$item['title']}{$item['name']}{$item['group']} - {if condition="$item['status'] eq '0'"} - 禁用 - {elseif condition="$item['status'] eq '1'"/} - 启用 - {/if} - - 编辑 - 删除 -
- {$page|raw} -
- {/if} -
-
+ + + +
+
+{/block} +{block name="script"} + + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/group/index.html b/view/admin/group/index.html index 5498c6cc..fd5dc5a2 100644 --- a/view/admin/group/index.html +++ b/view/admin/group/index.html @@ -1,81 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 添加用户组
-
-
    - {volist name=":config('USER_GROUP_TYPE')" id="item"} -
  • - {$item} -
    • - {/volist} -
-
-
- {if condition="empty($list)"} -

暂无数据！

- {else/} -
- - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - {/volist} - -
ID组名描述状态操作
{$item['id']}{$item['title']}{$item['description']} - {if condition="$item['status'] eq '0'"} - 禁用 - {elseif condition="$item['status'] eq '1'"/} - 启用 - {/if} - - 编辑 - 授权 - 删除 -
- {$page|raw} -
- {/if} -
-
+ + + +
+
{/block} {block name="script"} - + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/index/index.html b/view/admin/index/index.html index 6823daaf..bfd8ac65 100644 --- a/view/admin/index/index.html +++ b/view/admin/index/index.html @@ -13,7 +13,7 @@ - + @@ -87,7 +87,7 @@ folder instead of downloading all of them to reduce the load. --> 个人资料
- 退出 + 退出
@@ -169,7 +169,7 @@ folder instead of downloading all of them to reduce the load. -->
- 首页 + 系统首页
diff --git a/view/admin/link/index.html b/view/admin/link/index.html index 681dd6ce..fd5dc5a2 100644 --- a/view/admin/link/index.html +++ b/view/admin/link/index.html @@ -1,47 +1,87 @@ {extend name="admin/base"/} -{block name="style"} - -{/block} {block name="body"}

{$meta_title|default='新功能'}

- 新 增 -
-
- - - - - - - - - - - - - {volist name="list" id="item"} - - - - - - - - - {/volist} - -
ID名称排序时间操作
{$item['id']}{$item['title']}{$item['sort']}{$item['update_time']|date='Y-m-d',###} - 编辑 - 删除 -
- {$page|raw} + + + +
+
+{/block} +{block name="script"} + + + + + + + + {/block} \ No newline at end of file diff --git a/view/admin/menu/edit.html b/view/admin/menu/edit.html index 21925fa2..d046b67b 100644 --- a/view/admin/menu/edit.html +++ b/view/admin/menu/edit.html @@ -8,51 +8,51 @@
- -
+ +
（用于后台显示的配置标题）
- -
+ +
（用于显示在菜单左侧，不填则不显示）
- -
+ +
（用于分组显示的顺序）
- -
+ +
（U函数解析的URL或者外链）
- -
+ +
（所属的上级菜单）
- -
+ +
（用于左侧分组二级菜单）
- -
+ +
- -
+ +
（菜单详细说明）
-
-
- + +
diff --git a/view/admin/menu/index.html b/view/admin/menu/index.html index 1c037538..f5d279ec 100644 --- a/view/admin/menu/index.html +++ b/view/admin/menu/index.html @@ -42,9 +42,9 @@ $(function(){ expandAll: false, expandFirst: false, url: "/admin/menu/index", - createUrl: "/admin/menu/add/{id}", - updateUrl: "/admin/menu/edit/{id}", - removeUrl: "/admin/menu/remove/{id}", + createUrl: "/admin/menu/add?id={id}", + updateUrl: "/admin/menu/edit?id={id}", + removeUrl: "/admin/menu/remove?id={id}", modalName: "菜单", columns:[ {field: 'selectItem', radio: true}, @@ -78,9 +78,9 @@ $(function(){ align: "left", formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); - actions.push('新增 '); - actions.push('删除'); + actions.push('编辑 '); + actions.push('新增 '); + actions.push('删除'); return actions.join(''); } }