From ea445d387372b75c105944613001abb19dbda5bb Mon Sep 17 00:00:00 2001 From: devil Date: Mon, 28 Sep 2020 22:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Admin.php | 21 ++++++++++++++++++ .../admin/view/default/admin/login_info.html | 10 ++++----- .../admin/view/default/config/index.html | 3 ++- application/service/NavigationService.php | 4 ++-- application/tags.php | 9 ++++---- changelog.txt | 2 ++ config/app.php | 2 +- .../static/admin/default/images/login/15.jpg | Bin 0 -> 195642 bytes public/static/index/default/css/article.css | 5 ++++- route/route.config | 4 ++++ 10 files changed, 45 insertions(+), 15 deletions(-) create mode 100644 public/static/admin/default/images/login/15.jpg diff --git a/application/admin/controller/Admin.php b/application/admin/controller/Admin.php index 331ad0d05..adf69d0cb 100755 --- a/application/admin/controller/Admin.php +++ b/application/admin/controller/Admin.php @@ -250,6 +250,27 @@ class Admin extends Common return redirect(MyUrl('admin/index/index')); } + // 背景图片 + $host = config('shopxo.attachment_host'); + $bg_images_list = [ + $host.'/static/admin/default/images/login/1.jpg', + $host.'/static/admin/default/images/login/2.jpg', + $host.'/static/admin/default/images/login/3.jpg', + $host.'/static/admin/default/images/login/4.jpg', + $host.'/static/admin/default/images/login/5.jpg', + $host.'/static/admin/default/images/login/6.jpg', + $host.'/static/admin/default/images/login/7.jpg', + $host.'/static/admin/default/images/login/8.jpg', + $host.'/static/admin/default/images/login/9.jpg', + $host.'/static/admin/default/images/login/10.jpg', + $host.'/static/admin/default/images/login/11.jpg', + $host.'/static/admin/default/images/login/12.jpg', + $host.'/static/admin/default/images/login/13.jpg', + $host.'/static/admin/default/images/login/14.jpg', + $host.'/static/admin/default/images/login/15.jpg', + ]; + $this->assign('bg_images_list', $bg_images_list); + // 管理员登录页面钩子 $hook_name = 'plugins_view_admin_login_info'; $this->assign($hook_name.'_data', Hook::listen($hook_name, diff --git a/application/admin/view/default/admin/login_info.html b/application/admin/view/default/admin/login_info.html index 79ed1203f..65a742421 100755 --- a/application/admin/view/default/admin/login_info.html +++ b/application/admin/view/default/admin/login_info.html @@ -32,13 +32,13 @@ -{{if MyC('admin_login_info_bg_images_rand') eq 1}} +{{if MyC('admin_login_info_bg_images_rand') eq 1 and !empty($bg_images_list) and is_array($bg_images_list)}}
- {{for start="1" end="15"}} - {{if file_exists(ROOT.'public/static/admin/default/images/login/'.$i.'.jpg')}} -
+ {{foreach $bg_images_list as $k=>$v}} + {{if !empty($v)}} +
{{/if}} - {{/for}} + {{/foreach}}
{{/if}} diff --git a/application/admin/view/default/config/index.html b/application/admin/view/default/config/index.html index 6efb12a2c..269c8ecdc 100755 --- a/application/admin/view/default/config/index.html +++ b/application/admin/view/default/config/index.html @@ -22,7 +22,8 @@ {{/foreach}}
-

背景图片位置[ public/static/admin/default/images/login ]目录下

+

1. 默认背景图片位于[ public/static/admin/default/images/login ]目录下

+

2. 变更图片后、需要在[ application/admin/controller/Admin.php ]文件中[ LoginInfo ]方法中修改[ bg_images_list ]变量

diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php index c13e871d2..7674021b8 100755 --- a/application/service/NavigationService.php +++ b/application/service/NavigationService.php @@ -45,14 +45,14 @@ class NavigationService $footer = cache(config('shopxo.cache_common_home_nav_footer_key')); // 缓存没数据则从数据库重新读取,顶部菜单 - if(empty($header)) + if(empty($header) || config('app_debug')) { // 获取导航数据 $header = self::NavDataAll('header'); } // 底部导航 - if(empty($footer)) + if(empty($footer) || config('app_debug')) { // 获取导航数据 $footer = self::NavDataAll('footer'); diff --git a/application/tags.php b/application/tags.php index 251f56de8..d58cda53b 100755 --- a/application/tags.php +++ b/application/tags.php @@ -82,7 +82,6 @@ return array ( 'plugins_service_buy_order_insert_end' => array ( 0 => 'app\\plugins\\distribution\\Hook', - 1 => 'app\\plugins\\exchangerate\\Hook', ), 'plugins_service_goods_spec_extends_handle' => array ( @@ -140,10 +139,6 @@ return array ( array ( 0 => 'app\\plugins\\exchangerate\\Hook', ), - 'plugins_service_order_pay_launch_handle' => - array ( - 0 => 'app\\plugins\\exchangerate\\Hook', - ), 'plugins_service_buy_group_goods_handle' => array ( 0 => 'app\\plugins\\freightfee\\Hook', @@ -152,5 +147,9 @@ return array ( array ( 0 => 'app\\plugins\\freightfee\\Hook', ), + 'plugins_service_navigation_header_handle' => + array ( + 0 => 'app\\plugins\\answers\\Hook', + ), ); ?> \ No newline at end of file diff --git a/changelog.txt b/changelog.txt index 19d62faf7..e65649681 100755 --- a/changelog.txt +++ b/changelog.txt @@ -7,10 +7,12 @@ 3. 新增商品属性参数 4. 新增附件、css/js静态可配置CDN域名 5. 网站首页可后台控制配置 + 6. 新增SESSION和数据缓存配置Redis（独立配置） web端 1. 后台菜单支持自定义url地址、并支持钩子自动添加 2. 后台区块数据统计新增当月、上月维度 + 3. 新增插件路由短地址规则 小程序 1. QQ小程序支持微信支付 diff --git a/config/app.php b/config/app.php index 2912f4b2d..5ddc1ee84 100755 --- a/config/app.php +++ b/config/app.php @@ -101,7 +101,7 @@ return [ // 合并路由规则 'route_rule_merge' => false, // 路由是否完全匹配 - 'route_complete_match' => true, + 'route_complete_match' => false, // 使用注解路由 'route_annotation' => false, // 域名根，如thinkphp.cn diff --git a/public/static/admin/default/images/login/15.jpg b/public/static/admin/default/images/login/15.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b1298ed464900f70463dfb221151a2f7d449712e GIT binary patch literal 195642 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