From 2308c617c7e79780486e1fd937b2f76651d8f62a Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 29 Jul 2019 15:44:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=92=A9=E5=AD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/controller/Goods.php | 50 +++--- application/index/controller/Index.php | 25 ++- application/index/controller/Search.php | 65 +++++-- .../index/view/default/index/index.html | 169 +++++++++++++++++- .../index/view/default/search/content.html | 6 +- .../index/view/default/search/index.html | 46 ++++- public/static/index/default/css/common.css | 9 +- public/static/index/default/css/index.css | 149 ++++++--------- public/static/index/default/css/search.css | 2 +- public/static/index/default/js/index.js | 29 ++- 10 files changed, 386 insertions(+), 164 deletions(-) diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index f44cc49bb..c5418a166 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -146,90 +146,100 @@ class Goods extends Common private function PluginsHook($goods_id, &$goods) { // 商品页面相册内部钩子 - $this->assign('plugins_view_goods_detail_photo_within_data', Hook::listen('plugins_view_goods_detail_photo_within', + $hook_name = 'plugins_view_goods_detail_photo_within'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_photo_within', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面相册底部钩子 - $this->assign('plugins_view_goods_detail_photo_bottom_data', Hook::listen('plugins_view_goods_detail_photo_bottom', + $hook_name = 'plugins_view_goods_detail_photo_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_photo_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面基础信息顶部钩子 - $this->assign('plugins_view_goods_detail_base_top_data', Hook::listen('plugins_view_goods_detail_base_top', + $hook_name = 'plugins_view_goods_detail_base_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_base_top', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面基础信息面板底部钩子 - $this->assign('plugins_view_goods_detail_panel_bottom_data', Hook::listen('plugins_view_goods_detail_panel_bottom', + $hook_name = 'plugins_view_goods_detail_panel_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_panel_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面基础信息面板底部钩子 - $this->assign('plugins_view_goods_detail_base_bottom_data', Hook::listen('plugins_view_goods_detail_base_bottom', + $hook_name = 'plugins_view_goods_detail_base_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_base_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面tabs顶部钩子 - $this->assign('plugins_view_goods_detail_tabs_top_data', Hook::listen('plugins_view_goods_detail_tabs_top', + $hook_name = 'plugins_view_goods_detail_tabs_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_tabs_top', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面tabs顶部钩子 - $this->assign('plugins_view_goods_detail_tabs_bottom_data', Hook::listen('plugins_view_goods_detail_tabs_bottom', + $hook_name = 'plugins_view_goods_detail_tabs_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_tabs_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面左侧顶部钩子 - $this->assign('plugins_view_goods_detail_left_top_data', Hook::listen('plugins_view_goods_detail_left_top', + $hook_name = 'plugins_view_goods_detail_left_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_left_top', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面基础信息标题里面钩子 - $this->assign('plugins_view_goods_detail_title_data', Hook::listen('plugins_view_goods_detail_title', + $hook_name = 'plugins_view_goods_detail_title'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_title', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, ])); // 商品页面基础信息面板售价顶部钩子 - $this->assign('plugins_view_goods_detail_panel_price_top_data', Hook::listen('plugins_view_goods_detail_panel_price_top', + $hook_name = 'plugins_view_goods_detail_panel_price_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_goods_detail_panel_price_top', + 'hook_name' => $hook_name, 'is_backend' => false, 'goods_id' => $goods_id, 'goods' => &$goods, diff --git a/application/index/controller/Index.php b/application/index/controller/Index.php index 82db2ce3c..bbea0bc88 100755 --- a/application/index/controller/Index.php +++ b/application/index/controller/Index.php @@ -88,10 +88,29 @@ class Index extends Common */ private function PluginsHook($params = []) { - // 楼层数据上面 - $this->assign('plugins_view_home_floor_top_data', Hook::listen('plugins_view_home_floor_top', + // 楼层数据顶部钩子 + $hook_name = 'plugins_view_home_floor_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_home_floor_top', + 'hook_name' => $hook_name, + 'is_backend' => false, + 'user' => $this->user, + ])); + + // 楼层数据底部钩子 + $hook_name = 'plugins_view_home_floor_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'user' => $this->user, + ])); + + // 轮播混合数据底部钩子 + $hook_name = 'plugins_view_home_banner_mixed_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, 'is_backend' => false, 'user' => $this->user, ])); diff --git a/application/index/controller/Search.php b/application/index/controller/Search.php index 9f94f7cf9..822da7ee6 100755 --- a/application/index/controller/Search.php +++ b/application/index/controller/Search.php @@ -70,6 +70,9 @@ class Search extends Common // seo $this->SetSeo(); + // 钩子 + $this->PluginsHook(); + return $this->fetch(); } } @@ -160,9 +163,6 @@ class Search extends Common return DataReturn('没有更多数据啦', -100); } - // 钩子 - $this->PluginsHook(); - // 返回数据html $this->assign('data', $ret['data']['data']); $ret['data']['data'] = $this->fetch('content'); @@ -180,51 +180,82 @@ class Search extends Common private function PluginsHook() { // 搜索页面顶部钩子 - $this->assign('plugins_view_search_top_data', Hook::listen('plugins_view_search_top', + $hook_name = 'plugins_view_search_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_top', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面底部钩子 - $this->assign('plugins_view_search_bottom_data', Hook::listen('plugins_view_search_top', + $hook_name = 'plugins_view_search_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面顶部内部结构里面钩子 - $this->assign('plugins_view_search_inside_top_data', Hook::listen('plugins_view_search_inside_top', + $hook_name = 'plugins_view_search_inside_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_inside_top', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面底部内部结构里面钩子 - $this->assign('plugins_view_search_inside_bottom_data', Hook::listen('plugins_view_search_inside_bottom', + $hook_name = 'plugins_view_search_inside_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_inside_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面数据容器顶部钩子 - $this->assign('plugins_view_search_data_top_data', Hook::listen('plugins_view_search_data_top', + $hook_name = 'plugins_view_search_data_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_data_top', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面数据容器底部钩子 - $this->assign('plugins_view_search_data_bottom_data', Hook::listen('plugins_view_search_data_bottom', + $hook_name = 'plugins_view_search_data_bottom'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_data_bottom', + 'hook_name' => $hook_name, 'is_backend' => false, ])); // 搜索页面搜索导航条顶部钩子 - $this->assign('plugins_view_search_nav_top_data', Hook::listen('plugins_view_search_nav_top', + $hook_name = 'plugins_view_search_nav_top'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + ])); + + // 搜索页面搜索导航条内前面钩子 + $hook_name = 'plugins_view_search_nav_inside_begin'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + ])); + + // 搜索页面搜索导航条内尾部钩子 + $hook_name = 'plugins_view_search_nav_inside_end'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + ])); + + // 搜索页面筛选条件内尾部钩子 + $hook_name = 'plugins_view_search_screen_inside_end'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, [ - 'hook_name' => 'plugins_view_search_nav_top', + 'hook_name' => $hook_name, 'is_backend' => false, ])); } diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index ae405da0c..84860a02e 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -38,7 +38,7 @@ {{/if}} -
+ - + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
plugins_view_home_floor_top @@ -127,8 +141,8 @@
-

{{$floor.name}}

-

{{$floor.vice_name}}

+

{{$floor.name}}

+

{{$floor.vice_name}}

{{if !empty($floor['items'])}} {{foreach $floor.items as $key=>$category}} @@ -148,8 +162,29 @@
-
-
+
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_floor_inside_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_home_floor_inside_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'floor'=>$floor]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} + +
{{if !empty($floor['items'])}} {{foreach $floor.items as $category_key=>$category}} @@ -168,12 +203,53 @@ {{/if}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_aggregation_inside_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_home_aggregation_inside_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'floor'=>$floor]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}}
{{if !empty($floor['goods'])}} {{foreach $floor.goods as $goods_key=>$goods}}
+ + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_goods_inside_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_home_goods_inside_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'goods_id'=>$goods['id'], 'goods'=>$goods]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} {{$goods.title}} @@ -181,12 +257,75 @@
{{$goods.title}}
-
￥{{$goods.min_price}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_goods_inside_price_top +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_home_goods_inside_price_top'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'goods_id'=>$goods['id'], 'goods'=>$goods]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}} +

￥{{$goods.price}}

+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_search_goods_inside_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_search_goods_inside_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'goods_id'=>$goods['id'], 'goods'=>$goods]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}}
{{/foreach}} {{/if}}
+ + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_floor_inside_bottom +
+ {{/if}} + {{php}} + $hook_name = 'plugins_view_home_floor_inside_bottom'; + $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'floor_id'=>$key+1, 'floor'=>$floor]); + if(!empty($hook_data) && is_array($hook_data)) + { + foreach($hook_data as $hook) + { + if(is_string($hook) || is_int($hook)) + { + echo htmlspecialchars_decode($hook); + } + } + } + {{/php}}
{{/if}} @@ -194,4 +333,18 @@ {{/if}}
+ +{{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
+ plugins_view_home_floor_bottom +
+{{/if}} +{{if !empty($plugins_view_home_floor_bottom_data) and is_array($plugins_view_home_floor_bottom_data)}} + {{foreach $plugins_view_home_floor_bottom_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} +{{/if}} + {{include file="public/footer" /}} \ No newline at end of file diff --git a/application/index/view/default/search/content.html b/application/index/view/default/search/content.html index f98c795ab..57ecaf1be 100644 --- a/application/index/view/default/search/content.html +++ b/application/index/view/default/search/content.html @@ -37,11 +37,11 @@ {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}}
- plugins_view_search_goods_price_top + plugins_view_search_goods_inside_price_top
{{/if}} {{php}} - $hook_name = 'plugins_view_search_goods_price_top'; + $hook_name = 'plugins_view_search_goods_inside_price_top'; $hook_data = Hook::listen($hook_name, ['hook_name'=>$hook_name, 'is_backend'=>false, 'goods_id'=>$v['id'], 'goods'=>$v]); if(!empty($hook_data) && is_array($hook_data)) { @@ -55,7 +55,7 @@ } {{/php}} -

+

￥{{$v.price}}

diff --git a/application/index/view/default/search/index.html b/application/index/view/default/search/index.html index 2e4692d2a..238c8df8c 100755 --- a/application/index/view/default/search/index.html +++ b/application/index/view/default/search/index.html @@ -73,7 +73,7 @@
  • -
    +
    分类
    不限
    @@ -102,8 +102,21 @@
    • + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
    + plugins_view_search_screen_inside_end +
    + {{/if}} + {{if !empty($plugins_view_search_screen_inside_end_data) and is_array($plugins_view_search_screen_inside_end_data)}} + {{foreach $plugins_view_search_screen_inside_end_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} -
    @@ -122,6 +135,20 @@
      + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
      + plugins_view_search_nav_inside_begin +
      + {{/if}} + {{if !empty($plugins_view_search_nav_inside_begin_data) and is_array($plugins_view_search_nav_inside_begin_data)}} + {{foreach $plugins_view_search_nav_inside_begin_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}} +
    • 综合 @@ -139,8 +166,21 @@
      • + + + {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true and (!isset($is_footer) or $is_footer eq 1)}} +
      + plugins_view_search_nav_inside_end +
      + {{/if}} + {{if !empty($plugins_view_search_nav_inside_end_data) and is_array($plugins_view_search_nav_inside_end_data)}} + {{foreach $plugins_view_search_nav_inside_end_data as $hook}} + {{if is_string($hook) or is_int($hook)}} + {{$hook|raw}} + {{/if}} + {{/foreach}} + {{/if}}
    -
    diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css index f375776f0..46c14d535 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -36,16 +36,13 @@ button { outline: none; } line-height: 26px; } - /*所有超链接不要下划线*/ -*, *:after, *:before{ +*, *:after, *:before { -webkit-box-sizing: border-box; -moz-box-sizing: border-box; -o-box-sizing: border-box; - box-sizing: border-box; } -/*任何标签、包括它前面、后面生成的内容都不要影响盒子的边框*/ - -.clear{ clear:both} + box-sizing: border-box; +} input { vertical-align: middle; diff --git a/public/static/index/default/css/index.css b/public/static/index/default/css/index.css index 164483e46..f235e2746 100755 --- a/public/static/index/default/css/index.css +++ b/public/static/index/default/css/index.css @@ -15,8 +15,8 @@ img{max-width:100%;} .small-nav a { text-decoration: none !important; } /*走马灯*/ -.marqueen{position: relative;border-top:1px solid #F5F5F5 ;border-bottom: 1px #f5f5f5 solid;overflow: hidden;} -.marqueen-title{position: absolute;left:10px;padding-right:10px;border-right:1px solid #F5F5F5 ;} +.banner-mixed{position: relative;border-top:1px solid #F5F5F5 ;border-bottom: 1px #f5f5f5 solid;overflow: hidden;} +.banner-news-title{position: absolute;left:10px;padding-right:10px;border-right:1px solid #F5F5F5 ;} .banner-news li,#banner-news li a{height: 30px;line-height:30px; font-size: 12px; overflow: hidden;} .banner-news{max-width:1200px; margin:0px auto; overflow:hidden; height:30px;width:100%; text-align:left;color:#ffffff;} .banner-news li {padding:0 10px 0 80px;} @@ -24,30 +24,28 @@ img{max-width:100%;} /*标题*/ .items-nav-title{text-align: center;width: 100%;overflow: hidden;background:#eee;} -.items-nav-title h4{font-size: 14px;margin:20px 0px;line-height: 1px;border-left: 60px solid #d2364c;border-right: 60px solid #d2364c; +.items-nav-title .floor-title {font-size: 14px;margin:20px 0px;line-height: 1px;border-left: 60px solid #d2364c;border-right: 60px solid #d2364c; text-align: center;float:none} -.items-nav-title h3,.items-nav-title .today-brands,.items-nav-title .more{display: none;} +.items-nav-title .floor-desc,.items-nav-title .today-brands,.items-nav-title .more{display: none;} /*楼层*/ -.flood {background: #fff; position: relative; } +.floor {background: #fff; position: relative; } .outer-con .price { color: #f33f00; font-weight: bold; } .items-nav-title a:hover { color: #d2364c; } /*小标签*/ -.list .word{padding: 5px; overflow: hidden;} +.aggregation .word{padding: 5px; overflow: hidden;} .word .outer {margin: 5px; width: calc(50% - 12px); height: 32px; line-height: 32px; text-align: center;color: #fff;background-color: rgba(0, 0, 0, 0.03);border-radius: 3px; display: inline-block; border: 1px solid #fff; text-decoration: none; overflow: hidden;} /*楼层左侧*/ -.list .outer-con .describe { color: #fff; max-width: 100%; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; } -.flood .list { overflow: hidden; width: 150px; height: 400px; text-align: center; } -.list .outer-con{ padding: 10px; text-align: center; } +.aggregation .outer-con .describe { color: #fff; max-width: 100%; overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 3; -webkit-box-orient: vertical; } +.floor .aggregation { overflow: hidden; width: 150px; text-align: center; } +.aggregation .outer-con{ padding: 10px; text-align: center; } /*楼层商品*/ .goods-items { background-color: #fff; } .goods-items a { font-size: 12px; } - -/*推荐*/ -.flood li {width: 50%;float: left;text-align: center;} +.floor li {width: 50%;float: left;text-align: center;} @media only screen and (min-width: 480px) { .small-nav img{max-width: 100%;max-height: 100%;} .small-nav{ font-size:14px;} @@ -63,77 +61,37 @@ text-align: center;float:none} .banner{ width:100%;overflow:hidden;} /*改写的公告*/ - .marqueen{height:auto; background:#FFF; opacity:0.8;text-align: center; margin-bottom: 10px; } - .marqueen-title{font-size: 14px;position: static;border-right:none ;color:#e60012 ;font-size: 16px;font-weight: 600; text-align: center;} + .banner-mixed{height:auto; background:#FFF; opacity:0.8;text-align: center; margin-bottom: 10px; } + .banner-news-title{font-size: 14px;position: static;border-right:none ;color:#e60012 ;font-size: 16px;font-weight: 600; text-align: center;} .banner-news{ height: auto;width: 100%;padding-top:5px; } .banner-news li{ font-size:12px; padding:0px 0px;height: 30px;float: right;width:30% ;} /*标题*/ - .items-nav-title h4{border: none;font-size:18px;line-height: 24px;margin:5px 0px ;font-weight: 600;} - .items-nav-title h3{display:block;font-size: 14px;color: #999;line-height:18px;margin-bottom: 5px;} + .items-nav-title .floor-title {border: none;font-size:18px;line-height: 24px;margin:5px 0px ;font-weight: 600;} + .items-nav-title .floor-desc {display:block;font-size: 14px;color: #999;line-height:18px;margin-bottom: 5px;} /*楼层*/ - .flood { margin-bottom: 15px; } - .outer-con .describe ,.recommendation .info h3{font-size: 14px;font-weight: 600;} + .floor { margin-bottom: 15px; } + .floor .goods-list { overflow: hidden; } + .outer-con .describe {font-size: 14px;font-weight: 600;} .goods-title, .outer-con .price { font-size: 14px; } - .flood .goods-list { overflow: hidden; } - .flood .goods-list .goods-items { float: left; width: 25%; padding: 10px 15px; border-right: 1px solid; border-bottom: 1px solid; border-color: #eee; height: 200px; position: relative; overflow: hidden; } - .flood .goods-list .goods-items img { max-width: 100%; padding: 10px; } - .flood .list img {position: absolute;top:auto;left:0;bottom:0;max-width: 100%;} + .floor .goods-list .goods-items { float: left; width: 25%; padding: 10px 15px; border-right: 1px solid; border-bottom: 1px solid; border-color: #eee; position: relative; overflow: hidden; } + .floor .goods-list .goods-items img { max-width: 100%; padding: 10px; } + .floor .aggregation img {position: absolute;top:auto;left:0;bottom:0;max-width: 100%;} /*楼层 hover*/ .word .outer:hover { background: #fff; color: #d2354c !important; -webkit-transition: background .2s ease-in; -moz-transition: background .2s ease-in; -ms-transition: background .2s ease-in; -o-transition: background .2s ease-in; transition: background .2s ease-in; -webkit-transition: color .2s ease-in; -moz-transition: color .2s ease-in; -ms-transition: color .2s ease-in; -o-transition: color .2s ease-in; transition: color .2s ease-in; } /*.goods-items:before { content: ""; position: absolute; top: 0; left: -100%; display: block; height: 100%; width: 50%; z-index: 999; background-color: rgba(255, 255, 255, 0.3); -webkit-transition: all 1s ease 0s; -moz-transition: all 1s ease 0s; -o-transition: all 1s ease 0s; transition: all 1s ease 0s; -ms-transform: skewX(-20deg); -webkit-transform: skewX(-20deg); -o-transform: skewX(-20deg); transform: skewX(-20deg); background: -webkit-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -moz-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: -o-linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); background: linear-gradient(90deg, transparent 0, rgba(255, 255, 255, 0.4) 100%); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=transparent, endColorstr=rgba(255, 255, 255, 0.4),GradientType=0.9); } .goods-items:hover:before { left: 100%; }*/ .goods-items:hover { z-index: 99; -webkit-box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); -moz-box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); box-shadow: 0 15px 30px rgba(0, 0, 0, 0.1); -webkit-transition: box-shadow .2s ease-in; -moz-transition: box-shadow .2s ease-in; -ms-transition: box-shadow .2s ease-in; -o-transition: box-shadow .2s ease-in; transition: box-shadow .2s ease-in; } - .flood .list img { -webkit-transition: transform .6s ease-in; -moz-transition: transform .6s ease-in; -ms-transition: transform .6s ease-in; -o-transition: transform .6s ease-in; transition: transform .6s ease-in; } - .flood .list img:hover { transform: scale(1.1); -moz-transform: scale(1.1); -webkit-transform: scale(1.1); -o-transform: scale(1.1); -ms-transform: scale(1.1); } -} - -@media only screen and (min-width: 750px) { - /*楼层*/ - .flood .goods-list .goods-items { width: 25%; padding: 10px 15px; height: 200px; } - - /*楼层左侧*/ - .flood .list { width: 150px; height: 400px; } -} - -@media only screen and (min-width: 800px) { - /*楼层*/ - .flood .goods-list .goods-items { width: 25%; padding: 10px 15px; height: 190px; } - - /*楼层左侧*/ - .flood .list { width: 222px; height: 380px; } -} - -@media only screen and (min-width: 850px) { - /*楼层*/ - .flood .goods-list .goods-items { width: 25%; padding: 10px 15px; height: 200px; } - - /*楼层左侧*/ - .flood .list { width: 222px; height: 399px; } -} - -@media only screen and (min-width: 900px) { - /*楼层*/ - .flood .goods-list .goods-items { width: 25%; padding: 10px 15px; height: 208px; } - - /*楼层左侧*/ - .flood .list { width: 222px; height: 416px; } -} - -@media only screen and (min-width: 950px) { - /*楼层*/ - .flood .goods-list .goods-items { width: 25%; padding: 10px 15px; height: 228px; } - - /*楼层左侧*/ - .flood .list { width: 222px; height: 456px; } + .floor .aggregation img { -webkit-transition: transform .6s ease-in; -moz-transition: transform .6s ease-in; -ms-transition: transform .6s ease-in; -o-transition: transform .6s ease-in; transition: transform .6s ease-in; } + .floor .aggregation img:hover { transform: scale(1.1); -moz-transform: scale(1.1); -webkit-transform: scale(1.1); -o-transform: scale(1.1); -ms-transform: scale(1.1); } } @media only screen and (min-width: 1025px) { .small-nav { display:none;} .am-g-fixed{max-width:1000px;} - .flood li{width:20%;} + .floor li{width:20%;} .banner-news{ padding: 10px; } .slideall{margin:0px auto;height:360px;position: relative;} @@ -149,40 +107,36 @@ text-align: center;float:none} /*标题*/ .items-nav-title{text-align: left;position: relative;margin-top:10px ;} - .items-nav-title h4{float:left;border: none;margin:8px 0 0 0; font-size:16px;font-weight: 600;} - .items-nav-title h3{display:block;font-size: 12px;color: #999;float: left;margin-left: 10px;margin-top:12px;} + .items-nav-title .floor-title {float:left;border: none;margin:8px 0 0 0; font-size:16px;font-weight: 600;} + .items-nav-title .floor-desc {display:block;font-size: 12px;color: #999;float: left;margin-left: 10px;margin-top:12px;} .items-nav-title .more {display: block;position: absolute;right: 0px;top:12px;font-size: 12px;overflow: hidden;} .items-nav-title .more .more-link{color: #FFF;background: #F72862 none repeat scroll 0% 0%;display: block;line-height: 20px;padding: 0px 10px; border-radius: 10px;font-size: 14px;} .items-nav-title .today-brands{display: block;position: absolute;right: 50px;overflow: hidden;height: 20px; top: 12px;text-align: right;} .today-brands a {font-size:12px;display: inline-block;vertical-align: middle;margin:0px 5px;} /*改写的公告*/ - .marqueen{ position:absolute;top:10px;right:0px;width:170px; background:#FFF; z-index: 11;border:none; opacity: 0.8; -webkit-transition: opacity .2s ease-in; -moz-transition: opacity .2s ease-in; -ms-transition: opacity .2s ease-in; -o-transition: opacity .2s ease-in; transition: opacity .2s ease-in; margin-bottom: 0; } - .marqueen .banner-news li {float: none;width: 100%;padding:0px 5px;border:none ;height: 29px;line-height:32px ;} - .marqueen:hover { opacity: 1; } + .banner-mixed{ position:absolute;top:10px;right:0px;width:170px; background:#FFF; z-index: 11;border:none; opacity: 0.8; -webkit-transition: opacity .2s ease-in; -moz-transition: opacity .2s ease-in; -ms-transition: opacity .2s ease-in; -o-transition: opacity .2s ease-in; transition: opacity .2s ease-in; margin-bottom: 0; } + .banner-mixed .banner-news li {float: none;width: 100%;padding:0px 5px;border:none ;height: 29px;line-height:32px ;} + .banner-mixed:hover { opacity: 1; } /*楼层*/ - .outer-con .title,.recommendation .info h3{line-height:22px ;color:#666 ;} - .flood {position: relative;border: none;} + .outer-con .title {line-height:22px ;color:#666 ;} + .floor {position: relative;border: none;} /*楼层左侧*/ - .flood .list { width: 222px; height: 456px; } - .list .word{ padding: 5px 10px; } - - /*楼层商品*/ - .flood .goods-list .goods-items { height: 228px; } + .aggregation .word{ padding: 5px 10px; } /*楼层颜色*/ - #floor1 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #68937f;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor2 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #d17b28;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor3 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #594e90;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor4 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #728fb9;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor5 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #648b6c;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor6 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #cd6655;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor7 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #708db7;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor8 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #9c7b36;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor9 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #caa463;position: absolute;bottom:0px;border-left: 30px solid #fff} - #floor10 .list .triangle-topright{width: 0;height: 0;border-top: 30px solid #f768e8;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor1 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #68937f;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor2 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #d17b28;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor3 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #594e90;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor4 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #728fb9;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor5 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #648b6c;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor6 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #cd6655;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor7 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #708db7;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor8 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #9c7b36;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor9 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #caa463;position: absolute;bottom:0px;border-left: 30px solid #fff} + #floor10 .aggregation .triangle-topright{width: 0;height: 0;border-top: 30px solid #f768e8;position: absolute;bottom:0px;border-left: 30px solid #fff} } @@ -194,10 +148,10 @@ text-align: center;float:none} .banner .am-slider .am-slides li{height:430px;} .banner .am-slider .am-slides img{width:1200px ;left:50% ;position: absolute;margin-left: -600px;} /*公告布局*/ - .marqueen { width:220px; text-align: left; } + .banner-mixed { width:220px; text-align: left; } .banner-news{padding-top: 0px;} .banner-news li {height: 26px;line-height: 26px;} - .marqueen-title{display: block; padding-left:5px; padding-top: 5px; border-top: 1px solid #eee; } + .banner-news-title{display: block; padding-left:5px; padding-top: 5px; border-top: 1px solid #eee; } .mod-vip{ display: block; padding: 10px; } .m-baseinfo{position: relative;margin-bottom: 10px;} .m-baseinfo img.user-avatar {display: block;width: 50px;height: 50px;border-radius: 50px;} @@ -211,21 +165,20 @@ text-align: center;float:none} .member-center a strong {height: 18px;display: block;font-size: 14px;color: #F40;} /*楼层*/ - .flood .list { width: 222px; height: 556px; } - .flood .goods-list .goods-items { height: 278px; } + .floor .aggregation { width: 222px; } } @media only screen and (max-width: 640px) { .items-nav-title{ padding: 0 10%;} - .marqueen-title{line-height: 30px; height: 30px; color: #333; } + .banner-news-title{line-height: 30px; height: 30px; color: #333; } .am-footer { padding-bottom: 55px; } /*楼层*/ - .flood .list { width: 100%; height: auto; } - .list .word { padding: 10px; } + .floor .aggregation { width: 100%; height: auto; } + .aggregation .word { padding: 10px; } .word .outer { width: calc(33% - 12px); } - .flood .goods-list .goods-items { width: 50%; float: left; padding: 10px; border-bottom: 1px solid #eee; } - .flood .goods-list .goods-items img { padding: 10px; } - .flood .goods-list .goods-items:nth-of-type(2n + 1) { border-right: 1px solid #eee; } - .flood .goods-list .goods-items:nth-of-type(2n) { border-left: 1px solid transparent; } + .floor .goods-list .goods-items { width: 50%; float: left; padding: 10px; border-bottom: 1px solid #eee; } + .floor .goods-list .goods-items img { padding: 10px; } + .floor .goods-list .goods-items:nth-of-type(2n + 1) { border-right: 1px solid #eee; } + .floor .goods-list .goods-items:nth-of-type(2n) { border-left: 1px solid transparent; } } \ No newline at end of file diff --git a/public/static/index/default/css/search.css b/public/static/index/default/css/search.css index 506c041c9..b73332db8 100755 --- a/public/static/index/default/css/search.css +++ b/public/static/index/default/css/search.css @@ -1,7 +1,7 @@ .search-list { float: none; } .items img{ width:100%;} .items .price strong{ font-size: 14px; } -.theme-popover {z-index: 1011;overflow:visible;background:#fff; width: 100%; } +.theme-popover {z-index: 1011;overflow:hidden;background:#fff; width: 100%; } .sort-nav a:hover, .sort-nav a:focus { color: #d2364c; } .select .title-tips { font-size: 12px; color: #888; } .select .title-tips strong { font-weight: 500; color: #fe90a0; } diff --git a/public/static/index/default/js/index.js b/public/static/index/default/js/index.js index aa019d023..ac2814339 100755 --- a/public/static/index/default/js/index.js +++ b/public/static/index/default/js/index.js @@ -1,20 +1,39 @@ $(function() { // 新闻轮播 - if ($(window).width() < 640) { - function autoScroll(obj) { - $(obj).find("ul").animate({ + if((window.innerWidth || $(window).width()) <= 640) + { + function auto_scroll() + { + $('.banner-news').find("ul").animate({ marginTop: "-39px" }, 500, function() { $(this).css({ marginTop: "0px" }).find("li:first").appendTo(this); - }) + }); } setInterval(function() { - autoScroll(".banner-news"); + auto_scroll(); }, 3000); } + // 楼层聚合数据高度处理 + function floor_resize_handle() + { + $('.floor').each(function(k, v) + { + var height = $(this).find('.goods-list').height(); + $(this).find('.aggregation').css('height', ((window.innerWidth || $(window).width()) <= 640) ? 'auto' : height+'px'); + }); + } + floor_resize_handle(); + + // 浏览器窗口实时事件 + $(window).resize(function() + { + floor_resize_handle(); + }); + }); \ No newline at end of file -- GitLab