diff --git a/application/index/controller/User.php b/application/index/controller/User.php
index 824f05db9..2f6c3b2a3 100755
--- a/application/index/controller/User.php
+++ b/application/index/controller/User.php
@@ -17,6 +17,7 @@ use app\service\UserService;
use app\service\BuyService;
use app\service\SeoService;
use app\service\MessageService;
+use app\service\NavigationService;
/**
* 用户
@@ -77,18 +78,10 @@ class User extends Common
{
// 登录校验
$this->IsLogin();
-
- // 订单总数
- $where = ['user_id'=>$this->user['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0];
- $this->assign('user_order_count', OrderService::OrderTotal($where));
- // 商品收藏总数
- $where = ['user_id'=>$this->user['id']];
- $this->assign('user_goods_favor_count', GoodsService::GoodsFavorTotal($where));
-
- // 商品浏览总数
- $where = ['user_id'=>$this->user['id']];
- $this->assign('user_goods_browse_count', GoodsService::GoodsBrowseTotal($where));
+ // 用户中心基础信息 mini 导航
+ $mini_navigation = NavigationService::UserCenterMiniNavigation(['user'=>$this->user]);
+ $this->assign('mini_navigation', $mini_navigation);
// 用户订单状态
$user_order_status = OrderService::OrderStatusStepTotal(['user_type'=>'user', 'user'=>$this->user, 'is_comments'=>1, 'is_aftersale'=>1]);
@@ -143,8 +136,8 @@ class User extends Common
$data = GoodsService::GoodsBrowseList($browse_params);
$this->assign('goods_browse_list', $data['data']);
- // 用户中心顶部钩子
- $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_backend'=>false, 'user'=>$this->user]));
+ // 钩子
+ $this->PluginsHook();
// 浏览器名称
$this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('用户中心', 1));
@@ -152,6 +145,35 @@ class User extends Common
return $this->fetch();
}
+ /**
+ * 钩子处理
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2019-04-22
+ * @desc description
+ */
+ private function PluginsHook()
+ {
+ // 顶部钩子
+ $this->assign('plugins_view_user_center_top_data', Hook::listen('plugins_view_user_center_top', ['hook_name'=>'plugins_view_user_center_top', 'is_backend'=>false, 'user'=>$this->user]));
+
+ // 基础信息底部钩子
+ $this->assign('plugins_view_user_base_bottom_data', Hook::listen('plugins_view_user_base_bottom', ['hook_name'=>'plugins_view_user_base_bottom', 'is_backend'=>false, 'user'=>$this->user]));
+
+ // 聚合内容顶部钩子
+ $this->assign('plugins_view_user_various_top_data', Hook::listen('plugins_view_user_various_top', ['hook_name'=>'plugins_view_user_various_top', 'is_backend'=>false, 'user'=>$this->user]));
+
+ // 聚合内容底部钩子
+ $this->assign('plugins_view_user_various_bottom_data', Hook::listen('plugins_view_user_various_bottom', ['hook_name'=>'plugins_view_user_various_bottom', 'is_backend'=>false, 'user'=>$this->user]));
+
+ // 聚合内容里面顶部钩子
+ $this->assign('plugins_view_user_various_inside_top_data', Hook::listen('plugins_view_user_various_inside_top', ['hook_name'=>'plugins_view_user_various_inside_top', 'is_backend'=>false, 'user'=>$this->user]));
+
+ // 聚合内容里面底部钩子
+ $this->assign('plugins_view_user_various_bottom_data', Hook::listen('plugins_view_user_various_bottom', ['hook_name'=>'plugins_view_user_various_bottom', 'is_backend'=>false, 'user'=>$this->user]));
+ }
+
/**
* [ForgetPwdInfo 密码找回]
* @author Devil
diff --git a/application/index/view/default/public/footer_nav.html b/application/index/view/default/public/footer_nav.html
index f470dcc3f..7ced1c8bd 100755
--- a/application/index/view/default/public/footer_nav.html
+++ b/application/index/view/default/public/footer_nav.html
@@ -1,21 +1,3 @@
-{{if !IsMobile() or (IsMobile() and MyC('common_is_mobile_concise_model') neq 1)}}
-
- {{if !empty($link_list)}}
-
-
-
友情链接
-
- {{foreach $link_list as $v}}
- -
- {{$v.name}}
-
- {{/foreach}}
-
-
-
- {{/if}}
-{{/if}}
-
{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
@@ -30,7 +12,6 @@
{{/foreach}}
{{/if}}
-
{{if !IsMobile() or (IsMobile() and MyC('common_is_mobile_concise_model') neq 1)}}
diff --git a/application/service/NavigationService.php b/application/service/NavigationService.php
index a9dc411a4..4c98aa844 100755
--- a/application/service/NavigationService.php
+++ b/application/service/NavigationService.php
@@ -12,6 +12,10 @@ namespace app\service;
use think\Db;
use think\facade\Hook;
+use app\service\BuyService;
+use app\service\MessageService;
+use app\service\OrderService;
+use app\service\GoodsService;
/**
* 导航服务层
@@ -486,7 +490,7 @@ class NavigationService
* @version 1.0.0
* @date 2019-03-15
* @desc description
- * @param array $params [description]
+ * @param [array] $params [输入信息]
*/
public static function HomeHavTopRight($params = [])
{
@@ -576,7 +580,7 @@ class NavigationService
* @version 1.0.0
* @date 2019-03-15
* @desc description
- * @param array $params [description]
+ * @param [array] $params [输入信息]
*/
public static function UsersPersonalShowFieldList($params = [])
{
@@ -633,7 +637,7 @@ class NavigationService
* @version 1.0.0
* @date 2019-03-15
* @desc description
- * @param array $params [description]
+ * @param [array] $params [输入信息]
*/
public static function UsersSafetyPanelList($params = [])
{
@@ -681,7 +685,7 @@ class NavigationService
* @version 1.0.0
* @date 2019-03-15
* @desc description
- * @param array $params [description]
+ * @param [array] $params [输入信息]
*/
public static function UsersCenterLeftList($params = [])
{
@@ -836,7 +840,7 @@ class NavigationService
* @version 1.0.0
* @date 2019-03-15
* @desc description
- * @param array $params [description]
+ * @param [array] $params [输入信息]
*/
public static function BottomNavigation($params = [])
{
@@ -894,5 +898,75 @@ class NavigationService
return $data;
}
+
+ /**
+ * 用户中心基础信息中 mini 导航
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2019-03-15
+ * @desc description
+ * @param [array] $params [输入信息]
+ */
+ public static function UserCenterMiniNavigation($params = [])
+ {
+ if(empty($params['user']))
+ {
+ $user_order_count = 0;
+ $user_goods_favor_count = 0;
+ $user_goods_browse_count = 0;
+ $user_integral = 0;
+ } else {
+ // 订单总数
+ $where = ['user_id'=>$params['user']['id'], 'is_delete_time'=>0, 'user_is_delete_time'=>0];
+ $user_order_count = OrderService::OrderTotal($where);
+
+ // 商品收藏总数
+ $where = ['user_id'=>$params['user']['id']];
+ $user_goods_favor_count = GoodsService::GoodsFavorTotal($where);
+
+ // 我的足迹总数
+ $where = ['user_id'=>$params['user']['id']];
+ $user_goods_browse_count = GoodsService::GoodsBrowseTotal($where);
+
+ // 用户积分
+ $user_integral = isset($params['user']['integral']) ? $params['user']['integral'] : 0;
+ }
+
+ // 列表
+ $data = [
+ [
+ 'name' => '订单总数',
+ 'value' => $user_order_count,
+ 'url' => MyUrl('index/order/index'),
+ ],
+ [
+ 'name' => '商品收藏',
+ 'value' => $user_goods_favor_count,
+ 'url' => MyUrl('index/userfavor/goods'),
+ ],
+ [
+ 'name' => '我的足迹',
+ 'value' => $user_goods_browse_count,
+ 'url' => MyUrl('index/usergoodsbrowse/index'),
+ ],
+ [
+ 'name' => '我的积分',
+ 'value' => $user_integral,
+ 'url' => MyUrl('index/userintegral/index'),
+ ],
+ ];
+
+ // 用户中心基础信息中mini导航
+ $hook_name = 'plugins_service_user_center_mini_navigation_handle';
+ Hook::listen($hook_name, [
+ 'hook_name' => $hook_name,
+ 'is_backend' => true,
+ 'params' => &$params,
+ 'data' => &$data,
+ ]);
+
+ return $data;
+ }
}
?>
\ No newline at end of file
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index 7e023b0d0..87671646a 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -370,39 +370,16 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a
/**
* 友情链接
*/
-.friendship-list {
- margin-top: 20px;
- margin-bottom: 10px;
-}
-.friendship-list h2 {
- border-bottom: 1px solid #e3e0e0;
- line-height: 30px;
- color: #333;
- font-weight: 600;
- font-size: 16px;
-}
-.friendship-list ul {
- overflow: hidden;
- padding: 5px 0;
-}
.friendship-list ul li {
- float: left;
line-height: 26px;
- text-align: center;
}
.friendship-list ul li:not(:last-child) {
margin-right: 10px;
}
.friendship-list ul li:not(:last-child) a {
- border-right: 1px solid #d4d4d4;
+ border-right: 1px solid #4a4a4a;
padding-right: 10px;
}
-@media only screen and (max-width:1025px) {
- .friendship-list {
- padding: 0 5px;
- }
-}
-
/**
* 框架覆盖