diff --git a/application/index/controller/Category.php b/application/index/controller/Category.php index b20036735..e12ce71b5 100755 --- a/application/index/controller/Category.php +++ b/application/index/controller/Category.php @@ -43,9 +43,6 @@ class Category extends Common */ public function Index() { - // 展示层级 - $this->assign('category_show_level', MyC('common_show_goods_category_level', 3, true)); - // 浏览器名称 $this->assign('home_seo_site_title', SeoService::BrowserSeoTitle('商品分类', 1)); diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php index 67bde0747..5c378deb0 100755 --- a/application/index/controller/Common.php +++ b/application/index/controller/Common.php @@ -369,6 +369,9 @@ class Common extends Controller // 编辑器文件存放地址 $this->assign('editor_path_type', empty($this->user['id']) ? 'public' : 'user-'.$this->user['id']); + // 分类展示层级模式 + $this->assign('category_show_level', MyC('common_show_goods_category_level', 3, true)); + // 备案信息 $this->assign('home_site_icp', MyC('home_site_icp')); $this->assign('home_site_security_record_name', MyC('home_site_security_record_name')); diff --git a/application/index/view/default/category/index.html b/application/index/view/default/category/index.html index 56ec3b825..cbcdc4198 100755 --- a/application/index/view/default/category/index.html +++ b/application/index/view/default/category/index.html @@ -19,64 +19,100 @@
{{if !empty($goods_category_list)}} - - {{foreach $goods_category_list as $k=>$v}} -
- {{if !empty($v['vice_name']) or !empty($v['describe'])}} - - {{/if}} - {{if !empty($v['items'])}} - {{foreach $v.items as $vs}} -
- -
- {{$vs.name}} +
+ {{if !empty($v['vice_name']) or !empty($v['describe'])}} + + {{/if}} + {{if !empty($v['items'])}} + {{if $category_show_level eq 2}} +
+ - {{/if}} +
+ {{elseif $category_show_level eq 3}} + {{foreach $v.items as $vs}} +
+ +
+ {{$vs.name}} +
+
+ {{if !empty($vs['items'])}} +
    + {{foreach $vs.items as $kss=>$vss}} +
  • + {{if !empty($vss['icon'])}} + + {{$vss.name}} + + {{/if}} +

    + {{$vss.name}} +

    +
  • + {{/foreach}} +
+ {{/if}} +
+ {{/foreach}} + {{/if}} + {{else /}} +
+ + 没有子分类数据 +

+ 查看分类下商品 >> +

- {{/foreach}} - {{else /}} -
- - 没有子分类数据 -

- 查看分类下商品 >> -

-
- {{/if}} -
- {{/foreach}} + {{/if}} +
+ {{/foreach}} + {{/if}} {{else /}}
没有分类数据
{{/if}} diff --git a/application/index/view/default/public/goods_category.html b/application/index/view/default/public/goods_category.html index 82bfe4da9..bdcb01474 100755 --- a/application/index/view/default/public/goods_category.html +++ b/application/index/view/default/public/goods_category.html @@ -11,48 +11,60 @@
    {{if !empty($goods_category_list) and is_array($goods_category_list)}} {{foreach $goods_category_list as $v}} -
  • +
  • + - - {{else /}} -
    没有相关数据
    - {{/if}} -
+ {{else /}} +
没有相关数据
+ {{/if}} +
+ {{/if}} {{/foreach}} {{/if}} diff --git a/public/static/index/default/css/category.css b/public/static/index/default/css/category.css index e4e4f7c46..cd2a87f37 100755 --- a/public/static/index/default/css/category.css +++ b/public/static/index/default/css/category.css @@ -1,3 +1,9 @@ +.category-list-container, +.model-one, +.category-list-container ul.category-nav li, +.category-list-container .category-content ul { + overflow: hidden; +} .category-list-container ul.category-nav, .category-list-container .category-content { overflow-y: auto; @@ -37,23 +43,20 @@ .category-list-container .category-content .category-item:not(:last-child) { margin-bottom: 15px; } -.category-list-container .category-content .one-cetegory a:hover { +.category-list-container a:hover { text-decoration: none; } .category-list-container .category-content ul { border-top: 1px dotted #e5e5e5; } -.category-list-container ul.category-nav li, -.category-list-container .category-content ul { - overflow: hidden; -} -.category-list-container .category-content ul li:not(:last-child) { - margin-right: 20px; +.category-list-container .category-content ul li { + padding: 3px 10px; + margin: 5px 0; + border: 1px solid #fff; } .category-list-container .category-content ul li a { color: #787878; font-size: 12px; - line-height: 22px; } .category-list-container .table-no { padding: 50px 0; @@ -76,6 +79,19 @@ margin-right: 5px; width: calc(100% - 120px); } + .model-one { + margin-top: -5px; + } + .category-list-container .category-item:hover { + border: 1px solid #ccc; + } + .category-list-container .category-content ul li:hover, + .model-one li .item-content:hover { + border: 1px solid #d3364c; + } + .category-list-container .category-content ul li:hover a { + color: #333; + } } @media only screen and (min-width:1025px) { .category-list-container ul.category-nav { @@ -84,6 +100,10 @@ .category-list-container .category-content { margin-right: 0; width: calc(100% - 110px); + } + .model-one { + margin-left: -5px; + width: calc(100% + 10px); } } @media only screen and (max-width:640px) { @@ -97,4 +117,13 @@ .category-list-container .category-content .category-item { margin-right: 10px; } +} +.two-content ul { + border-top: 0 !important; +} +.model-one .item-content { + border: 1px solid #e0e0e0; +} +.model-one img { + margin: 0 auto; } \ 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 649490c34..38f535353 100755 --- a/public/static/index/default/css/common.css +++ b/public/static/index/default/css/common.css @@ -129,7 +129,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a /*分类*/ .goods-category-s {display:block;position: absolute;z-index: 100;} .goods-category-s .all-goods, .goods-category-title .all-goods {font-size: 16px;} - .goods-category-title{background:#d2364c;color:#fff ;height: 40px;line-height: 44px;display:block;position: absolute;width:150px ;text-align: center;top:2px;z-index: 6;cursor: pointer;} + .goods-category-title{background:#d2364c;color:#fff ;height: 40px;line-height: 44px;display:block;position: absolute;width:150px ;text-align: center;top:0px;z-index: 6;cursor: pointer;} .goods-category-s .category-content{ position:relative; width: 150px; float: left; z-index: 113;background:#fff; top: 45px;} .goods-category-s .category-content .all-goods { display: block; padding: 0; border-radius: 5px 5px 0 0; font-weight: 600; line-height: 36px;width:150px;height: 36px; padding: 0; border-radius: 5px 5px 0 0; color: #fff; text-align: center; font: 16px/36px "Microsoft YaHei";} .goods-category-s .category-content .all-goods em{ font: 12px/36px "Microsoft YaHei"; } @@ -138,14 +138,16 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .category-content .category-list li { height:36px; margin-top: -2px;z-index:113;border-top: 1px solid #333;border-bottom: 1px solid #252525} .category-content .category-list li.first{ margin-top: 0; } .category-content .category-list li.last .c-category-list{ border-bottom: none; } - .category-content .category-list a:hover{ text-decoration: none; color: #D2364C; } + .category-content .category-list a { text-decoration: none; } + .category-content li:hover, .category-content li:hover .bd-name, .category-content dd a:hover, .category-content dd a:hover * { color: #D2364C; } + .category-content .category-list dd a:hover{ border: 1px solid #D2364C; } .category-content .category-name{ overflow:hidden; position: relative;} .category-content .category-name img{ position: absolute; top: 8px; width: 20px; height: 20px; left: 6px; display:block;} - .category-content .category-name .ml-22{font-size:14px ;padding-left: 30px;} + .category-content .bd-name {font-size:14px ;padding-left: 30px;} .category-content .category-list .bd-b{ height: 1px; margin: -1px 10px 0 10px; background: #eee; line-height: 1; font-size: 0; } .category-content .b-category-name {line-height:32px;padding-top:3px ;padding-left:5px; padding-right: 40px;} .category-content .b-category-name b{ margin-left: 4px; font:400 12px/28px "宋体"; } - .category-content .b-category-name a{ color: #fff; } + .category-content .bd-name{ color: #fff; } .category-content .c-category-list a{ margin-right:8px; color:#626262; } .category-content .b-category-name .fr{ background-position:0 -629px; width:22px; height:22px; margin:10px 16px 0 0; } .category-content .s-category-name{ height:22px;} @@ -170,6 +172,7 @@ color: #F5F5F2;font-size: 12px;cursor:pointer;border-radius:0px 0px; position: a .category-content .menu-item.bottom{bottom: -2px;*bottom: -6px;_*bottom: -7px;} .category-content .sort-side .dl-sort{ float:left; width:50%; } .category-list li.hover .menu-in { border: 1px solid #333; } + .category-content .sort-side .two-content { width: auto; } } @media only screen and (min-width: 1025px) { diff --git a/sourcecode/alipay/pages/plugins/coupon/index/index.axml b/sourcecode/alipay/pages/plugins/coupon/index/index.axml index 3f5369e4a..4647f7192 100644 --- a/sourcecode/alipay/pages/plugins/coupon/index/index.axml +++ b/sourcecode/alipay/pages/plugins/coupon/index/index.axml @@ -6,7 +6,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.discount_value}} {{item.type_unit}} {{item.desc}} diff --git a/sourcecode/alipay/pages/plugins/coupon/user/user.axml b/sourcecode/alipay/pages/plugins/coupon/user/user.axml index 889636606..5eb8d9227 100644 --- a/sourcecode/alipay/pages/plugins/coupon/user/user.axml +++ b/sourcecode/alipay/pages/plugins/coupon/user/user.axml @@ -14,7 +14,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -38,7 +38,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.type_unit}} {{item.coupon.desc}} @@ -60,7 +60,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.type_unit}} {{item.coupon.desc}} diff --git a/sourcecode/baidu/pages/plugins/coupon/index/index.swan b/sourcecode/baidu/pages/plugins/coupon/index/index.swan index e2eee74ba..01f718a90 100644 --- a/sourcecode/baidu/pages/plugins/coupon/index/index.swan +++ b/sourcecode/baidu/pages/plugins/coupon/index/index.swan @@ -6,7 +6,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.discount_value}} {{item.type_unit}} {{item.desc}} diff --git a/sourcecode/baidu/pages/plugins/coupon/user/user.swan b/sourcecode/baidu/pages/plugins/coupon/user/user.swan index 2e1f11078..7d798d0f7 100644 --- a/sourcecode/baidu/pages/plugins/coupon/user/user.swan +++ b/sourcecode/baidu/pages/plugins/coupon/user/user.swan @@ -14,7 +14,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -38,7 +38,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -60,7 +60,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} diff --git a/sourcecode/qq/pages/plugins/coupon/index/index.qml b/sourcecode/qq/pages/plugins/coupon/index/index.qml index cfc83563d..85a5f319f 100644 --- a/sourcecode/qq/pages/plugins/coupon/index/index.qml +++ b/sourcecode/qq/pages/plugins/coupon/index/index.qml @@ -6,7 +6,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.discount_value}} {{item.type_unit}} {{item.desc}} diff --git a/sourcecode/qq/pages/plugins/coupon/user/user.qml b/sourcecode/qq/pages/plugins/coupon/user/user.qml index 11c06da6f..fcb88b604 100644 --- a/sourcecode/qq/pages/plugins/coupon/user/user.qml +++ b/sourcecode/qq/pages/plugins/coupon/user/user.qml @@ -14,7 +14,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -38,7 +38,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -60,7 +60,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} diff --git a/sourcecode/toutiao/pages/plugins/coupon/index/index.ttml b/sourcecode/toutiao/pages/plugins/coupon/index/index.ttml index 887e95a43..25933d879 100644 --- a/sourcecode/toutiao/pages/plugins/coupon/index/index.ttml +++ b/sourcecode/toutiao/pages/plugins/coupon/index/index.ttml @@ -6,7 +6,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.discount_value}} {{item.type_unit}} {{item.desc}} diff --git a/sourcecode/toutiao/pages/plugins/coupon/user/user.ttml b/sourcecode/toutiao/pages/plugins/coupon/user/user.ttml index df306669c..da643cf2f 100644 --- a/sourcecode/toutiao/pages/plugins/coupon/user/user.ttml +++ b/sourcecode/toutiao/pages/plugins/coupon/user/user.ttml @@ -14,7 +14,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -38,7 +38,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -60,7 +60,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}}