From 0147f95194a73c870e8cbadce9d6eb748b17210a Mon Sep 17 00:00:00 2001 From: Anyon Date: Thu, 6 Jun 2019 15:07:21 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=90=8C=E6=AD=A5framework?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Auth.php | 11 +- application/admin/controller/Index.php | 2 +- application/admin/controller/Log.php | 18 +- application/admin/controller/Message.php | 5 +- application/admin/controller/Node.php | 6 +- application/admin/controller/User.php | 28 +- application/admin/controller/api/Message.php | 1 + application/admin/controller/api/Plugs.php | 1 + application/admin/sys.php | 5 +- application/admin/view/auth/apply.html | 54 +- application/admin/view/auth/index.html | 101 +- application/admin/view/config/file.html | 31 +- application/admin/view/config/file_local.html | 12 +- application/admin/view/config/file_oss.html | 10 +- application/admin/view/config/file_qiniu.html | 10 +- application/admin/view/config/info.html | 28 +- application/admin/view/index/index.html | 3 +- application/admin/view/index/main.html | 164 +- application/admin/view/log/index.html | 101 +- application/admin/view/main.html | 6 +- application/admin/view/menu/index.html | 120 +- application/admin/view/message/index.html | 91 +- application/admin/view/node/index.html | 36 +- application/admin/view/queue/index.html | 132 +- application/admin/view/user/index.html | 114 +- application/service/controller/Config.php | 15 +- application/service/controller/Index.php | 10 +- application/service/controller/api/Client.php | 2 +- application/service/controller/api/Push.php | 4 +- application/service/handler/Publish.php | 2 +- application/service/handler/Receive.php | 2 +- application/service/handler/Wechat.php | 11 +- .../service/{logic => service}/Build.php | 8 +- .../service/{logic => service}/Wechat.php | 4 +- application/service/view/config/index.html | 12 +- application/service/view/index/index.html | 130 +- application/wechat/controller/Config.php | 40 +- application/wechat/controller/Fans.php | 4 +- application/wechat/controller/Keys.php | 15 +- application/wechat/controller/Menu.php | 17 +- application/wechat/controller/News.php | 47 +- application/wechat/controller/api/Review.php | 5 +- application/wechat/service/Wechat.php | 5 +- application/wechat/view/config/options.html | 31 +- .../wechat/view/config/options_api.html | 10 +- .../wechat/view/config/options_help.html | 42 +- .../wechat/view/config/options_thr.html | 10 +- application/wechat/view/config/payment.html | 13 +- application/wechat/view/fans/index.html | 149 +- application/wechat/view/keys/form.html | 3 +- application/wechat/view/keys/index.html | 146 +- application/wechat/view/menu/index.html | 4 +- application/wechat/view/news/form.html | 31 +- application/wechat/view/news/form_style.html | 99 + application/wechat/view/news/index.html | 51 +- public/static/admin.js | 95 +- public/static/plugs/ckeditor/config.js | 9 +- public/static/plugs/jquery/area/area.js | 30 + public/static/plugs/jquery/area/area.json | 6191 +++++++++++++++++ public/static/plugs/jquery/area/area.php | 18 + public/static/plugs/jquery/pcasunzips.js | 6 +- public/static/theme/css/console.css | 39 +- thinkphp/library/think/App.php | 2 +- thinkphp/library/think/Console.php | 13 +- thinkphp/library/think/Model.php | 2 +- thinkphp/library/think/Validate.php | 2 +- thinkphp/library/think/cache/Driver.php | 2 - thinkphp/library/think/cache/driver/Redis.php | 6 +- thinkphp/library/think/db/Query.php | 13 +- thinkphp/library/think/model/Collection.php | 6 +- thinkphp/library/think/model/Relation.php | 21 + .../library/think/model/concern/Attribute.php | 6 +- .../think/model/concern/Conversion.php | 8 +- .../think/model/concern/RelationShip.php | 6 +- thinkphp/library/think/route/Rule.php | 17 +- thinkphp/library/think/route/RuleGroup.php | 2 +- thinkphp/library/think/route/RuleItem.php | 14 +- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +- vendor/composer/autoload_static.php | 8 +- vendor/composer/installed.json | 56 +- vendor/zoujingli/ip2region/Ip2Region.php | 269 +- vendor/zoujingli/ip2region/ip2region.db | Bin 6841441 -> 7072360 bytes vendor/zoujingli/think-library/src/common.php | 21 +- .../think-library/src/tools/Data.php | 15 +- vendor/zoujingli/wechat-developer/.gitignore | 3 +- vendor/zoujingli/wechat-developer/We.php | 2 +- .../WeChat/Contracts/BasicWeChat.php | 8 +- .../wechat-developer/WeChat/Custom.php | 2 +- .../wechat-developer/WeChat/Media.php | 12 +- .../zoujingli/wechat-developer/WeChat/Pay.php | 1 + .../wechat-developer/WeMini/Qrcode.php | 19 +- vendor/zoujingli/weopen-developer/LICENSE | 21 + 93 files changed, 7738 insertions(+), 1235 deletions(-) rename application/service/{logic => service}/Build.php (94%) rename application/service/{logic => service}/Wechat.php (99%) create mode 100644 application/wechat/view/news/form_style.html create mode 100644 public/static/plugs/jquery/area/area.js create mode 100644 public/static/plugs/jquery/area/area.json create mode 100644 public/static/plugs/jquery/area/area.php create mode 100644 vendor/zoujingli/weopen-developer/LICENSE diff --git a/application/admin/controller/Auth.php b/application/admin/controller/Auth.php index c1467f34e..ce21608a9 100644 --- a/application/admin/controller/Auth.php +++ b/application/admin/controller/Auth.php @@ -41,7 +41,8 @@ class Auth extends Controller public function index() { $this->title = '系统权限管理'; - $this->_query($this->table)->dateBetween('create_at')->like('title,desc')->equal('status')->order('sort asc,id desc')->page(); + $query = $this->_query($this->table)->dateBetween('create_at'); + $query->like('title,desc')->equal('status')->order('sort asc,id desc')->page(); } /** @@ -61,13 +62,15 @@ class Auth extends Controller $checked = Db::name('SystemAuthNode')->where(['auth' => $auth])->column('node'); foreach ($nodes as &$node) $node['checked'] = in_array($node['node'], $checked); $data = $this->_apply_filter(\library\tools\Data::arr2tree($nodes, 'node', 'pnode', '_sub_')); - return $this->success('获取权限配置成功！', $data); + return $this->success('获取权限节点成功！', $data); case 'save': // 保存权限配置 list($post, $data) = [$this->request->post(), []]; - foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) $data[] = ['auth' => $auth, 'node' => $node]; + foreach (isset($post['nodes']) ? $post['nodes'] : [] as $node) { + $data[] = ['auth' => $auth, 'node' => $node]; + } Db::name('SystemAuthNode')->where(['auth' => $auth])->delete(); Db::name('SystemAuthNode')->insertAll($data); - return $this->success('权限授权配置更新成功！'); + return $this->success('权限授权更新成功！'); default: return $this->_form($this->table, 'apply'); } diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php index 974a76210..c99593170 100644 --- a/application/admin/controller/Index.php +++ b/application/admin/controller/Index.php @@ -159,7 +159,7 @@ class Index extends Controller { $this->applyCsrfToken(); if (intval($id) === intval(session('user.id'))) { - $this->_form('SystemUser', 'user/form', 'id', [], ['id' => $id]); + $this->_form('SystemUser', 'admin@user/form', 'id', [], ['id' => $id]); } else { $this->error('只能修改登录用户的资料！'); } diff --git a/application/admin/controller/Log.php b/application/admin/controller/Log.php index 37f09fcb7..424a29a89 100644 --- a/application/admin/controller/Log.php +++ b/application/admin/controller/Log.php @@ -15,6 +15,7 @@ namespace app\admin\controller; use library\Controller; +use think\Db; /** * 系统日志管理 @@ -40,7 +41,8 @@ class Log extends Controller public function index() { $this->title = '系统操作日志'; - $this->_query($this->table)->like('action,node,content,username,geoip')->dateBetween('create_at')->order('id desc')->page(); + $query = $this->_query($this->table)->like('action,node,content,username,geoip'); + $query->dateBetween('create_at')->order('id desc')->page(); } /** @@ -58,6 +60,20 @@ class Log extends Controller } } + /** + * 清理系统日志 + * @throws \think\Exception + * @throws \think\exception\PDOException + */ + public function clear() + { + if (Db::name($this->table)->whereRaw('1=1')->delete() !== false) { + $this->success('日志清理成功！'); + } else { + $this->error('日志清理失败，请稍候再试！'); + } + } + /** * 删除系统日志 */ diff --git a/application/admin/controller/Message.php b/application/admin/controller/Message.php index 0fbc92062..0ee72caaf 100644 --- a/application/admin/controller/Message.php +++ b/application/admin/controller/Message.php @@ -30,7 +30,7 @@ class Message extends Controller */ protected $table = 'SystemMessage'; - /*** + /** * 系统消息管理 * @throws \think\Exception * @throws \think\db\exception\DataNotFoundException @@ -41,7 +41,8 @@ class Message extends Controller public function index() { $this->title = '系统消息管理'; - $this->_query($this->table)->like('title,desc')->equal('read_state')->dateBetween('create_at,read_at')->order('id desc')->page(); + $query = $this->_query($this->table)->like('title,desc')->equal('read_state'); + $query->dateBetween('create_at,read_at')->order('id desc')->page(); } /** diff --git a/application/admin/controller/Node.php b/application/admin/controller/Node.php index 0a41bba9c..529299247 100644 --- a/application/admin/controller/Node.php +++ b/application/admin/controller/Node.php @@ -60,8 +60,9 @@ class Node extends Controller $nodes = array_unique(array_column(\app\admin\service\Auth::get(), 'node')); if (false !== Db::name($this->table)->whereNotIn('node', $nodes)->delete()) { $this->success('清理无效的节点配置成功！', ''); + } else { + $this->error('清理无效的节点配置，请稍候再试！'); } - $this->error('清理无效的节点配置，请稍候再试！'); } /** @@ -79,8 +80,9 @@ class Node extends Controller } empty($data) || data_save($this->table, $data, 'node'); $this->success('节点配置保存成功！', ''); + } else { + $this->error('访问异常，请重新进入...'); } - $this->error('访问异常，请重新进入...'); } } \ No newline at end of file diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 3b6ab99a6..1fe8ab150 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -45,8 +45,8 @@ class User extends Controller public function index() { $this->title = '系统用户管理'; - $query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status'); - $query->where(['is_deleted' => '0'])->order('id desc')->page(); + $query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at'); + $query->equal('status')->where(['is_deleted' => '0'])->order('id desc')->page(); } /** @@ -128,18 +128,6 @@ class User extends Controller } } - /** - * 删除系统用户 - */ - public function del() - { - if (in_array('10000', explode(',', $this->request->post('id')))) { - $this->error('系统超级账号禁止删除！'); - } - $this->applyCsrfToken(); - $this->_delete($this->table); - } - /** * 禁用系统用户 */ @@ -161,4 +149,16 @@ class User extends Controller $this->_save($this->table, ['status' => '1']); } + /** + * 删除系统用户 + */ + public function del() + { + if (in_array('10000', explode(',', $this->request->post('id')))) { + $this->error('系统超级账号禁止删除！'); + } + $this->applyCsrfToken(); + $this->_delete($this->table); + } + } diff --git a/application/admin/controller/api/Message.php b/application/admin/controller/api/Message.php index 7a9ded715..7e68548bc 100644 --- a/application/admin/controller/api/Message.php +++ b/application/admin/controller/api/Message.php @@ -24,6 +24,7 @@ class Message extends Controller { /** * Message constructor. + * @throws \think\Exception */ public function __construct() { diff --git a/application/admin/controller/api/Plugs.php b/application/admin/controller/api/Plugs.php index 60919a242..d6e9564ba 100644 --- a/application/admin/controller/api/Plugs.php +++ b/application/admin/controller/api/Plugs.php @@ -27,6 +27,7 @@ class Plugs extends Controller /** * Plugs constructor. + * @throws \think\Exception */ public function __construct() { diff --git a/application/admin/sys.php b/application/admin/sys.php index f76bdfdbf..9524dbb62 100644 --- a/application/admin/sys.php +++ b/application/admin/sys.php @@ -20,6 +20,9 @@ if (!function_exists('auth')) { */ function auth($node) { + list($req, $num) = [request(), count(explode('/', $node))]; + if ($num === 1) $node = "{$req->module()}/{$req->controller()}/{$node}"; + if ($num === 2) $node = "{$req->module()}/{$node}"; return \app\admin\service\Auth::checkAuthNode($node); } } @@ -39,7 +42,7 @@ if (!function_exists('sysdata')) { $data = json_decode(\think\Db::name('SystemData')->where('name', $name)->value('value'), true); return empty($data) ? [] : $data; } - return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, 256)], 'name'); + return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, JSON_UNESCAPED_UNICODE)], 'name'); } } diff --git a/application/admin/view/auth/apply.html b/application/admin/view/auth/apply.html index 2aed3b4af..a15f865db 100644 --- a/application/admin/view/auth/apply.html +++ b/application/admin/view/auth/apply.html @@ -1,11 +1,13 @@ {extend name='main'} {block name="content"} - -
-
- - +
+
    +
    +
    + + +
    {/block} @@ -68,13 +70,39 @@ {/block} \ No newline at end of file diff --git a/application/admin/view/auth/index.html b/application/admin/view/auth/index.html index 4ba0a9e0f..119d50467 100644 --- a/application/admin/view/auth/index.html +++ b/application/admin/view/auth/index.html @@ -12,57 +12,66 @@ {block name="content"} - - - - - - - - - - - - - - - - - - - - - - - + + + +
    {include file='auth/index_search'}
    - - 名称描述创建时间状态
    {$vo.title}{$vo.desc|default="没有写描述哦！"}{$vo.create_at|format_datetime}{eq name='vo.status' value='0'}已禁用{else}使用中{/eq} +
    - {if auth("admin/auth/edit")} - | - 编 辑 - {/if} + + + + + + + + + + + + + + + + + + + + + - - - -
    {include file='auth/index_search'}
    + + 权限信息创建时间状态
    + 权限名称：{$vo.title|default='-'}
    + 权限描述：{$vo.desc|default="没有写描述哦！"} +     		+ 日期：{$vo.create_at|format_datetime|str_replace=' ','
    时间：',###|raw} +     		+ {eq name='vo.status' value='0'}已禁用{else}使用中{/eq} + - {if auth("admin/auth/apply")} - 授 权 - {/if} + {if auth("admin/auth/edit")} + | + 编 辑 + {/if} - {if $vo.status eq 1 and auth("admin/auth/forbid")} - 禁 用 - {elseif auth("admin/auth/resume")} - 启 用 - {/if} + {if auth("admin/auth/apply")} + 授 权 + {/if} - {if auth("admin/auth/del")} - 删 除 - {/if} + {if $vo.status eq 1 and auth("admin/auth/forbid")} + 禁 用 + {elseif auth("admin/auth/resume")} + 启 用 + {/if} -
    + {if auth("admin/auth/del")} + 删 除 + {/if} -{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} +
    + + {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + +
    {/block} \ No newline at end of file diff --git a/application/admin/view/config/file.html b/application/admin/view/config/file.html index 09d01c21b..4aeca1b90 100644 --- a/application/admin/view/config/file.html +++ b/application/admin/view/config/file.html @@ -2,23 +2,26 @@ {block name="content"} -
    -
    -
    - -
    - {foreach ['local'=>'本地服务器存储','oss'=>'阿里云OSS存储','qiniu'=>'七牛云存储'] as $k=>$v} - - {/foreach} -

    请选择文件存储类型，其它云储存需要配置正确的参数才可以上传文件哦！

    +
    + +
    +
    + +
    + {foreach ['local'=>'本地服务器存储','oss'=>'阿里云OSS存储','qiniu'=>'七牛云存储'] as $k=>$v} + + {/foreach} +

    请选择文件存储类型，其它云储存需要配置正确的参数才可以上传文件哦！

    +
    + +
    +
    {include file='config/file_oss'}
    +
    {include file='config/file_local'}
    +
    {include file='config/file_qiniu'}
    - - -
    {include file='config/file_oss'}
    -
    {include file='config/file_local'}
    -
    {include file='config/file_qiniu'}
    +
    {/block} diff --git a/application/admin/view/config/file_local.html b/application/admin/view/config/file_local.html index 9c2f8f845..0e58a7e73 100644 --- a/application/admin/view/config/file_local.html +++ b/application/admin/view/config/file_local.html @@ -1,5 +1,5 @@ -
    -
    + +
    文件将存储在本地服务器，需确保服务器的 public/upload 目录有写入权限，还需要有足够的存储空间。
    @@ -12,12 +12,8 @@
    -
    -
    - - -
    -
    + +
    \ No newline at end of file diff --git a/application/admin/view/config/file_oss.html b/application/admin/view/config/file_oss.html index 79b3cd098..6d750e834 100644 --- a/application/admin/view/config/file_oss.html +++ b/application/admin/view/config/file_oss.html @@ -1,5 +1,5 @@
    -
    +
    文件将上传到阿里云OSS空间，需要配置OSS公开访问及跨域策略（目前已实现自动创建空间及配置访问策略）。
    @@ -70,12 +70,8 @@
    -
    -
    - - -
    -
    + +
    \ No newline at end of file diff --git a/application/admin/view/config/file_qiniu.html b/application/admin/view/config/file_qiniu.html index b4680d578..12abc28e2 100644 --- a/application/admin/view/config/file_qiniu.html +++ b/application/admin/view/config/file_qiniu.html @@ -1,5 +1,5 @@
    -
    +
    文件将上传到七牛云空间（点击这里免费申请10G存储），申请成功后添加公开bucket并配置接口密钥。
    @@ -71,12 +71,8 @@
    -
    -
    - - -
    -
    + +
    diff --git a/application/admin/view/config/info.html b/application/admin/view/config/info.html index e06fb6074..3b834f5d1 100644 --- a/application/admin/view/config/info.html +++ b/application/admin/view/config/info.html @@ -2,9 +2,9 @@ {block name="content"} -
    -
    -
    + +
    +
    @@ -25,13 +25,6 @@

    网站名称，显示在浏览器标签上

    -
    - -
    - -

    程序的版权信息设置，在后台登录页面显示

    -
    -
    @@ -41,6 +34,13 @@

    建议上传ICO图标的尺寸为128x128px，此图标用于网站标题前，ICON在线制作

    +
    + +
    + +

    程序的版权信息设置，在后台登录页面显示

    +
    +
    @@ -49,12 +49,8 @@
    -
    -
    -
    - -
    -
    +
    +
    diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html index 3f3983b01..d7f0a871d 100644 --- a/application/admin/view/index/index.html +++ b/application/admin/view/index/index.html @@ -17,7 +17,6 @@ {block name="style"}{/block} - @@ -103,7 +102,7 @@ -
    {block name='content'}{/block}
    +
    {block name='content'}{/block}
    diff --git a/application/admin/view/index/main.html b/application/admin/view/index/main.html index 610b54924..8d2cfc91e 100644 --- a/application/admin/view/index/main.html +++ b/application/admin/view/index/main.html @@ -1,72 +1,98 @@ {extend name='main'} {block name='content'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    系统信息产品团队
    应用组件版本{:sysconf('app_version')}产品名称framework
    ThinkPHP版本{$think_ver}在线体验http://framework.thinkadmin.top
    服务器操作系统{:php_uname('s')}官方QQ群 - - - -
    WEB运行环境{:php_sapi_name()}项目地址https://github.com/zoujingli/framework
    MySQL数据库版本{$mysql_ver}BUG反馈https://github.com/zoujingli/framework/issues
    运行PHP版本{$Think.PHP_VERSION}开发团队广州楚才信息科技有限公司
    上传大小限制{:ini_get('upload_max_filesize')}团队官网http://www.cuci.cc
    POST大小限制{:ini_get('post_max_size')}办公地址广州市天河区东圃一横路东泷商贸中心G02
    -{/block} \ No newline at end of file +
    +
    +
    + 系统信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    当前程序版本{:sysconf('app_version')}
    运行PHP版本{$Think.PHP_VERSION}
    ThinkPHP版本{$think_ver}
    MySQL数据库版本{$mysql_ver}
    服务器操作系统{:php_uname('s')}
    WEB运行环境{:php_sapi_name()}
    上传大小限制{:ini_get('upload_max_filesize')}
    POST大小限制{:ini_get('post_max_size')}
    +
    +
    +
    +
    + 产品团队 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    产品名称framework
    在线体验http://framework.thinkadmin.top
    官方QQ群 + + + +
    项目地址https://github.com/zoujingli/framework
    BUG反馈https://github.com/zoujingli/framework/issues
    开发团队广州楚才信息科技有限公司
    团队官网http://www.cuci.cc
    办公地址广州市天河区东圃一横路东泷商贸中心G02
    +
    +
    +
    +{/block} diff --git a/application/admin/view/log/index.html b/application/admin/view/log/index.html index 89288e2ef..28c526e50 100644 --- a/application/admin/view/log/index.html +++ b/application/admin/view/log/index.html @@ -2,6 +2,10 @@ {block name="button"} +{if auth("admin/log/clear")} + +{/if} + {if auth("admin/log/del")} {/if} @@ -9,53 +13,56 @@ {/block} {block name="content"} - - - {notempty name='list'} - - - - - - - - - - - - - - - - - - - - - - - {/notempty} -
    {include file='log/index_search'}
    - - 操作权限位置操作时间
    - - - 行为：{$vo.action|default='--'}
    - 描述：{$vo.content|default='--'} -     		- 账号：{$vo.username|default='--'}
    - 节点：{$vo.node|default='--'} -     		- 地址：{$vo.geoip|default='--'}
    - 位置：{$vo.isp|default='--'} -     		- 日期：{$vo.create_at|format_datetime|str_replace=' ','
    时间：',###|raw} -     		- {if auth("admin/log/del")} - 删 除 - {/if} -
    +
    + + + {notempty name='list'} + + + + + + + + + + + + + + + + + + + + + + + {/notempty} +
    {include file='log/index_search'}
    + + 操作权限位置操作时间
    + + + 行为：{$vo.action|default='--'}
    + 描述：{$vo.content|default='--'} +     		+ 账号：{$vo.username|default='--'}
    + 节点：{$vo.node|default='--'} +     		+ 地址：{$vo.geoip|default='--'}
    + 位置：{$vo.isp|default='--'} +     		+ 日期：{$vo.create_at|format_datetime|str_replace=' ','
    时间：',###|raw} +     		+ {if auth("admin/log/del")} + 删 除 + {/if} +
    -{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + +
    {/block} \ No newline at end of file diff --git a/application/admin/view/main.html b/application/admin/view/main.html index 5bb6d30b2..b548b60a2 100644 --- a/application/admin/view/main.html +++ b/application/admin/view/main.html @@ -1,11 +1,11 @@ -
    +
    {block name='style'}{/block} {notempty name='title'}
    - {$title|default=''} + {$title|default=''}
    {block name='button'}{/block}
    {/notempty} -
    {block name='content'}{/block}
    +
    {block name='content'}{/block}
    {block name='script'}{/block}
    \ No newline at end of file diff --git a/application/admin/view/menu/index.html b/application/admin/view/menu/index.html index a1d2104a2..856ae6eb2 100644 --- a/application/admin/view/menu/index.html +++ b/application/admin/view/menu/index.html @@ -13,68 +13,68 @@ {/block} {block name="content"} - -
    没 有 记 录 哦！
    - - - - - - - - - - - - - - - - - - - - - - - - + + + +
    - - - -
    - - - - {$vo.spl|raw}{$vo.title}{$vo.url}{eq name='vo.status' value='0'}已禁用{else}使用中{/eq} +
    + +
    没 有 记 录 哦！
    + + + + + + + + + + + + + + + + + + + + + + - - - -
    + + + +
    + + + + {$vo.spl|raw}{$vo.title}{$vo.url}{eq name='vo.status' value='0'}已禁用{else}使用中{/eq} - {if auth("admin/menu/add")} - | - - 添 加 - - 添 加 - - {/if} + {if auth("admin/menu/add")} + | + + 添 加 + + 添 加 + + {/if} - {if auth("admin/menu/edit")} - 编 辑 - {/if} + {if auth("admin/menu/edit")} + 编 辑 + {/if} - {if $vo.status eq 1 and auth("admin/menu/forbid")} - 禁 用 - {elseif auth("admin/menu/resume")} - 启 用 - {/if} + {if $vo.status eq 1 and auth("admin/menu/forbid")} + 禁 用 + {elseif auth("admin/menu/resume")} + 启 用 + {/if} - {if auth("admin/menu/del")} - 删 除 - {/if} + {if auth("admin/menu/del")} + 删 除 + {/if} -
    - -{/block} \ No newline at end of file +
    + +
    +{/block} diff --git a/application/admin/view/message/index.html b/application/admin/view/message/index.html index 033bd9f97..9d1736156 100644 --- a/application/admin/view/message/index.html +++ b/application/admin/view/message/index.html @@ -42,52 +42,57 @@ {/block} {block name="content"} - - - {notempty name='list'} - - - - - - - - - - {/notempty} - - {foreach $list as $key=>$vo} - - - - - - + + {/foreach} + +
    {include file='message/index_search'}
    - - 消息信息消息状态创建时间
    - {$vo.title|default=''}
    - {$vo.desc|default=''}
    -     		- 消息状态：{if $vo.read_state}已读取{else}未读取{/if}
    - 读取时间：{$vo.read_at|default='未读取'|raw}
    -     		日期：{$vo.create_at|format_datetime|str_replace=' ','
    时间：',###|raw}    		 - {if $vo.read_state eq 1 and auth("admin/message/state")} - 已 读 - {elseif auth("admin/message/state")} - 已 读 - {/if} +
    - {if auth("admin/message/del")} - 删 除 - {/if} + + + {notempty name='list'} + + + + + + + + + + {/notempty} + + {foreach $list as $key=>$vo} + + + + + + - - {/foreach} - -
    {include file='message/index_search'}
    + + 消息信息消息状态创建时间
    + {$vo.title|default=''}
    + {$vo.desc|default=''}
    +     		+ 消息状态：{if $vo.read_state}已读取{else}未读取{/if}
    + 读取时间：{$vo.read_at|default='未读取'|raw}
    +     		日期：{$vo.create_at|format_datetime|str_replace=' ','
    时间：',###|raw}    		 -
    + {if $vo.read_state eq 1 and auth("admin/message/state")} + 已 读 + {elseif auth("admin/message/state")} + 已 读 + {/if} -{empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + {if auth("admin/message/del")} + 删 除 + {/if} + +
    + + {empty name='list'}没有记录哦{else}{$pagehtml|raw|default=''}{/empty} + +
    {/block} \ No newline at end of file diff --git a/application/admin/view/node/index.html b/application/admin/view/node/index.html index 300e75f24..7d53b6d70 100644 --- a/application/admin/view/node/index.html +++ b/application/admin/view/node/index.html @@ -26,44 +26,44 @@ {/block} {block name="content"} -
    -