From 10518f7a28550645889a047ac12a7bb6e5949324 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Wed, 31 Jul 2019 00:16:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/index/view/default/index/index.html | 4 ++-- application/service/GoodsService.php | 2 +- application/tags.php | 8 ++++++++ config/shopxo.php | 2 +- public/static/index/default/css/order.detail.css | 3 ++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/application/index/view/default/index/index.html b/application/index/view/default/index/index.html index 84860a02e..5afce0780 100755 --- a/application/index/view/default/index/index.html +++ b/application/index/view/default/index/index.html @@ -284,11 +284,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_inside_bottom + plugins_view_home_goods_inside_bottom
{{/if}} {{php}} - $hook_name = 'plugins_view_search_goods_inside_bottom'; + $hook_name = 'plugins_view_home_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)) { diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php index 41873f14d..dc20d3db0 100755 --- a/application/service/GoodsService.php +++ b/application/service/GoodsService.php @@ -186,7 +186,7 @@ class GoodsService foreach($goods_category as &$v) { $category_ids = self::GoodsCategoryItemsIds([$v['id']], 1); - $goods = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'g.is_home_recommended'=>1, 'g.is_shelves'=>1], 'm'=>0, 'n'=>8, 'field'=>'g.id,g.title,g.title_color,g.images,g.home_recommended_images,g.original_price,g.price,g.min_price,g.max_price,g.inventory,g.buy_min_number,g.buy_max_number']); + $goods = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'g.is_home_recommended'=>1, 'g.is_shelves'=>1], 'm'=>0, 'n'=>8, 'field'=>'g.*']); $v['goods'] = $goods['data']; } } diff --git a/application/tags.php b/application/tags.php index 5ef4fba40..f7d840c72 100755 --- a/application/tags.php +++ b/application/tags.php @@ -72,6 +72,14 @@ return array ( array ( 0 => 'app\\plugins\\membershiplevel\\Hook', ), + 'plugins_view_home_goods_inside_bottom' => + array ( + 0 => 'app\\plugins\\membershiplevel\\Hook', + ), + 'plugins_view_search_goods_inside_bottom' => + array ( + 0 => 'app\\plugins\\membershiplevel\\Hook', + ), 'plugins_service_goods_spec_type' => array ( 0 => 'app\\plugins\\membershiplevel\\Hook', diff --git a/config/shopxo.php b/config/shopxo.php index 6cc7668a4..8021e7794 100755 --- a/config/shopxo.php +++ b/config/shopxo.php @@ -15,7 +15,7 @@ return [ // 开发模式 - 'is_develop' => true, + 'is_develop' => false, // 默认编码 'default_charset' => 'utf-8', diff --git a/public/static/index/default/css/order.detail.css b/public/static/index/default/css/order.detail.css index b291bb514..1e892b45b 100755 --- a/public/static/index/default/css/order.detail.css +++ b/public/static/index/default/css/order.detail.css @@ -177,11 +177,12 @@ ul.progress li.current .title { .business-item ul { padding: 10px 3px 5px 5px; overflow: hidden; } .business-item ul li { border:1px solid transparent ;overflow: hidden; float: left; cursor: pointer; padding: 5px; border: 1px solid #eee; margin: 0 10px 10px 0; } .business-item ul li img { width: 36px; height: 36px; } -.business-item ul li.selected { border-color: #d2364c ; position: relative; } +.business-item ul li.selected { border-color: #d2364c ; position: relative; box-shadow: 0px 0 0px 1px #d2364c; } .business-item ul li.selected i.icon-active { position: absolute; width: 10px; height: 10px; font-size: 0; line-height: 0; right: 0px; bottom: 0px; background: url(../images/sys-item-selected.gif) no-repeat right bottom; } @media only screen and (min-width:640px) { .business-item ul li {width:calc(33% - 5px); } .business-item ul li:nth-child(3n) { margin-right: 0; } + .business-item ul li:hover { border: 1px solid #d2364c; box-shadow: 0px 0 0px 1px #d2364c; } } @media only screen and (max-width:640px) { .business-item ul li { width: calc(50% - 5px); }