首页轮播左侧商品分类和右侧聚合内容新增开关控制

feat/task1-c-wallet
Devil 2020-11-29 20:22:45 +08:00
parent 5a6aca36ea
commit c3bc0abc72
6 changed files with 134 additions and 113 deletions

View File

@ -19,6 +19,23 @@
<h3 class="am-panel-title">基础</h3>
</div>
<div class="am-panel-bd">
<div class="am-form-group">
<label>{{$data.home_index_banner_left_status.name}}<span class="am-form-group-label-tips">{{$data.home_index_banner_left_status.describe}}</span></label>
<select name="{{$data.home_index_banner_left_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_banner_left_status.error_tips}}" required>
{{foreach $site_site_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_index_banner_left_status']['value']) and $data['home_index_banner_left_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.home_index_banner_right_status.name}}<span class="am-form-group-label-tips">{{$data.home_index_banner_right_status.describe}}</span></label>
<select name="{{$data.home_index_banner_right_status.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_banner_right_status.error_tips}}" required>
{{foreach $site_site_state_list as $v}}
<option value="{{$v.value}}" {{if isset($data['home_index_banner_right_status']['value']) and $data['home_index_banner_right_status']['value'] eq $v['value']}}selected{{/if}}>{{$v.name}}</option>
{{/foreach}}
</select>
</div>
<div class="am-form-group">
<label>{{$data.home_index_floor_data_type.name}}<span class="am-form-group-label-tips">{{$data.home_index_floor_data_type.describe}}</span></label>
<select name="{{$data.home_index_floor_data_type.only_tag}}" class="am-radius chosen-select" data-validation-message="{{$data.home_index_floor_data_type.error_tips}}">

View File

@ -38,86 +38,88 @@
{{/if}}
<!-- 轮播-聚合内容 -->
<div class="banner-mixed">
<div class="mod-vip">
<div class="m-baseinfo">
<a {{if !empty($user)}}href="{{:MyUrl('index/user/index')}}" target="_blank"{{else /}}href="javascript:;"{{/if}}>
<img src="{{if !empty($user['avatar'])}}{{$user.avatar}}{{else /}}{{$attachment_host}}/static/{{$module_name}}/{{$default_theme}}/images/default-user-avatar.jpg{{/if}}" class="user-avatar" />
</a>
<em>
<span class="s-name am-text-truncate">
{{if !empty($user)}}
<em>Hi,</em>
{{if !empty($user['icon'])}}
<img src="{{$user.icon}}" class="common-user-icon" {{if !empty($user['icon_title'])}}title="{{$user.icon_title}}"{{/if}} />
{{if MyC('home_index_banner_right_status', 1) eq 1}}
<div class="banner-mixed">
<div class="mod-vip">
<div class="m-baseinfo">
<a {{if !empty($user)}}href="{{:MyUrl('index/user/index')}}" target="_blank"{{else /}}href="javascript:;"{{/if}}>
<img src="{{if !empty($user['avatar'])}}{{$user.avatar}}{{else /}}{{$attachment_host}}/static/{{$module_name}}/{{$default_theme}}/images/default-user-avatar.jpg{{/if}}" class="user-avatar" />
</a>
<em>
<span class="s-name am-text-truncate">
{{if !empty($user)}}
<em>Hi,</em>
{{if !empty($user['icon'])}}
<img src="{{$user.icon}}" class="common-user-icon" {{if !empty($user['icon_title'])}}title="{{$user.icon_title}}"{{/if}} />
{{/if}}
<em>{{$user.user_name_view}}</em>
{{else /}}
<em>您好,欢迎来到</em>
<em>{{:MyC('home_site_name')}}</em>
{{/if}}
<em>{{$user.user_name_view}}</em>
{{else /}}
<em>您好,欢迎来到</em>
<em>{{:MyC('home_site_name')}}</em>
</span>
</em>
{{if !empty($user)}}
<a href="{{:MyUrl('index/user/logout')}}" class="member-logout">退出</a>
{{/if}}
</div>
{{if empty($user) and (MyC('home_user_login_state') eq 1 or in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')))}}
<div class="member-login">
{{if MyC('home_user_login_state') eq 1}}
<a class="am-btn-primary btn am-fl" href="{{:MyUrl('index/user/loginInfo')}}">登录</a>
{{/if}}
</span>
</em>
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
<a class="am-btn-primary btn am-fr" href="{{:MyUrl('index/user/regInfo')}}">注册</a>
{{/if}}
</div>
{{/if}}
{{if !empty($user)}}
<a href="{{:MyUrl('index/user/logout')}}" class="member-logout">退出</a>
<div class="member-center">
{{if !empty($user_order_status)}}
{{foreach $user_order_status as $v}}
{{if in_array($v['status'], [1,2,3])}}
<a href="{{:MyUrl('index/order/index', ['is_more'=>1, 'status'=>$v['status']])}}" target="_blank"><strong>{{$v.count}}</strong>{{$v.name}}</a>
{{elseif in_array($v['status'], [100]) /}}
<a href="{{:MyUrl('index/order/index', ['is_more'=>1, 'is_comments'=>0, 'status'=>4])}}" target="_blank"><strong>{{$v.count}}</strong>{{$v.name}}</a>
{{/if}}
{{/foreach}}
{{/if}}
</div>
{{/if}}
</div>
{{if empty($user) and (MyC('home_user_login_state') eq 1 or in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')))}}
<div class="member-login">
{{if MyC('home_user_login_state') eq 1}}
<a class="am-btn-primary btn am-fl" href="{{:MyUrl('index/user/loginInfo')}}">登录</a>
{{/if}}
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state')) or in_array('username', MyC('home_user_reg_state'))}}
<a class="am-btn-primary btn am-fr" href="{{:MyUrl('index/user/regInfo')}}">注册</a>
{{/if}}
{{if !empty($article_list)}}
<div class="banner-news">
<p class="banner-news-title am-text-truncate">新闻头条</p>
<ul>
{{foreach $article_list as $article}}
<li class="am-text-truncate">
<a href="{{$article.url}}" target="_blank">
{{if isset($article['article_category_name'])}}
<span>[</span><p class="news-category-name am-inline-block am-text-truncate">{{$article.article_category_name}}</p><span>]</span>
{{/if}}
<span {{if !empty($article.title_color)}}style="color:{{$article.title_color}};"{{/if}} >{{$article.title}}</span>
</a>
</li>
{{/foreach}}
</ul>
</div>
{{/if}}
{{if !empty($user)}}
<div class="member-center">
{{if !empty($user_order_status)}}
{{foreach $user_order_status as $v}}
{{if in_array($v['status'], [1,2,3])}}
<a href="{{:MyUrl('index/order/index', ['is_more'=>1, 'status'=>$v['status']])}}" target="_blank"><strong>{{$v.count}}</strong>{{$v.name}}</a>
{{elseif in_array($v['status'], [100]) /}}
<a href="{{:MyUrl('index/order/index', ['is_more'=>1, 'is_comments'=>0, 'status'=>4])}}" target="_blank"><strong>{{$v.count}}</strong>{{$v.name}}</a>
{{/if}}
{{/foreach}}
{{/if}}
<!-- 轮播混合数据底部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_home_banner_mixed_bottom</span>
</div>
{{/if}}
{{if !empty($plugins_view_home_banner_mixed_bottom_data) and is_array($plugins_view_home_banner_mixed_bottom_data)}}
{{foreach $plugins_view_home_banner_mixed_bottom_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
{{/foreach}}
{{/if}}
</div>
{{if !empty($article_list)}}
<div class="banner-news">
<p class="banner-news-title am-text-truncate">新闻头条</p>
<ul>
{{foreach $article_list as $article}}
<li class="am-text-truncate">
<a href="{{$article.url}}" target="_blank">
{{if isset($article['article_category_name'])}}
<span>[</span><p class="news-category-name am-inline-block am-text-truncate">{{$article.article_category_name}}</p><span>]</span>
{{/if}}
<span {{if !empty($article.title_color)}}style="color:{{$article.title_color}};"{{/if}} >{{$article.title}}</span>
</a>
</li>
{{/foreach}}
</ul>
</div>
{{/if}}
<!-- 轮播混合数据底部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
<div class="plugins-tag">
<span>plugins_view_home_banner_mixed_bottom</span>
</div>
{{/if}}
{{if !empty($plugins_view_home_banner_mixed_bottom_data) and is_array($plugins_view_home_banner_mixed_bottom_data)}}
{{foreach $plugins_view_home_banner_mixed_bottom_data as $hook}}
{{if is_string($hook) or is_int($hook)}}
{{$hook|raw}}
{{/if}}
{{/foreach}}
{{/if}}
</div>
{{/if}}
</div>
<!-- 楼层数据顶部钩子 -->

View File

@ -6,7 +6,7 @@
<span class="all-goods">全部分类</span>
</div>
</a>
<div class="category-content" {{if isset($controller_name) and $controller_name neq 'index'}}style="display:none;"{{/if}}>
<div class="category-content" {{if (isset($controller_name) and $controller_name neq 'index') or (MyC('home_index_banner_left_status', 1) neq 1)}}style="display:none;"{{/if}}>
<div class="category">
<ul class="category-list">
{{if !empty($goods_category_list) and is_array($goods_category_list)}}

View File

@ -14,6 +14,7 @@ web端
4. 新增商品参数模板管理、配置商品直接选择模板载入
5. 分页组件新增自定义页码跳转
6. 后端动态表格数据列表组件优化高度固定
7. 首页轮播左侧商品分类和右侧聚合内容新增开关控制
小程序
1. 支付订单0金额错误修复

File diff suppressed because one or more lines are too long

View File

@ -28,47 +28,48 @@ function HomeCartNumberTotalUpdate(number)
$(function()
{
// 选中处理
if(store.enabled)
// 选中处理
if(store.enabled)
{
// 用户菜单选中
if($('.user-sidebar-list li.am-active').length == 0)
{
// 用户菜单选中
if($('.user-sidebar-list li.am-active').length == 0)
{
var user_menu_value = store.get(store_user_menu_key);
if(user_menu_value !== undefined)
{
$('.user-sidebar-list li').removeClass('am-active')
$('.user-sidebar-list').find('.'+user_menu_value).addClass('am-active');
}
}
var user_menu_value = store.get(store_user_menu_key);
if(user_menu_value !== undefined)
{
$('.user-sidebar-list li').removeClass('am-active')
$('.user-sidebar-list').find('.'+user_menu_value).addClass('am-active');
}
}
}
// 商品分类子级内容显示/隐藏
$(".category-content li").hover(function() {
$(".category-content .category-list li.first .menu-in").css("display", "none");
$(".category-content .category-list li.first").removeClass("hover");
$(this).addClass("hover");
$(this).children("div.menu-in").css("display", "block");
}, function() {
$(this).removeClass("hover")
$(this).children("div.menu-in").css("display", "none");
});
// 商品分类子级内容显示/隐藏
$('.category-content li').hover(function() {
$('.category-content .category-list li.first .menu-in').css('display', 'none');
$('.category-content .category-list li.first').removeClass('hover');
$(this).addClass('hover');
$(this).children('div.menu-in').css('display', 'block');
}, function() {
$(this).removeClass('hover')
$(this).children('div.menu-in').css('display', 'none');
});
// 非首页的页面商品分类显示/隐藏
// 全局商品分类显示/隐藏
var goods_category_display = $('#goods-category .category-content').css('display');
$('#goods-category').hover(function()
{
if($(this).data('controller-name') != 'index')
if(goods_category_display == 'none')
{
if(!$('#goods-category .category-content').is(":visible"))
{
if(!$('#goods-category .category-content').is(":visible"))
{
$('#goods-category .category-content').slideDown(100);
}
$('#goods-category .category-content').slideDown(100);
}
}
}).mouseleave(function() {
if($(this).data('controller-name') != 'index')
{
$('#goods-category .category-content').slideUp(100);
}
if(goods_category_display == 'none')
{
$('#goods-category .category-content').slideUp(100);
}
});
// 搜索导航固定