fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 4b0a4270663f76e6b242af42f29607e22ffa75e7 2 parents 359b0f5a 5395a45d

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 18 changed files with 382 additions and 18 deletions
framework @ 119c247f
1 -Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2 1 +Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
This diff could not be displayed because it is too large.
No preview for this file type
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" > 2 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
3 <svg xmlns="http://www.w3.org/2000/svg"> 3 <svg xmlns="http://www.w3.org/2000/svg">
4 <metadata> 4 <metadata>
5 -Created by FontForge 20120731 at Wed Oct 21 13:32:56 2015 5 +Created by FontForge 20120731 at Wed Oct 21 18:23:04 2015
6 By Ads 6 By Ads
7 </metadata> 7 </metadata>
8 <defs> 8 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Oct 21 13:32:56 2015 @@ -19,7 +19,7 @@ Created by FontForge 20120731 at Wed Oct 21 13:32:56 2015
19 bbox="0 -224 3943 812.871" 19 bbox="0 -224 3943 812.871"
20 underline-thickness="50" 20 underline-thickness="50"
21 underline-position="-100" 21 underline-position="-100"
22 - unicode-range="U+0078-E622" 22 + unicode-range="U+0078-E623"
23 /> 23 />
24 <missing-glyph horiz-adv-x="374" 24 <missing-glyph horiz-adv-x="374"
25 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" /> 25 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -140,5 +140,7 @@ t-2.5 -15v-80h-208q-20 0 -34 -14t-14 -34v-80h832v80q0 6 -1.5 11t-3.5 10t-5.5 9t- @@ -140,5 +140,7 @@ t-2.5 -15v-80h-208q-20 0 -34 -14t-14 -34v-80h832v80q0 6 -1.5 11t-3.5 10t-5.5 9t-
140 <glyph glyph-name="uniE622" unicode="&#xe622;" horiz-adv-x="1173" 140 <glyph glyph-name="uniE622" unicode="&#xe622;" horiz-adv-x="1173"
141 d="M586 588q-64 150 -188 203q-114 47 -222 -7q-112 -56 -155 -192q-20 -67 -21 -144q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q63 -42 118 -94.5t86.5 -95t39.5 -69.5q4 19 25.5 50t53.5 66t75 74t88 71q21 15 53.5 35.5t58 36 141 d="M586 588q-64 150 -188 203q-114 47 -222 -7q-112 -56 -155 -192q-20 -67 -21 -144q0 -41 9 -78.5t24 -66.5t39 -57.5t47 -48.5t55.5 -43t56.5 -38t58.5 -35.5t53.5 -33.5q63 -42 118 -94.5t86.5 -95t39.5 -69.5q4 19 25.5 50t53.5 66t75 74t88 71q21 15 53.5 35.5t58 36
142 t57 38t55 43t47 48t39 56.5t25 66.5t8.5 78.5q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" /> 142 t57 38t55 43t47 48t39 56.5t25 66.5t8.5 78.5q0 75 -19.5 138t-52.5 105.5t-76.5 70.5t-91 37.5t-98 1t-96 -34.5t-85.5 -72.5t-67 -108.5z" />
  143 + <glyph glyph-name="uniE623" unicode="&#xe623;"
  144 +d="M835 576l-60 63l-263 -275v0l-263 275l-60 -63l262 -276l-262 -276l60 -63l263 275v0l263 -275l60 63l-262 276z" />
143 </font> 145 </font>
144 </defs></svg> 146 </defs></svg>
No preview for this file type
No preview for this file type
@@ -7,6 +7,10 @@ @@ -7,6 +7,10 @@
7 var $ = require('yoho.zepto'), 7 var $ = require('yoho.zepto'),
8 lazyLoad = require('yoho.zeptolazyload'); 8 lazyLoad = require('yoho.zeptolazyload');
9 9
  10 +//品牌页参数
  11 +var $brandHeader = $('#brand-header'),
  12 + $introBox = $('#intro-box');
  13 +
10 var filter = require('../plugin/filter'); 14 var filter = require('../plugin/filter');
11 15
12 var $goodsContainer = $('#goods-container'), 16 var $goodsContainer = $('#goods-container'),
@@ -276,4 +280,22 @@ $(window).scroll(function() { @@ -276,4 +280,22 @@ $(window).scroll(function() {
276 $(document).height() - 0.25 * $goodsContainer.height()) { 280 $(document).height() - 0.25 * $goodsContainer.height()) {
277 search(); 281 search();
278 } 282 }
  283 +});
  284 +
  285 +//品牌介绍
  286 +$brandHeader.children('.btn-intro').bind('touchstart', function() {
  287 + $introBox.removeClass('hide');
  288 +});
  289 +
  290 +$('.close-intro, .brand-intro-box').click(function() {
  291 + $introBox.addClass('hide');
  292 +});
  293 +
  294 +$('#brand-intro').click(function(e) {
  295 + e.stopPropagation();
  296 +});
  297 +
  298 +//品牌收藏
  299 +$brandHeader.children('.btn-col').bind('touchstart', function() {
  300 + $(this).toggleClass('coled');
279 }); 301 });
1 .brand-page { 1 .brand-page {
  2 +
  3 +
  4 + .newbrand-search {
  5 + width: 93.75%;
  6 + height: 30px;
  7 + padding: 7px 3.125%;
  8 + background-color: #f8f8f8;
  9 + left: 0;
  10 + z-index: 10;
  11 + .search-box {
  12 + position: relative;
  13 + height: 30px;
  14 + background-color: #FFF;
  15 + border-radius: 15px;
  16 + padding: 0 16px 0 26px;
  17 +
  18 + .search-input {
  19 + width: 100%;
  20 + height: 30px;
  21 + border: 0;
  22 + }
  23 +
  24 + .search-icon {
  25 + position: absolute;
  26 + font-size: 12px;
  27 + top: 16px;
  28 + left: 24px;
  29 + }
2 30
  31 + }
  32 +
  33 + }
  34 +
3 .hot-brand { 35 .hot-brand {
4 margin: (30rem / $pxConvertRem) 0 0; 36 margin: (30rem / $pxConvertRem) 0 0;
5 37
@@ -43,11 +43,7 @@ @@ -43,11 +43,7 @@
43 white-space: nowrap; 43 white-space: nowrap;
44 } 44 }
45 } 45 }
46 -  
47 - .brand:nth-child(4n) {  
48 - border-right: none;  
49 - }  
50 - 46 +
51 .more { 47 .more {
52 float: left; 48 float: left;
53 width: 317rem / $pxConvertRem; 49 width: 317rem / $pxConvertRem;
@@ -17,9 +17,6 @@ @@ -17,9 +17,6 @@
17 display: -webkit-flex; 17 display: -webkit-flex;
18 width: 98rem / $pxConvertRem; 18 width: 98rem / $pxConvertRem;
19 height: 98rem / $pxConvertRem; 19 height: 98rem / $pxConvertRem;
20 - border-radius: 50%;  
21 - border: 2rem / $pxConvertRem solid #e0e0e0;  
22 - box-sizing: border-box;  
23 overflow: hidden; 20 overflow: hidden;
24 align-items:center; 21 align-items:center;
25 justify-content: center; 22 justify-content: center;
@@ -39,4 +39,18 @@ @@ -39,4 +39,18 @@
39 color: #000; 39 color: #000;
40 } 40 }
41 } 41 }
  42 + .load-more-info {
  43 + width: 100%;
  44 + height: 570rem / $pxConvertRem;
  45 + line-height: 70rem / $pxConvertRem;
  46 + text-align: center;
  47 + font-size: 14px;
  48 + overflow: hidden;
  49 +
  50 + .status {
  51 + &.hide {
  52 + display: none;
  53 + }
  54 + }
  55 + }
42 } 56 }
@@ -96,10 +96,59 @@ @@ -96,10 +96,59 @@
96 96
97 .btn-col { 97 .btn-col {
98 right: 15px; 98 right: 15px;
  99 +
  100 + .iconfont {
  101 + font-size: 12px;
  102 + }
99 } 103 }
100 104
101 .brand-intro-box { 105 .brand-intro-box {
102 - display: none; 106 + position: absolute;
  107 + top: 0;
  108 + left: 0;
  109 + right: 0;
  110 + bottom: 0;
  111 + background: rgba(0,0,0,.3);
  112 + padding: 44px 0;
  113 + z-index: 1;
  114 + overflow: auto;
  115 +
  116 + .brand-intro {
  117 + position: relative;
  118 + box-sizing: border-box;
  119 + width: 85%;
  120 + margin: 0 7.5%;
  121 + background: #fff;
  122 + padding: 10px 8%;
  123 + }
  124 +
  125 + h2 {
  126 + text-align: center;
  127 + font-size: 17px;
  128 + line-height: 40px;
  129 + }
  130 +
  131 + .con {
  132 + font-size: 12px;
  133 + line-height: 16px;
  134 + padding: 20px 0;
  135 + border-top: 1px solid #e6e6e6;
  136 + border-bottom: 1px solid #e6e6e6;
  137 + overflow-x: hidden;
  138 + }
  139 +
  140 + .fo {
  141 + font-size: 18px;
  142 + height: 40px;
  143 + line-height: 40px;
  144 + text-align: center;
  145 + }
  146 +
  147 + .close-intro {
  148 + position: absolute;
  149 + top: 6px;
  150 + right: 6px;
  151 + }
103 } 152 }
104 153
105 .list-nav { 154 .list-nav {
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="brand-page yoho-page"> 2 <div class="brand-page yoho-page">
  3 +
  4 + <div class="newbrand-search" style="position: fixed; top: 44px;">
  5 + <div class="search-box clearfix">
  6 + <a href="/index/search/index" >
  7 + <input type="text" class="search-input" placeholder="查找品牌" name="query" id="query" value="" disabled="">
  8 + <i class="search-icon iconfont clearfix"></i>
  9 + </a>
  10 + </div>
  11 + </div>
  12 +
  13 +
3 {{# bannerTop}} 14 {{# bannerTop}}
4 {{> home/banner_top}} 15 {{> home/banner_top}}
5 {{/ bannerTop}} 16 {{/ bannerTop}}
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 {{/ brandWay}} 24 {{/ brandWay}}
25 25
26 {{# brand}} 26 {{# brand}}
27 - <div class="brand-header" data-id={{id}}> 27 + <div id="brand-header" class="brand-header" data-id={{id}}>
28 <img class="lazy" data-original={{banner}}> 28 <img class="lazy" data-original={{banner}}>
29 <a class="btn-intro" href="javascript:void(0);"> 29 <a class="btn-intro" href="javascript:void(0);">
30 品牌介绍 30 品牌介绍
@@ -34,8 +34,18 @@ @@ -34,8 +34,18 @@
34 收藏 34 收藏
35 </a> 35 </a>
36 </div> 36 </div>
37 - <div class="brand-intro-box">  
38 - <div id="brand-intro" class="brand-intro">{{intro}}</div> 37 + <div id="intro-box" class="brand-intro-box hide">
  38 + <div id="brand-intro" class="brand-intro">
  39 + <h2>品牌介绍</h2>
  40 + <div class="con">
  41 + {{{intro}}}
  42 + </div>
  43 + <p class="fo">
  44 + <span></span>
  45 + 100%品牌授权正品
  46 + </p>
  47 + <span class="iconfont close-intro">&#xe623;</span>
  48 + </div>
39 </div> 49 </div>
40 {{/ brand}} 50 {{/ brand}}
41 51
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <div id="goods-list" class="goods-list clearfix"></div> 7 <div id="goods-list" class="goods-list clearfix"></div>
8 8
9 <div id="load-more-info" class="load-more-info"> 9 <div id="load-more-info" class="load-more-info">
10 - <div class="loading status"> 10 + <div class="loading status hide">
11 正在加载... 11 正在加载...
12 </div> 12 </div>
13 <span class="no-more status hide">没有更多啦</span> 13 <span class="no-more status hide">没有更多啦</span>
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <div class="recommend-swiper"> 12 <div class="recommend-swiper">
13 <ul class="recommend-list clearfix"> 13 <ul class="recommend-list clearfix">
14 {{# recommend_collocation}} 14 {{# recommend_collocation}}
15 - <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="lazy" src="{{img}}" alt="" /></a></li> 15 + <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{img}}" alt="" /></a></li>
16 {{/ recommend_collocation}} 16 {{/ recommend_collocation}}
17 </ul> 17 </ul>
18 </div> 18 </div>
@@ -23,11 +23,238 @@ class BrandController extends AbstractAction @@ -23,11 +23,238 @@ class BrandController extends AbstractAction
23 } 23 }
24 24
25 /* 获取渲染模板需要的数据 */ 25 /* 获取渲染模板需要的数据 */
26 - $data = Category\BrandModel::getBrandByChannel($channel); 26 + /*$data = Category\BrandModel::getBrandByChannel($channel);
27 if (!is_array($data)) { 27 if (!is_array($data)) {
28 $data = array(); 28 $data = array();
29 } 29 }
30 $data['brandPage'] = true; 30 $data['brandPage'] = true;
  31 +
  32 + $brandTop = array();
  33 + if($brandTopData['code'] == 200)
  34 + {
  35 + $brandTop = $brandTopData['data'];
  36 + }
  37 + $brands = array();
  38 + if($brandsData['code'] == 200)
  39 + {
  40 + $brands = $brandsData['data'];
  41 + }
  42 +
  43 + echo '<pre>';
  44 + var_dump($brandTop, $brands);exit;*/
  45 +
  46 + $data = array (
  47 + 'brandPage' => true,
  48 + 'pageHeader' => array (
  49 + 'navBack' => 'sss ',
  50 + 'navHome' => 'sss ',
  51 + 'navTitle' => 'sss '
  52 + ),
  53 + 'bannerTop' => array (
  54 + 'list' => array (
  55 + array (
  56 + 'url' => '',
  57 + 'img' => 'http://img10.static.yhbimg.com/adpic/2015/10/15/10/01c161398d3baec2868abe85e26ba1a71d.jpg?imageMogr2/thumbnail/640x300/extent/640x300/background/d2hpdGU=/position/center/quality/90'
  58 + ),
  59 + array (
  60 + 'url' => '',
  61 + 'img' => 'http://img13.static.yhbimg.com/adpic/2015/10/15/10/027c45cdc03e23c367ec0ff3d29b7c3f79.jpg?imageMogr2/thumbnail/640x300/extent/640x300/background/d2hpdGU=/position/center/quality/90'
  62 + ),
  63 + array (
  64 + 'url' => '',
  65 + 'img' => 'http://img13.static.yhbimg.com/adpic/2015/10/15/10/022e2ac6daa33fc3cb8a0f04025a35994f.jpg?imageMogr2/thumbnail/640x300/extent/640x300/background/d2hpdGU=/position/center/quality/90'
  66 + )
  67 + )
  68 + ),
  69 + 'hotBrand' => array (
  70 + 'list' => array (
  71 + array (
  72 + 'url' => '',
  73 + 'img' => 'http://img13.static.yhbimg.com/brandLogo/2014/08/12/17/0233d54f34d2534c08271a8fc27090a6af.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  74 + ),
  75 + array (
  76 + 'url' => '',
  77 + 'img' => 'http://img12.static.yhbimg.com/brandLogo/2014/01/27/11/020b17265b2103b49005c57395b8b154a9.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  78 + ),
  79 + array (
  80 + 'url' => '',
  81 + 'img' => 'http://img13.static.yhbimg.com/brandLogo/2014/11/27/09/02b403bdcbfb965bdc632fea5c29816746.png?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  82 + ),
  83 + array (
  84 + 'url' => '',
  85 + 'img' => 'http://img13.static.yhbimg.com/brandLogo/2013/11/01/14/027e68260ba30c01b165c17fe043f2ce2c.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  86 + ),
  87 + array (
  88 + 'url' => '',
  89 + 'img' => 'http://img11.static.yhbimg.com/brandLogo/2014/04/25/14/0179fa8eacf51fd1a89ec6f7fdeab88fc2.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  90 + ),
  91 + array (
  92 + 'url' => '',
  93 + 'img' => 'http://img12.static.yhbimg.com/brandLogo/2014/01/27/11/02608437f8d8b6b7b15786214b0a5ef502.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  94 + ),
  95 + array (
  96 + 'url' => '',
  97 + 'img' => 'http://img12.static.yhbimg.com/brandLogo/2013/02/28/17/020aae69720d683a7962c9b7fd3a92c801.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  98 + ),
  99 + array (
  100 + 'url' => '',
  101 + 'img' => 'http://img13.static.yhbimg.com/brandLogo/2014/01/27/11/02bca7ac6414c7475b4a337e28a0365590.jpg?imageMogr2/thumbnail/144x144/extent/144x144/background/d2hpdGU=/position/center/quality/90'
  102 + )
  103 + )
  104 + ),
  105 + 'brandList' => array (
  106 + array (
  107 + 'title' => '0~9',
  108 + 'list' => array(
  109 + array (
  110 + 'name' => '004',
  111 + 'isHot' => true
  112 + ),
  113 + array (
  114 + 'name' => '10*1',
  115 + 'isNew' => true
  116 + ),
  117 + array (
  118 + 'name' => '2%'
  119 + )
  120 + )
  121 + ),
  122 + array (
  123 + 'title' => 'A',
  124 + 'list' => array(
  125 + array (
  126 + 'name' => 'Aape',
  127 + 'isHot' => true
  128 + ),
  129 + array (
  130 + 'name' => 'Adfdfd',
  131 + 'isNew' => true
  132 + ),
  133 + array (
  134 + 'name' => 'Acrwewwe'
  135 + )
  136 + )
  137 + ),
  138 + array (
  139 + 'title' => 'B',
  140 + 'list' => array(
  141 + array (
  142 + 'name' => 'Bape'
  143 + ),
  144 + array (
  145 + 'name' => 'Bdfdfd'
  146 + ),
  147 + array (
  148 + 'name' => 'Bcrwewwe'
  149 + )
  150 + )
  151 + ),
  152 + array (
  153 + 'title' => 'B',
  154 + 'list' => array(
  155 + array (
  156 + 'name' => 'Bape'
  157 + ),
  158 + array (
  159 + 'name' => 'Bdfdfd'
  160 + ),
  161 + array (
  162 + 'name' => 'Bcrwewwe'
  163 + )
  164 + )
  165 + ),
  166 + array (
  167 + 'title' => 'B',
  168 + 'list' => array(
  169 + array (
  170 + 'name' => 'Bape'
  171 + ),
  172 + array (
  173 + 'name' => 'Bdfdfd'
  174 + ),
  175 + array (
  176 + 'name' => 'Bcrwewwe'
  177 + )
  178 + )
  179 + ),
  180 + array (
  181 + 'title' => 'B',
  182 + 'list' => array(
  183 + array (
  184 + 'name' => 'Bape'
  185 + ),
  186 + array (
  187 + 'name' => 'Bdfdfd'
  188 + ),
  189 + array (
  190 + 'name' => 'Bcrwewwe'
  191 + )
  192 + )
  193 + ),
  194 + array (
  195 + 'title' => 'B',
  196 + 'list' => array(
  197 + array (
  198 + 'name' => 'Bape'
  199 + ),
  200 + array (
  201 + 'name' => 'Bdfdfd'
  202 + ),
  203 + array (
  204 + 'name' => 'Bcrwewwe'
  205 + )
  206 + )
  207 + ),
  208 + array (
  209 + 'title' => 'B',
  210 + 'list' => array(
  211 + array (
  212 + 'name' => 'Bape'
  213 + ),
  214 + array (
  215 + 'name' => 'Bdfdfd'
  216 + ),
  217 + array (
  218 + 'name' => 'Bcrwewwe'
  219 + )
  220 + )
  221 + ),
  222 + array (
  223 + 'title' => 'B',
  224 + 'list' => array(
  225 + array (
  226 + 'name' => 'Bape'
  227 + ),
  228 + array (
  229 + 'name' => 'Bdfdfd'
  230 + ),
  231 + array (
  232 + 'name' => 'Bcrwewwe'
  233 + )
  234 + )
  235 + ),
  236 + array (
  237 + 'title' => 'B',
  238 + 'list' => array(
  239 + array (
  240 + 'name' => 'Bape'
  241 + ),
  242 + array (
  243 + 'name' => 'Bdfdfd'
  244 + ),
  245 + array (
  246 + 'name' => 'Bcrwewwe'
  247 + )
  248 + )
  249 + )
  250 + )
  251 +
  252 +
  253 + );
  254 +
  255 +
  256 + $this->_view->assign('title', 'YOHO!有货');
  257 + //$this->_view->display('brand', compact('brands'));
31 258
32 // 渲染模板 259 // 渲染模板
33 $this->_view->display('index', $data); 260 $this->_view->display('index', $data);
@@ -19,6 +19,10 @@ class ListController extends AbstractAction @@ -19,6 +19,10 @@ class ListController extends AbstractAction
19 'name' => 'Aape', 19 'name' => 'Aape',
20 'thumb' => 'http://img13.static.yhbimg.com/brandLogo/2015/08/26/15/02261f64c198cb4b181c5ef9e61f38f4b9.jpg?imageMogr2/thumbnail/150x70/extent/150x70/background/d2hpdGU=/position/center/quality/90' 20 'thumb' => 'http://img13.static.yhbimg.com/brandLogo/2015/08/26/15/02261f64c198cb4b181c5ef9e61f38f4b9.jpg?imageMogr2/thumbnail/150x70/extent/150x70/background/d2hpdGU=/position/center/quality/90'
21 ), 21 ),
  22 + 'brand' => array(
  23 + 'id' => 1,
  24 + 'banner' => 'http://img10.static.yhbimg.com/brandBanner/2015/08/26/07/015af5d6ee626cb132cd9c436e896fae26.jpg?imageMogr2/crop/640x'
  25 + ),
22 'new' => array( 26 'new' => array(
23 array( 27 array(
24 'id' => 1, 28 'id' => 1,