fe / YOHOBUYWAP · Commits

Go to a project

Authored by zhangxiaoru
Commit ef3b389fc7f8173b4da9bd2c5cf7911c81d6809a 1 parent dbcb0a25

品牌店铺首页

Inline Side-by-side
Showing 6 changed files with 123 additions and 15 deletions
@@ -11,4 +11,4 @@ require('./detail/detail'); @@ -11,4 +11,4 @@ require('./detail/detail');
11 require('./detail/consultform'); 11 require('./detail/consultform');
12 require('./newsale/hot-rank'); 12 require('./newsale/hot-rank');
13 require('./product-category'); 13 require('./product-category');
14 - 14 +require('./shop');
@@ -2,4 +2,18 @@ @@ -2,4 +2,18 @@
2 * 品牌店铺首页 2 * 品牌店铺首页
3 */ 3 */
4 4
5 -// var $ = require('jquery'); 5 + var $ = require('jquery');
  6 +
  7 +
  8 + $.jqtab = function(nav, main) {
  9 +
  10 + $(nav + ' li').click(function() {
  11 + $(main).hide();
  12 + var activeTab = $(this).find('a').attr('tab');
  13 + $('#'+activeTab).fadeIn();
  14 + return false;
  15 + });
  16 +
  17 + };
  18 +
  19 + $.jqtab('#nav1', '.main');
@@ -59,6 +59,7 @@ @@ -59,6 +59,7 @@
59 .main { 59 .main {
60 background: #f0f0f0; 60 background: #f0f0f0;
61 padding-bottom: 1rem; 61 padding-bottom: 1rem;
  62 + overflow: hidden;
62 } 63 }
63 64
64 .hide { 65 .hide {
@@ -262,6 +263,12 @@ @@ -262,6 +263,12 @@
262 } 263 }
263 } 264 }
264 265
  266 + .list {
  267 + padding-top: 30rem / $pxConvertRem;
  268 + padding-left: 15rem / $pxConvertRem;
  269 + background: #fff;
  270 + }
  271 +
265 .discount-area { 272 .discount-area {
266 @extend .discount-page; 273 @extend .discount-page;
267 274
@@ -18,14 +18,13 @@ @@ -18,14 +18,13 @@
18 </div> 18 </div>
19 19
20 <ul id="nav1" class="nav"> 20 <ul id="nav1" class="nav">
21 - <li><a href="#" tab="main1">首页</a></li>  
22 - <li><a href="#" tab="main2">人气</a></li>  
23 - <li><a href="#" tab="main3">上新</a></li>  
24 - <li><a href="#" tab="main4">全部商品</a></li> 21 + <li><a href="#" tab="home-page">首页</a></li><li><a href="#" tab="new-arrival">上新</a></li>
  22 + <li><a href="#" tab="popularity">人气</a></li>
  23 + <li><a href="{{goodList}}" target="_blank">全部商品</a></li>
25 </ul> 24 </ul>
26 25
27 <ul> 26 <ul>
28 - <li id="main1" class="main"> 27 + <li id="home-page" class="main">
29 <div class="coupon"> 28 <div class="coupon">
30 {{#each coupon}} 29 {{#each coupon}}
31 <img src="{{couponType}}"> 30 <img src="{{couponType}}">
@@ -79,10 +78,19 @@ @@ -79,10 +78,19 @@
79 </ul> 78 </ul>
80 </li> 79 </li>
81 80
82 - <li id="main2" class="main hide">1234</li>  
83 - <li id="main3" class="main hide"><li>  
84 - <li id="main4" class="main hide"><li>  
85 - </ul> 81 + <li id="new-arrival" class="main list hide">
  82 + {{# newGood}}
  83 + {{> good}}
  84 + {{/ newGood}}
  85 + </li>
  86 +
  87 + <li id="popularity" class="main list hide">
  88 + {{# popuGood}}
  89 + {{> good}}
  90 + {{/ popuGood}}
  91 + </li>
  92 +
  93 +
86 94
87 <div class="discount-area"> 95 <div class="discount-area">
88 {{> product/goods-nav-top}} 96 {{> product/goods-nav-top}}
@@ -344,13 +344,13 @@ @@ -344,13 +344,13 @@
344 {{!-- 品牌分类 --}} 344 {{!-- 品牌分类 --}}
345 {{#if productCategoryPage}} 345 {{#if productCategoryPage}}
346 <script> 346 <script>
347 - seajs.use('js/prodcut/product-category'); 347 + seajs.use('js/product/product-category');
348 </script> 348 </script>
349 {{/if}} 349 {{/if}}
350 350
351 {{!-- 品牌店铺首页 --}} 351 {{!-- 品牌店铺首页 --}}
352 -{{#if shop}} 352 +{{#if shopPage}}
353 <script> 353 <script>
354 - seajs.use('js/prodcut/shop'); 354 + seajs.use('js/product/shop');
355 </script> 355 </script>
356 {{/if}} 356 {{/if}}
@@ -20,6 +20,7 @@ class ShopController extends AbstractAction @@ -20,6 +20,7 @@ class ShopController extends AbstractAction
20 20
21 $data = array( 21 $data = array(
22 'branner-top' => '', 22 'branner-top' => '',
  23 + 'goodList' => 'https://www.baidu.com',
23 'coupon' => array( 24 'coupon' => array(
24 array( 25 array(
25 'couponType' => '' 26 'couponType' => ''
@@ -125,6 +126,84 @@ class ShopController extends AbstractAction @@ -125,6 +126,84 @@ class ShopController extends AbstractAction
125 'presentPrice' => '￥399' 126 'presentPrice' => '￥399'
126 ) 127 )
127 ), 128 ),
  129 + 'newGood' => array(
  130 + array(
  131 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  132 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  133 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  134 + 'salePrice' => '759.00',
  135 + 'price' => '799.00',
  136 + 'tags' => array(
  137 + 'is_new' => false,
  138 + 'is_advance' => true,
  139 + 'is_discount' => false,
  140 + 'is_yohoood' => false,
  141 + 'is_limited' => false
  142 + ),
  143 + 'is_soon_sold_out' => false
  144 + ),
  145 + array(
  146 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  147 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  148 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  149 + 'salePrice' => '759.00',
  150 + 'price' => '799.00',
  151 + 'tags' => array(
  152 + 'is_new' => true,
  153 + 'is_advance' => false,
  154 + 'is_discount' => false,
  155 + 'is_yohoood' => false,
  156 + 'is_limited' => false
  157 + ),
  158 + 'is_soon_sold_out' => false
  159 + ),
  160 + array(
  161 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  162 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  163 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  164 + 'salePrice' => '759.00',
  165 + 'price' => '799.00',
  166 + 'tags' => array(
  167 + 'is_new' => true,
  168 + 'is_advance' => false,
  169 + 'is_discount' => false,
  170 + 'is_yohoood' => false,
  171 + 'is_limited' => false
  172 + ),
  173 + 'is_soon_sold_out' => false
  174 + )
  175 +
  176 + ),
  177 + 'popuGood' => array(
  178 + array(
  179 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  180 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  181 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  182 + 'salePrice' => '759.00',
  183 + 'price' => '799.00',
  184 +
  185 + 'is_soon_sold_out' => false
  186 + ),
  187 + array(
  188 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  189 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  190 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  191 + 'salePrice' => '759.00',
  192 + 'price' => '799.00',
  193 +
  194 + 'is_soon_sold_out' => false
  195 + ),
  196 + array(
  197 + 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
  198 + 'thumb' => 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
  199 + 'name' => 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
  200 + 'salePrice' => '759.00',
  201 + 'price' => '799.00',
  202 +
  203 + 'is_soon_sold_out' => false
  204 + )
  205 +
  206 + ),
128 'goods' => array( 207 'goods' => array(
129 array( 208 array(
130 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html', 209 'url' => 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
@@ -191,7 +270,7 @@ class ShopController extends AbstractAction @@ -191,7 +270,7 @@ class ShopController extends AbstractAction
191 270
192 return $this->_view->display('index', array( 271 return $this->_view->display('index', array(
193 'shopIndex' => $data, 272 'shopIndex' => $data,
194 - 'shop' => true 273 + 'shopPage' => true
195 )); 274 ));
196 } 275 }
197 } 276 }