diff --git a/app/admin/view/default/site/base/index.html b/app/admin/view/default/site/base/index.html index 14b699bdd..2364cd38e 100755 --- a/app/admin/view/default/site/base/index.html +++ b/app/admin/view/default/site/base/index.html @@ -46,16 +46,16 @@
- -
diff --git a/app/api/controller/Goods.php b/app/api/controller/Goods.php index 257792006..2550a02a0 100755 --- a/app/api/controller/Goods.php +++ b/app/api/controller/Goods.php @@ -18,6 +18,7 @@ use app\service\GoodsCommentsService; use app\service\ResourcesService; use app\service\GoodsFavorService; use app\service\GoodsBrowseService; +use app\service\NavigationService; /** * 商品 @@ -112,6 +113,9 @@ class Goods extends Common // 中间tabs导航 $middle_tabs_nav = GoodsService::GoodsDetailMiddleTabsNavList($goods); + // 导航更多列表 + $nav_more_list = NavigationService::PageNavMoreList(['page'=>'goods']); + // 商品购买按钮列表 $buy_button = GoodsService::GoodsBuyButtonList($goods); @@ -121,6 +125,7 @@ class Goods extends Common 'common_cart_total' => BuyService::UserCartTotal(['user'=>$this->user]), 'buy_button' => $buy_button, 'middle_tabs_nav' => $middle_tabs_nav, + 'nav_more_list' => $nav_more_list, ]; $ret = SystemBaseService::DataReturn($result); } diff --git a/app/index/view/default/public/header.html b/app/index/view/default/public/header.html index 0f6f9dd0b..f8930e7d4 100755 --- a/app/index/view/default/public/header.html +++ b/app/index/view/default/public/header.html @@ -14,8 +14,8 @@ - - + + diff --git a/app/service/ConfigService.php b/app/service/ConfigService.php index 997c8542e..2b1bb33e1 100755 --- a/app/service/ConfigService.php +++ b/app/service/ConfigService.php @@ -51,7 +51,7 @@ class ConfigService public static $attachment_field_list = [ 'home_site_logo', 'home_site_logo_wap', - 'home_site_desktop_icon', + 'home_site_logo_square', 'common_customer_store_qrcode', 'home_site_user_register_bg_images', 'home_site_user_login_ad1_images', diff --git a/app/service/NavigationService.php b/app/service/NavigationService.php index e30d7f61d..0f687e48c 100755 --- a/app/service/NavigationService.php +++ b/app/service/NavigationService.php @@ -1085,5 +1085,59 @@ class NavigationService return $data; } + + /** + * 导航更多列表 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2019-03-15 + * @desc description + * @param [array] $params [输入信息] + */ + public static function PageNavMoreList($params = []) + { + $data = []; + if(!empty($params['page'])) + { + switch($params['page']) + { + // 商品页面 + // icon 参考各终端 + // web http://amazeui.shopxo.net/css/icon + // uniapp https://hellouniapp.dcloud.net.cn/pages/extUI/icons/icons + case 'goods' : + $data = [ + [ + 'name' => '我的收藏', + 'url' => '/pages/user-favor/user-favor', + 'icon' => 'heart' + ], + [ + 'name' => '我浏览过', + 'url' => '/pages/user-goods-browse/user-goods-browse', + 'icon' => 'eye' + ], + [ + 'name' => '回到首页', + 'url' => '/pages/index/index', + 'icon' => 'home' + ] + ]; + break; + } + } + + // 导航更多信息钩子 + $hook_name = 'plugins_service_page_navigation_more_list_handle'; + MyEventTrigger($hook_name, [ + 'hook_name' => $hook_name, + 'is_backend' => true, + 'params' => &$params, + 'data' => &$data, + ]); + + return $data; + } } ?> \ No newline at end of file diff --git a/app/service/SystemBaseService.php b/app/service/SystemBaseService.php index 96a9d7f73..211a42a8a 100644 --- a/app/service/SystemBaseService.php +++ b/app/service/SystemBaseService.php @@ -96,7 +96,7 @@ class SystemBaseService 'home_site_name' => MyC('home_site_name', null, true), 'home_site_logo' => ResourcesService::AttachmentPathViewHandle(MyC('home_site_logo')), 'home_site_logo_wap' => ResourcesService::AttachmentPathViewHandle(MyC('home_site_logo_wap')), - 'home_site_desktop_icon' => ResourcesService::AttachmentPathViewHandle(MyC('home_site_desktop_icon')), + 'home_site_logo_square' => ResourcesService::AttachmentPathViewHandle(MyC('home_site_logo_square')), 'home_site_state' => (int) MyC('home_site_state', 0, true), 'home_site_close_reason' => MyC('home_site_close_reason', null, true),