Skip to content

ShopXO
ShopXO

______--______ / ShopXO
与 Fork 源项目一致

Fork自 纵之格 / ShopXO

通知 1
Star 0
Fork 0
ShopXO
ShopXO

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 eb317cbf 编写于 作者: G gongfuxiang
浏览文件
操作

拖拽设计商品分类排序修复

上级 abe130a1
隐藏空白更改
内联 并排
Showing with 94 addition and 93 deletion
app/index/controller/Index.php
浏览文件 @ eb317cbf
...@@ -57,6 +57,17 @@ class Index extends Common ...@@ -57,6 +57,17 @@ class Index extends Common
$banner = BannerService::Banner(); $banner = BannerService::Banner();
MyViewAssign('banner_list', $banner); MyViewAssign('banner_list', $banner);
// H5导航
MyViewAssign('navigation', AppHomeNavService::AppHomeNav());
// 用户订单状态
$user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]);
MyViewAssign('user_order_status', $user_order_status['data']);
// 文章
$article_list = ArticleService::HomeArticleList();
MyViewAssign('article_list', $article_list);
// 数据模式 // 数据模式
$floor_data_type = MyC('home_index_floor_data_type', 0, true); $floor_data_type = MyC('home_index_floor_data_type', 0, true);
MyViewAssign('floor_data_type', $floor_data_type); MyViewAssign('floor_data_type', $floor_data_type);
...@@ -117,19 +128,8 @@ class Index extends Common ...@@ -117,19 +128,8 @@ class Index extends Common
// 加载布局样式 // 加载布局样式
MyViewAssign('is_load_layout', 1); MyViewAssign('is_load_layout', 1);
} else { } else {
// H5导航
MyViewAssign('navigation', AppHomeNavService::AppHomeNav());
// 楼层数据 // 楼层数据
MyViewAssign('goods_floor_list', GoodsService::HomeFloorList()); MyViewAssign('goods_floor_list', GoodsService::HomeFloorList());
// 文章
$article_list = ArticleService::HomeArticleList();
MyViewAssign('article_list', $article_list);
// 用户订单状态
$user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1]);
MyViewAssign('user_order_status', $user_order_status['data']);
} }
} }
......
app/index/view/default/index/index.html
浏览文件 @ eb317cbf
...@@ -16,99 +16,96 @@ ...@@ -16,99 +16,96 @@
<!-- goods category --> <!-- goods category -->
{{include file="public/goods_category" /}} {{include file="public/goods_category" /}}
<!-- 数据模式、拖拽默认则不展示轮播和聚合内容 --> <!-- banner -->
{{if !isset($floor_data_type) or $floor_data_type neq 2}} {{include file="public/home_banner" /}}
<!-- banner -->
{{include file="public/home_banner" /}}
<!-- 轮播上内容 --> <!-- 轮播上内容 -->
<div class="am-container slideall"> <div class="am-container slideall">
<!-- 轮播-手机导航 --> <!-- 轮播-手机导航 -->
{{include file="public/home_nav" /}} {{include file="public/home_nav" /}}
<!-- 轮播-聚合内容 --> <!-- 轮播-聚合内容 -->
{{if MyC('home_index_banner_right_status', 1) eq 1}} {{if MyC('home_index_banner_right_status', 1) eq 1}}
<div class="banner-mixed"> <div class="banner-mixed">
<div class="mod-vip"> <div class="mod-vip">
<div class="m-baseinfo"> <div class="m-baseinfo">
<a {{if !empty($user)}}href="{{:MyUrl('index/user/index')}}" target="_blank"{{else /}}href="javascript:;"{{/if}}> <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" /> <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> </a>
<em> <em>
<span class="s-name am-text-truncate"> <span class="s-name am-text-truncate">
{{if !empty($user)}} {{if !empty($user)}}
<em>Hi,</em> <em>Hi,</em>
{{if !empty($user['icon'])}} {{if !empty($user['icon'])}}
<img src="{{$user.icon}}" class="common-user-icon" {{if !empty($user['icon_title'])}}title="{{$user.icon_title}}"{{/if}} /> <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}} {{/if}}
</span> <em>{{$user.user_name_view}}</em>
</em> {{else /}}
{{if !empty($user)}} <em>您好，欢迎来到</em>
<a href="{{:MyUrl('index/user/logout')}}" class="member-logout">退出</a> <em>{{:MyC('home_site_name')}}</em>
{{/if}}
</div>
{{if empty($user) and (!empty($home_user_login_type) or !empty($home_user_reg_type))}}
<div class="member-login">
{{if !empty($home_user_login_type)}}
<a class="am-btn-primary btn am-fl" href="{{:MyUrl('index/user/loginInfo')}}">登录</a>
{{/if}}
{{if !empty($home_user_reg_type)}}
<a class="am-btn-primary btn am-fr" href="{{:MyUrl('index/user/regInfo')}}">注册</a>
{{/if}} {{/if}}
</div> </span>
{{/if}} </em>
{{if !empty($user)}} {{if !empty($user)}}
<div class="member-center"> <a href="{{:MyUrl('index/user/logout')}}" class="member-logout">退出</a>
{{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}} {{/if}}
</div> </div>
{{if !empty($article_list)}} {{if empty($user) and (!empty($home_user_login_type) or !empty($home_user_reg_type))}}
<div class="banner-news"> <div class="member-login">
<p class="banner-news-title am-text-truncate">新闻头条</p> {{if !empty($home_user_login_type)}}
<ul> <a class="am-btn-primary btn am-fl" href="{{:MyUrl('index/user/loginInfo')}}">登录</a>
{{foreach $article_list as $article}} {{/if}}
<li class="am-text-truncate"> {{if !empty($home_user_reg_type)}}
{{if isset($article['article_category_name']) and isset($article['category_url'])}} <a class="am-btn-primary btn am-fr" href="{{:MyUrl('index/user/regInfo')}}">注册</a>
<span>[</span><a href="{{$article.category_url}}" target="_blank"><p class="news-category-name am-inline-block am-text-truncate">{{$article.article_category_name}}</p></a><span>]</span> {{/if}}
{{/if}}
<a href="{{$article.url}}" target="_blank" {{if !empty($article.title_color)}}style="color:{{$article.title_color}};"{{/if}}>{{$article.title}}</a>
</li>
{{/foreach}}
</ul>
</div>
{{/if}}
<!-- 轮播混合数据底部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
<div class="plugins-tag">
<span>plugins_view_home_banner_mixed_bottom</span>
</div> </div>
{{/if}} {{/if}}
{{if !empty($plugins_view_home_banner_mixed_bottom_data) and is_array($plugins_view_home_banner_mixed_bottom_data)}} {{if !empty($user)}}
{{foreach $plugins_view_home_banner_mixed_bottom_data as $hook}} <div class="member-center">
{{if is_string($hook) or is_int($hook)}} {{if !empty($user_order_status)}}
{{$hook|raw}} {{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}}
{{/foreach}} </div>
{{/if}} {{/if}}
</div> </div>
{{/if}} {{if !empty($article_list)}}
</div> <div class="banner-news">
{{/if}} <p class="banner-news-title am-text-truncate">新闻头条</p>
<ul>
{{foreach $article_list as $article}}
<li class="am-text-truncate">
{{if isset($article['article_category_name']) and isset($article['category_url'])}}
<span>[</span><a href="{{$article.category_url}}" target="_blank"><p class="news-category-name am-inline-block am-text-truncate">{{$article.article_category_name}}</p></a><span>]</span>
{{/if}}
<a href="{{$article.url}}" target="_blank" {{if !empty($article.title_color)}}style="color:{{$article.title_color}};"{{/if}}>{{$article.title}}</a>
</li>
{{/foreach}}
</ul>
</div>
{{/if}}
<!-- 轮播混合数据底部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
<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>
<!-- 楼层数据顶部钩子 --> <!-- 楼层数据顶部钩子 -->
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}} {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
......
app/layout/service/BaseLayout.php
浏览文件 @ eb317cbf
...@@ -220,6 +220,8 @@ class BaseLayout ...@@ -220,6 +220,8 @@ class BaseLayout
$category = json_decode(urldecode($vss['config']['goods_category_value']), true); $category = json_decode(urldecode($vss['config']['goods_category_value']), true);
$p['category_id'] = $category[count($category)-1]['id']; $p['category_id'] = $category[count($category)-1]['id'];
$p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number']; $p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number'];
$p['order_by_type'] = isset($vss['config']['goods_order_by_type']) ? $vss['config']['goods_order_by_type'] : 0;
$p['order_by_rule'] = isset($vss['config']['goods_order_by_rule']) ? $vss['config']['goods_order_by_rule'] : 0;
break; break;
} }
$res = self::GoodsDataList($p); $res = self::GoodsDataList($p);
...@@ -327,7 +329,7 @@ class BaseLayout ...@@ -327,7 +329,7 @@ class BaseLayout
// 商品 // 商品
case 'goods' : case 'goods' :
$p = [ $p = [
'data_type' => $vss['config']['goods_data_type'], 'data_type' => $vss['config']['goods_data_type'],
]; ];
switch($vss['config']['goods_data_type']) switch($vss['config']['goods_data_type'])
{ {
...@@ -341,6 +343,8 @@ class BaseLayout ...@@ -341,6 +343,8 @@ class BaseLayout
$category = json_decode(urldecode($vss['config']['goods_category_value']), true); $category = json_decode(urldecode($vss['config']['goods_category_value']), true);
$p['category_id'] = $category[count($category)-1]['id']; $p['category_id'] = $category[count($category)-1]['id'];
$p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number']; $p['order_limit_number'] = empty($vss['config']['goods_order_limit_number']) ? 0 : $vss['config']['goods_order_limit_number'];
$p['order_by_type'] = isset($vss['config']['goods_order_by_type']) ? $vss['config']['goods_order_by_type'] : 0;
$p['order_by_rule'] = isset($vss['config']['goods_order_by_rule']) ? $vss['config']['goods_order_by_rule'] : 0;
break; break;
} }
$res = self::GoodsDataList($p); $res = self::GoodsDataList($p);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或