细节优化

feat/task1-c-wallet
devil 2020-09-28 22:47:21 +08:00
parent c890603737
commit ea445d3873
10 changed files with 45 additions and 15 deletions

View File

@ -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,

View File

@ -32,13 +32,13 @@
<!-- content end -->
<!-- 随机背景图片 -->
{{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)}}
<div class="bg-slides">
{{for start="1" end="15"}}
{{if file_exists(ROOT.'public/static/admin/default/images/login/'.$i.'.jpg')}}
<div class="bg-slides-item" style="background-image:url('{{$attachment_host}}/static/admin/default/images/login/{{$i}}.jpg');{{if $i neq 1}}display:none;{{/if}}"></div>
{{foreach $bg_images_list as $k=>$v}}
{{if !empty($v)}}
<div class="bg-slides-item" style="background-image:url('{{$v}}');{{if $k neq 0}}display:none;{{/if}}"></div>
{{/if}}
{{/for}}
{{/foreach}}
</div>
{{/if}}

View File

@ -22,7 +22,8 @@
{{/foreach}}
</select>
<div class="am-alert am-alert-warning" data-am-alert>
<p>背景图片位置[ public/static/admin/default/images/login ]目录下</p>
<p>1. 默认背景图片位于[ public/static/admin/default/images/login ]目录下</p>
<p>2. 变更图片后、需要在[ application/admin/controller/Admin.php ]文件中[ LoginInfo ]方法中修改[ bg_images_list ]变量</p>
</div>
</div>

View File

@ -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');

View File

@ -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',
),
);
?>

View File

@ -7,10 +7,12 @@
3. 新增商品属性参数
4. 新增附件、css/js静态可配置CDN域名
5. 网站首页可后台控制配置
6. 新增SESSION和数据缓存配置Redis独立配置
web端
1. 后台菜单支持自定义url地址、并支持钩子自动添加
2. 后台区块数据统计新增当月、上月维度
3. 新增插件路由短地址规则
小程序
1. QQ小程序支持微信支付

View File

@ -101,7 +101,7 @@ return [
// 合并路由规则
'route_rule_merge' => false,
// 路由是否完全匹配
'route_complete_match' => true,
'route_complete_match' => false,
// 使用注解路由
'route_annotation' => false,
// 域名根如thinkphp.cn

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 KiB

View File

@ -21,8 +21,11 @@
.article-sidebar .am-offcanvas-bar{position: static; width: auto; background: none; -webkit-transform: translate3d(0, 0, 0); -ms-transform: translate3d(0, 0, 0); transform: translate3d(0, 0, 0);}
.article-sidebar ul li:not(:last-child){border-bottom: 1px solid #f5f5f5;}
.am-accordion-gapped{margin: 0 15px 0 0;}
.article-sidebar { padding-left: 5px; }
}
@media only screen and (min-width: 1025px) {
.article-sidebar { padding-left: 0; }
}
@media only screen and (max-width: 640px) {
.article-right{padding: 0 5px;}
.article-sidebar .am-offcanvas-bar{background: #f9f9f9;}

View File

@ -12,6 +12,7 @@
// +----------------------------------------------------------------------
// | 路由规则
// +----------------------------------------------------------------------
use think\facade\Route;
// 分隔符
$ds = MyC('common_route_separator', '-', true);
@ -48,4 +49,7 @@ Route::get('regster'.$ds.'sms', 'index/user/smsreginfo');
Route::get('regster'.$ds.'email', 'index/user/emailreginfo');
Route::get('forget', 'index/user/forgetpwdinfo');
Route::get('logout', 'index/user/logout');
// 插件调用
Route::rule(':pluginsname'.$ds.':pluginscontrol'.$ds.':pluginsaction'.$ds.'[:id]','index/plugins/index');
?>