From 77051a4a31d25efe811ad3a280bba4ed701489f0 Mon Sep 17 00:00:00 2001 From: devil_gong Date: Mon, 9 Dec 2019 15:58:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + application/.htaccess | 1 - application/index/controller/Goods.php | 10 +++++++ .../index/view/default/goods/index.html | 27 +++++++++++++++-- public/static/index/default/css/goods.css | 29 +++++++++++++------ 5 files changed, 55 insertions(+), 13 deletions(-) delete mode 100755 application/.htaccess diff --git a/.gitignore b/.gitignore index 143aabd80..d64e0577e 100755 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.log *.lock .tea +.idea .htaccess *payment_*_respond.php *payment_*_notify.php \ No newline at end of file diff --git a/application/.htaccess b/application/.htaccess deleted file mode 100755 index 3418e55a6..000000000 --- a/application/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/application/index/controller/Goods.php b/application/index/controller/Goods.php index 3ef648f25..73753b282 100755 --- a/application/index/controller/Goods.php +++ b/application/index/controller/Goods.php @@ -250,6 +250,16 @@ class Goods extends Common 'goods_id' => $goods_id, 'goods' => &$goods, ])); + + // 商品页面基础信息购买小导航里面钩子 + $hook_name = 'plugins_view_goods_detail_base_buy_nav_min_inside'; + $this->assign($hook_name.'_data', Hook::listen($hook_name, + [ + 'hook_name' => $hook_name, + 'is_backend' => false, + 'goods_id' => $goods_id, + 'goods' => &$goods, + ])); } /** diff --git a/application/index/view/default/goods/index.html b/application/index/view/default/goods/index.html index f76aad4c5..c418b39e5 100755 --- a/application/index/view/default/goods/index.html +++ b/application/index/view/default/goods/index.html @@ -317,18 +317,39 @@ {{if $goods['inventory'] gt 0}}
- 首页 + + + 首页 + + {{if isset($goods['is_favor']) and $goods['is_favor'] eq 1}} -
diff --git a/public/static/index/default/css/goods.css b/public/static/index/default/css/goods.css index 934661bb6..7c20e8895 100755 --- a/public/static/index/default/css/goods.css +++ b/public/static/index/default/css/goods.css @@ -115,10 +115,6 @@ input{font-size:12px;font-size:100%;outline:none;line-height:normal;color:#444;} .btn.close {display:block;float: left;position: static;} i.buy-event{display: inline-block;} .btn.confirm { float: right; } - - .buy-nav .buy-nav-opt { position: absolute; margin-left: 283px; display: block; } - .buy-nav .buy-nav-opt a { display: none; } - .buy-nav .buy-nav-opt .favor-submit { width: 100%; border: 0; margin-top: 5px; } } @media only screen and (min-width:1025px) { @@ -244,12 +240,22 @@ flex: 1 1 0%;line-height: 16px;cursor: pointer;} /*购物车*/ -.tb-btn button, .buy-nav div.submit,.buy-nav .buy-nav-opt, .buy-nav span { height: 35px; line-height: 35px; } +.tb-btn button, .buy-nav div.submit,.buy-nav .buy-nav-opt, .buy-nav .nav-icon { height: 35px; line-height: 35px; } .tb-btn button {margin-right: 0px;float: left;overflow: hidden; position: relative;width:100%; background-color: #FFEDED; color:#d2364c;font-size: 14px;text-align: center;border: 0;} .tb-btn-basket button {background-color:#d2364c;color: #FFF;} .buy-nav .buy-nav-opt, .buy-nav div.submit { float:left; } .buy-nav div.submit { width: 30%; } -.buy-nav span{display:inline-block;width: 50%;float: left; ;cursor: pointer; border-top: 1px solid #f5f5f5; border-left: 1px solid #f5f5f5;} +@media only screen and (min-width:640px) { + .buy-nav .buy-nav-opt { position: absolute; margin-left: 220px; display: block; } + .buy-nav .buy-nav-opt .nav-icon-home { display: none; } + .buy-nav .buy-nav-opt .nav-icon { cursor: pointer; } + .buy-nav .buy-nav-opt .nav-icon:not(:last-child) { margin-right: 10px; } + .buy-nav .buy-nav-opt { padding-top: 8px; } +} +@media only screen and (max-width:640px) { + .buy-nav .nav-icon {display:inline-block;width: 50%;float: left; ;cursor: pointer; border-top: 1px solid #f5f5f5; border-left: 1px solid #f5f5f5; text-align: center; } + header { display: none; } +} /*介绍*/ @@ -288,7 +294,7 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig .clearfix-right{float:left;width:55%;min-height: 270px;} .iteminfo_parameter.freight{display: block;margin-top: 10px;margin-bottom:10px ;} .iteminfo_parameter.freight dt{margin-left:-70px ;float: left;margin-right:10px ;padding-top:5px ;padding-bottom:20px ;} - .buy-nav{position: static; margin-top: 20px; } + .buy-nav{position: static; margin-top: 20px; overflow: hidden; } ul.am-avg-sm-4.am-tabs-nav.am-nav.am-nav-tabs {width: auto;} ul.detail-attr li {display: inline;float: left;width: 33.33%;} @@ -311,8 +317,8 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig .tb-detail-hd,.tb-detail-price{text-align: left;} .tb-detail-hd h1 {font-size: 16px;} - /*购物车*/ - .tb-btn-buy{margin-left:50px; margin-right:20px;} + /*购物*/ + .tb-btn-buy{margin-right:10px;} .tb-btn button{width:98px ;border: 1px solid #d2364c;} .buy-nav div.submit{width: auto;} @@ -393,6 +399,11 @@ ul.detail-attr li {height: 26px;overflow: hidden;line-height: 26px;vertical-alig .like li:nth-of-type(4n) { border-right: 0px !important; } .like li:nth-of-type(3n) { border-right: 1px solid #eee; } .like li:nth-child(4) { border-top: 0px; } + + /*购物*/ + .tb-btn-buy{margin-left:50px;margin-right:20px;} + .buy-nav .buy-nav-opt {margin-left: 283px;} + .buy-nav .buy-nav-opt .nav-icon:not(:last-child) {margin-right: 15px;} } @media only screen and (min-width:1260px) { -- GitLab