wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit fb21da1be1b985e604bc467919b5f7e9eee0e606 2 parents a01315f8 16db7077

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

Inline Side-by-side
Showing 11 changed files with 334 additions and 304 deletions
@@ -408,3 +408,55 @@ @@ -408,3 +408,55 @@
408 127.0.0.1 - - [15/Oct/2015:16:35:21 +0800] "GET /product/newsale/index HTTP/1.1" 200 1877 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" 408 127.0.0.1 - - [15/Oct/2015:16:35:21 +0800] "GET /product/newsale/index HTTP/1.1" 200 1877 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
409 127.0.0.1 - - [15/Oct/2015:16:35:21 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/product/newsale/index" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" 409 127.0.0.1 - - [15/Oct/2015:16:35:21 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/product/newsale/index" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
410 127.0.0.1 - - [15/Oct/2015:16:37:46 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4" 410 127.0.0.1 - - [15/Oct/2015:16:37:46 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  411 +127.0.0.1 - - [15/Oct/2015:16:42:49 +0800] "GET /product/newsale/discount HTTP/1.1" 200 1373 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  412 +127.0.0.1 - - [15/Oct/2015:16:42:49 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  413 +127.0.0.1 - - [15/Oct/2015:16:42:50 +0800] "GET /product/newsale/discount HTTP/1.1" 200 1373 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  414 +127.0.0.1 - - [15/Oct/2015:16:42:50 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  415 +127.0.0.1 - - [15/Oct/2015:16:43:10 +0800] "GET /product/newsale/discount HTTP/1.1" 200 217 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  416 +127.0.0.1 - - [15/Oct/2015:16:43:10 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  417 +127.0.0.1 - - [15/Oct/2015:17:08:27 +0800] "GET /product/newsale/discount HTTP/1.1" 200 217 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  418 +127.0.0.1 - - [15/Oct/2015:17:08:28 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  419 +127.0.0.1 - - [15/Oct/2015:17:08:30 +0800] "GET /product/newsale/discount HTTP/1.1" 200 217 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  420 +127.0.0.1 - - [15/Oct/2015:17:08:30 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  421 +127.0.0.1 - - [15/Oct/2015:17:09:25 +0800] "GET /product/newsale/discount HTTP/1.1" 200 1372 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  422 +127.0.0.1 - - [15/Oct/2015:17:09:26 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  423 +127.0.0.1 - - [15/Oct/2015:17:10:47 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  424 +127.0.0.1 - - [15/Oct/2015:17:10:47 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  425 +127.0.0.1 - - [15/Oct/2015:17:13:42 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  426 +127.0.0.1 - - [15/Oct/2015:17:13:42 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  427 +127.0.0.1 - - [15/Oct/2015:17:13:50 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  428 +127.0.0.1 - - [15/Oct/2015:17:13:50 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  429 +127.0.0.1 - - [15/Oct/2015:17:13:51 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  430 +127.0.0.1 - - [15/Oct/2015:17:13:51 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  431 +127.0.0.1 - - [15/Oct/2015:17:14:01 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  432 +127.0.0.1 - - [15/Oct/2015:17:14:01 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  433 +127.0.0.1 - - [15/Oct/2015:17:14:27 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36"
  434 +127.0.0.1 - - [15/Oct/2015:17:14:42 +0800] "-" 400 0 "-" "-"
  435 +127.0.0.1 - - [15/Oct/2015:17:19:52 +0800] "GET /product/newsale/discount HTTP/1.1" 200 6209 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  436 +127.0.0.1 - - [15/Oct/2015:17:19:52 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  437 +127.0.0.1 - - [15/Oct/2015:17:20:01 +0800] "GET /product/newsale/discount HTTP/1.1" 200 11516 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  438 +127.0.0.1 - - [15/Oct/2015:17:20:02 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  439 +127.0.0.1 - - [15/Oct/2015:17:22:31 +0800] "GET /product/newsale/discount HTTP/1.1" 200 11516 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  440 +127.0.0.1 - - [15/Oct/2015:17:22:31 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/discount" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  441 +127.0.0.1 - - [15/Oct/2015:17:22:59 +0800] "GET /product/newsale/index HTTP/1.1" 200 1877 "-" "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36"
  442 +127.0.0.1 - - [15/Oct/2015:17:23:04 +0800] "GET /product/newsale/index HTTP/1.1" 200 1877 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  443 +127.0.0.1 - - [15/Oct/2015:17:23:04 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/product/newsale/index" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  444 +127.0.0.1 - - [15/Oct/2015:17:23:06 +0800] "GET /favicon.ico HTTP/1.1" 200 1150 "http://m.dev.yohobuy.com/product/newsale/index" "Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0 Mobile/12A4345d Safari/600.1.4"
  445 +127.0.0.1 - - [15/Oct/2015:19:17:12 +0800] "GET /guang/plusstar/list HTTP/1.1" 200 105015 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  446 +127.0.0.1 - - [15/Oct/2015:19:17:12 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/guang/plusstar/list" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  447 +127.0.0.1 - - [15/Oct/2015:19:17:19 +0800] "GET /guang/plusstar/detail HTTP/1.1" 302 5 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  448 +127.0.0.1 - - [15/Oct/2015:19:17:19 +0800] "GET /error.html HTTP/1.1" 404 5 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  449 +127.0.0.1 - - [15/Oct/2015:19:17:35 +0800] "-" 400 0 "-" "-"
  450 +127.0.0.1 - - [15/Oct/2015:19:17:59 +0800] "GET /guang/plusstar/list HTTP/1.1" 200 105015 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  451 +127.0.0.1 - - [15/Oct/2015:19:17:59 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/guang/plusstar/list" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  452 +127.0.0.1 - - [15/Oct/2015:19:18:34 +0800] "GET /guang/plusstar/detail HTTP/1.1" 302 5 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  453 +127.0.0.1 - - [15/Oct/2015:19:18:34 +0800] "GET /error.html HTTP/1.1" 404 5 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  454 +127.0.0.1 - - [15/Oct/2015:19:18:41 +0800] "GET /guang/plusstar/list HTTP/1.1" 200 105015 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  455 +127.0.0.1 - - [15/Oct/2015:19:18:41 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/guang/plusstar/list" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  456 +127.0.0.1 - - [15/Oct/2015:19:19:12 +0800] "GET /guang/detail HTTP/1.1" 404 142 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  457 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /guang/detail/index HTTP/1.1" 200 12967 "-" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  458 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /css/index.css HTTP/1.1" 200 55218 "http://m.dev.yohobuy.com/guang/detail/index" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  459 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /font/iconfont.woff?1444716801 HTTP/1.1" 200 7740 "http://static.dev.yohobuy.com/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  460 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /img/guang/thumb-container-bg.png?1444811080 HTTP/1.1" 200 5320 "http://static.dev.yohobuy.com/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  461 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /img/guang/clothes-se45f5825d0.png HTTP/1.1" 200 12855 "http://static.dev.yohobuy.com/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  462 +127.0.0.1 - - [15/Oct/2015:19:19:19 +0800] "GET /img/guang/tag.png?1444811080 HTTP/1.1" 200 2196 "http://static.dev.yohobuy.com/css/index.css" "Mozilla/5.0 (iPhone; CPU iPhone OS 7_0 like Mac OS X; en-us) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11A465 Safari/9537.53"
  1 +.h5-footer {
  2 + font-size: 12px;
  3 + background-color: #fff;
  4 + z-index: 100;
  5 +
  6 + a {
  7 + color: #000;
  8 + }
  9 +
  10 + .user-name {
  11 + margin: 0 (24rem / $pxConvertRem) 0 0;
  12 + text-decoration: underline;
  13 + }
  14 +
  15 + .op-row {
  16 + position: relative;
  17 + padding: 0 (30rem / $pxConvertRem);
  18 + height: 60rem / $pxConvertRem;
  19 + line-height: 60rem / $pxConvertRem;
  20 + }
  21 +
  22 + .back-to-top {
  23 + position: absolute;
  24 + right: 20rem / $pxConvertRem;
  25 + }
  26 +
  27 + .copyright {
  28 + height: 60rem / $pxConvertRem;
  29 + line-height: 60rem / $pxConvertRem;
  30 + text-align: center;
  31 + color: #666;
  32 + border-top: 1px solid #ccc;
  33 + background-color: #eee;
  34 + }
  35 +}
1 -.goods-nav {  
2 - position: relative;  
3 - width: 100%;  
4 - height: 67rem / $pxConvertRem;  
5 - background: #fff;  
6 - text-align: center;  
7 - overflow: hidden;  
8 -  
9 - &:after {  
10 - content: '';  
11 - position: absolute;  
12 - left: 0;  
13 - bottom: 0;  
14 - width: 100%;  
15 - border-top: 1px solid #e6e6e6;  
16 - }  
17 -  
18 - .swiper-wrapper {  
19 - white-space: nowrap;  
20 - }  
21 -  
22 - li {  
23 - display: inline-block;  
24 - width: auto;  
25 - margin: 0 0 0 (34.4rem / $pxConvertRem);  
26 - font-size: 28rem / $pxConvertRem;  
27 - padding: 0 (6rem / $pxConvertRem);  
28 - height: 67rem / $pxConvertRem;  
29 - line-height: 67rem / $pxConvertRem;  
30 - color: #999;  
31 -  
32 - // border-bottom: (4rem / $pxConvertRem) solid transparent;  
33 - span {  
34 - display: inline-block;  
35 - }  
36 -  
37 - .sort {  
38 - width: 24rem / $pxConvertRem;  
39 - vertical-align: middle;  
40 - }  
41 -  
42 - .iconfont {  
43 - display: block;  
44 - font-size: 26rem / $pxConvertRem;  
45 - height: 30rem / $pxConvertRem;  
46 - line-height: 40rem / $pxConvertRem;  
47 -  
48 - &.down {  
49 - line-height: 30rem / $pxConvertRem;  
50 - }  
51 -  
52 - &.up + .down {  
53 - line-height: 20rem / $pxConvertRem;  
54 - }  
55 - }  
56 - }  
57 -  
58 - li.focus {  
59 - color: #000; 1 +.newarrival-page {
  2 + background-color: #f0f0f0;
60 3
61 - &:after {  
62 - content: '';  
63 - position: absolute;  
64 - left: 0;  
65 - bottom: 0; 4 + .newarrival-nav {
66 width: 100%; 5 width: 100%;
67 - border-top: (4rem / $pxConvertRem) solid #000;  
68 - z-index: 1; 6 + height: 60rem / $pxConvertRem;
  7 + padding: 10rem / $pxConvertRem 0;
  8 + background-color: #fff;
69 } 9 }
70 10
71 - .sort {  
72 - .iconfont {  
73 - color: #c0c0c0;  
74 -  
75 - &.cur {  
76 - color: #000;  
77 - }  
78 - }  
79 - }  
80 - }  
81 -  
82 - .screen-nav {  
83 - .iconfont {  
84 - line-height: 30rem / $pxConvertRem;  
85 - transition: transform .1s ease-in;  
86 - transform: scale(0.83);  
87 - } 11 + .newarrival-nav-item {
  12 + box-sizing: border-box;
  13 + float: left;
  14 + width: 50%;
  15 + height: 60rem / $pxConvertRem;
  16 + line-height: 60rem / $pxConvertRem;
  17 + font-size: 16px;
  18 + text-align: center;
  19 + color: #ccc;
88 20
89 &.focus { 21 &.focus {
90 - .iconfont {  
91 - transform: scale(0.83) rotate(-180deg);  
92 - -webkit-transform: scale(0.83) rotate(-180deg);  
93 - color: #000 !important;  
94 - }  
95 - } 22 + color: #000;
96 } 23 }
97 -}  
98 24
99 -.s-goods-nav {  
100 - li {  
101 - float: left;  
102 - display: inline; 25 + &:first-child {
  26 + border-right: 1px solid #ccc;
103 } 27 }
104 -}  
105 -  
106 -.size-nav {  
107 - height: 49rem / $pxConvertRem;  
108 - line-height: 49rem / $pxConvertRem;  
109 - background: #f0f0f0;  
110 - border-bottom: (2rem / $pxConvertRem) solid #e6e6e6;  
111 - overflow: hidden;  
112 -  
113 - li {  
114 - float: left;  
115 - width: auto;  
116 - padding: 0 (25rem / $pxConvertRem);  
117 - font-size: 28rem / $pxConvertRem;  
118 - color: #999;  
119 } 28 }
120 29
121 - li.focus {  
122 - color: #000;  
123 - }  
124 } 30 }
  1 +.header-banner {
  2 + position: relative;
  3 + width: 100%;
  4 + height: 200rem / $pxConvertRem;
  5 + overflow: hidden;
  6 + .swiper-wrapper{
  7 + position: relative;
  8 + width: 100%;
  9 + height: 100%;
  10 + }
  11 + .swiper-slide{
  12 + float: left;
  13 + width: 100%;
  14 + height: 100%;
  15 + }
  16 + img {
  17 + display: block;
  18 + width: 100%;
  19 + height: 100%;
  20 + }
  21 + .desc {
  22 + box-sizing: border-box;
  23 + position:absolute;
  24 + left: 0;
  25 + bottom: 0;
  26 + padding-right: 30rem/$pxConvertRem;
  27 + width: 100%;
  28 + font-size: 22rem/$pxConvertRem;
  29 + line-height: 50rem/$pxConvertRem;
  30 + color: #fff;
  31 + background: rgba(120,120,120,.5);
  32 + text-align: right;
  33 + }
  34 +}
@@ -3,11 +3,14 @@ @@ -3,11 +3,14 @@
3 background: #fff; 3 background: #fff;
4 4
5 li { 5 li {
  6 + height: 230rem / $pxConvertRem;
  7 + overflow: hidden;
  8 +
6 .item-img { 9 .item-img {
7 float: left; 10 float: left;
8 width: 150rem / $pxConvertRem; 11 width: 150rem / $pxConvertRem;
9 height: 200rem / $pxConvertRem; 12 height: 200rem / $pxConvertRem;
10 - padding: (12rem / $pxConvertRem) 0; 13 + padding: (14rem / $pxConvertRem) 0;
11 line-height: 200rem / $pxConvertRem; 14 line-height: 200rem / $pxConvertRem;
12 text-align: center; 15 text-align: center;
13 16
@@ -23,36 +26,48 @@ @@ -23,36 +26,48 @@
23 width: 407rem / $pxConvertRem; 26 width: 407rem / $pxConvertRem;
24 height: 213rem / $pxConvertRem; 27 height: 213rem / $pxConvertRem;
25 margin: 0 0 0 (13rem / $pxConvertRem); 28 margin: 0 0 0 (13rem / $pxConvertRem);
26 - padding: (12rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem); 29 + padding: (14rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem);
27 border-top: 1px solid #e0e0e0; 30 border-top: 1px solid #e0e0e0;
  31 + overflow: hidden;
28 32
29 .rank-icon { 33 .rank-icon {
30 display: block; 34 display: block;
31 - height: 50rem / $pxConvertRem; 35 + height: 45rem / $pxConvertRem;
32 width: 50rem / $pxConvertRem; 36 width: 50rem / $pxConvertRem;
33 - line-height: 58rem / $pxConvertRem; 37 + line-height: 50rem / $pxConvertRem;
34 text-align: center; 38 text-align: center;
35 font-size: 22rem / $pxConvertRem; 39 font-size: 22rem / $pxConvertRem;
36 color: #fff; 40 color: #fff;
37 background: image-url("sale-icon/rank.png") no-repeat; 41 background: image-url("sale-icon/rank.png") no-repeat;
38 - background-size: 100%; 42 + background-position: center top;
  43 + background-size: auto 100%;
39 44
40 &.top { 45 &.top {
41 background: image-url("sale-icon/rank-t.png") no-repeat; 46 background: image-url("sale-icon/rank-t.png") no-repeat;
  47 + background-position: center top;
42 background-size: 100%; 48 background-size: 100%;
  49 + line-height: 58rem / $pxConvertRem;
43 } 50 }
44 } 51 }
45 52
46 h2 { 53 h2 {
  54 + margin: (15rem / $pxConvertRem) 0 0 !important;
  55 + padding: 0 !important;
47 width: 9.5rem; 56 width: 9.5rem;
48 - line-height: 1.285; 57 + line-height: 36rem / $pxConvertRem;
49 color: #444; 58 color: #444;
50 font-size: 28rem / $pxConvertRem; 59 font-size: 28rem / $pxConvertRem;
  60 +
  61 + &.hasActive {
  62 + margin: (5rem / $pxConvertRem) 0 0 !important;
  63 + }
51 } 64 }
52 65
53 p { 66 p {
  67 + margin: 0 !important;
  68 + padding: 0 !important;
54 width: 9.5rem; 69 width: 9.5rem;
55 - line-height: 1.5; 70 + line-height: 36rem / $pxConvertRem;
56 font-size: 24rem / $pxConvertRem; 71 font-size: 24rem / $pxConvertRem;
57 color: #d0021b; 72 color: #d0021b;
58 text-overflow: ellipsis; 73 text-overflow: ellipsis;
1 -@import "list-nav";  
  1 +@import "list-nav","header","header-banner","sale","floor-header","goods-nav","goods-container","discount","footer","goods-group","goods-item","hot-rank","only-for-member";
1 {{>layout/header}} 1 {{>layout/header}}
2 - 2 +<div class="newarrival-page yoho-page">
3 {{# headerBanner}} 3 {{# headerBanner}}
4 - {{> common/banner_top}} 4 + <ul id="newarrival-nav" class="newarrival-nav clearfix">
  5 + {{# tabs}}
  6 + <li class="newarrival-nav-item">{{title}}</li>
  7 + {{/ tabs}}
  8 + </ul>
5 {{/ headerBanner}} 9 {{/ headerBanner}}
6 10
  11 + <div class="new-arrival ps-block">
  12 + <div class="new-arrival-content clearfix">
  13 + {{# goodsContainer}}
  14 + {{> good}}
  15 + {{/ goodsContainer}}
  16 + </div>
7 17
  18 + </div>
8 19
  20 +</div>
9 {{>layout/footer}} 21 {{>layout/footer}}
10 22
  1 +{{>layout/header}}
  2 +
  3 +
  4 +
  5 +{{>layout/footer}}
1 6
2 - {{> newsale/header}}  
3 - {{> newsale/header_banner}}  
4 - {{# saleSection}}  
5 - <div class="sale-section">  
6 - <ul class="clearfix">  
7 - {{# list}}  
8 - <li>  
9 - <a href="{{url}}">  
10 - <img src="{{img}}" alt="">  
11 - </a>  
12 - </li>  
13 - {{/ list}}  
14 - </ul>  
15 - </div>  
16 - {{/ saleSection}}  
17 - {{# latestSale}}  
18 - {{> newsale/floor_header}}  
19 - {{/ latestSale}}  
20 - {{# goodsNav}}  
21 - {{> newsale/goods_nav}}  
22 - {{/ goodsNav}}  
23 - {{> newsale/goods_container}}  
24 7
1 -{{# goodsContainer}}  
2 -<div id="goods-content" class="goods-content {{# vipNoLogin}}vip-no-login{{/ vipNoLogin}} {{# vipLogin}}vip-card vip-{{.}}{{/ vipLogin}} clearfix">  
3 - {{> common/script_good_info}}  
4 - <div class="new-patterns-container hide">  
5 - {{# goods}}  
6 - {{> common/good_info}}  
7 - {{/ goods}}  
8 - </div>  
9 - <div class="sales-volume-container hide"></div>  
10 - <div class="price-container hide"></div>  
11 - <div class="cloth-container hide"></div>  
12 - <div class="pants-container hide"></div>  
13 - <div class="shose-container hide"></div>  
14 - <div class="other-container hide"></div>  
15 - <div id="screen-mask" class="screen-mask hide"></div>  
16 - <div id="screen-content" class="screen-content hide clearfix">  
17 - <ul class="classify">  
18 - <li class="gender c-item active">  
19 - 性别：  
20 - <h1 id="show-gender" class="chosed default">BOYS</h1>  
21 - </li>  
22 - <li class="brand c-item">  
23 - 品牌：  
24 - <h1 id="show-brand" class="chosed default">全部品牌</h1>  
25 - </li>  
26 - <li class="msort c-item">  
27 - 品类：  
28 - <h1 id="show-msort" class="chosed default">全部品类</h1>  
29 - </li>  
30 - <li class="color c-item">  
31 - 颜色：  
32 - <h1 id="show-color" class="chosed default">全部颜色</h1>  
33 - </li>  
34 - <li class="size c-item">  
35 - 尺码：  
36 - <h1 id="show-size" class="chosed default">全部尺码</h1>  
37 - </li>  
38 - <li class="price c-item">  
39 - 价格：  
40 - <h1 id="show-price" class="chosed default">全部价格</h1>  
41 - </li>  
42 - <li class="discount c-item">  
43 - 折扣：  
44 - <h1 id="show-discount" class="chosed default">全部折扣</h1>  
45 - </li>  
46 - </ul>  
47 - <div class="sub-classify-container">  
48 - <ul id="sub-gender" class="sub-classify" data-type="gender"></ul>  
49 - <ul id="sub-brand" class="sub-classify hide" data-type="brand"></ul>  
50 - <ul id="sub-msort" class="sub-classify hide" data-type="msort"></ul>  
51 - <ul id="sub-color" class="sub-classify hide" data-type="color"></ul>  
52 - <ul id="sub-size" class="sub-classify hide" data-type="size"></ul>  
53 - <ul id="sub-price" class="sub-classify hide" data-type="price"></ul>  
54 - <ul id="sub-discount" class="sub-classify hide" data-type="discount"></ul>  
55 - </div>  
56 - </div>  
57 -</div>  
58 -{{/ goodsContainer}}  
1 -<ul id="goods-nav" class="goods-nav">  
2 - {{# all}}  
3 - <li class="nav-item all-nav focus">  
4 - <span>全部</span>  
5 - </li>  
6 - {{/ all}}  
7 - {{# newPatterns}}  
8 - <li class="nav-item new-patterns-nav focus">  
9 - <span>最新</span>  
10 - </li>  
11 - {{/ newPatterns}}  
12 - {{# price}}  
13 - <li class="nav-item price-nav">  
14 - <span>价格</span>  
15 - <span class="sort">  
16 - <i class="up iconfont">&#xe615;</i>  
17 - <i class="down iconfont cur">&#xe616;</i>  
18 - </span>  
19 - </li>  
20 - {{/ price}}  
21 - {{# salesCount}}  
22 - <li class="nav-item sales-count-nav">  
23 - <span>销量</span>  
24 - </li>  
25 - {{/ salesCount}}  
26 - {{# salesVolume}}  
27 - <li class="nav-item sales-volume-nav">  
28 - <span>折扣</span>  
29 - <span class="sort">  
30 - <i class="up iconfont">&#xe615;</i>  
31 - <i class="down iconfont cur">&#xe616;</i>  
32 - </span>  
33 - </li>  
34 - {{/ salesVolume}}  
35 -  
36 - {{# cloth}}  
37 - <li class="nav-item cloth-nav">  
38 - <span>上装</span>  
39 - </li>  
40 - {{/ cloth}}  
41 -  
42 - {{# pants}}  
43 - <li class="nav-item pants-nav">  
44 - <span>下装</span>  
45 - </li>  
46 - {{/ pants}}  
47 -  
48 - {{# shoes}}  
49 - <li class="nav-item shose-nav">  
50 - <span>鞋</span>  
51 - </li>  
52 - {{/ shoes}}  
53 -  
54 - {{# other}}  
55 - <li class="nav-item other-nav">  
56 - <span>其他</span>  
57 - </li>  
58 - {{/ other}}  
59 -  
60 - {{# screen}}  
61 - <li class="nav-item screen-nav">  
62 - <span>筛选</span>  
63 - <span class="sort">  
64 - <i class="iconfont">&#xe613;</i>  
65 - </span>  
66 - </li>  
67 - {{/ screen}}  
68 -</ul>  
69 -{{# sizeNav}}  
70 -<div id="size-nav" class="size-nav swiper-container">  
71 - <ul class="swiper-wrapper">  
72 - {{# list}}  
73 - <li class="size-nav-item swiper-slide" data-size="{{size}}">{{textCn}}</li>  
74 - {{/ list}}  
75 - </ul>  
76 -</div>  
77 -  
78 -{{/ sizeNav}}  
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 use Action\AbstractAction; 3 use Action\AbstractAction;
4 use LibModels\wap\Product\NewsaleData as Newsale; 4 use LibModels\wap\Product\NewsaleData as Newsale;
5 -use Plugin\DataProcess\NewSaleProcess; 5 +use Plugin\Helpers;
6 /** 6 /**
7 * 新品到着 7 * 新品到着
8 */ 8 */
@@ -10,11 +10,7 @@ class NewsaleController extends AbstractAction @@ -10,11 +10,7 @@ class NewsaleController extends AbstractAction
10 { 10 {
11 public function indexAction() 11 public function indexAction()
12 { 12 {
13 - $data = array(  
14 - 'header' => array(  
15 - 'title' => '新品到着'  
16 - )  
17 - ); 13 + /*$this->_view->assign('title', '新品到着');
18 14
19 // 新品到着顶部焦点图 15 // 新品到着顶部焦点图
20 $focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d'); 16 $focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d');
@@ -22,16 +18,94 @@ class NewsaleController extends AbstractAction @@ -22,16 +18,94 @@ class NewsaleController extends AbstractAction
22 $focus = array(); 18 $focus = array();
23 if($focusData['code'] == 200) 19 if($focusData['code'] == 200)
24 { 20 {
25 - $focus = $focusData['data']; 21 + foreach ($focusData['data'] as $single)
  22 + {
  23 + foreach ($single['data'] as $val) {
  24 + $val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
  25 + $focus[] = $val;
  26 + }
26 } 27 }
  28 + }
  29 +
27 // 批量获取新品到着商品数据 30 // 批量获取新品到着商品数据
28 $products = Newsale::getNewProducts('1,3', 1, 60); 31 $products = Newsale::getNewProducts('1,3', 1, 60);
  32 + var_dump($focus);
29 33
30 - // 添加商品数据  
31 - $data += NewSaleProcess::newSaleData($focus, $products); 34 + $this->_view->display('new', compact('focus', 'products'));*/
32 35
33 - echo '<pre>';  
34 - print_r($data);exit; 36 + $data = array(
  37 + 'headerBanner' => array(
  38 + 'list' => array(
  39 + array(
  40 + 'url' => '',
  41 + 'img' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  42 + )
  43 + )
  44 + ),
  45 + 'tabs' => array(
  46 + array(
  47 + 'title' => '10月15日',
  48 + ),
  49 + array(
  50 + 'title' => '本周上新'
  51 + ),
  52 + array(
  53 + 'title' => '销量'
  54 + )
  55 + ),
  56 + 'goodsContainer' => array(
  57 + 'goods' => array(
  58 + array(
  59 + 'id' => '',
  60 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  61 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  62 + 'isLike' => false,
  63 + 'price' => 1268,
  64 + 'salePrice' => 589,
  65 + 'isSale' => true,
  66 + 'isFew' => true,
  67 + 'isNew' => false,
  68 + 'url' => ''
  69 + ),
  70 + array(
  71 + 'id' => '',
  72 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  73 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  74 + 'isLike' => false,
  75 + 'price' => 1268,
  76 + 'salePrice' => 589,
  77 + 'isSale' => true,
  78 + 'isFew' => true,
  79 + 'isNew' => false,
  80 + 'url' => ''
  81 + ),
  82 + array(
  83 + 'id' => '',
  84 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  85 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  86 + 'isLike' => false,
  87 + 'price' => 1268,
  88 + 'salePrice' => 589,
  89 + 'isSale' => true,
  90 + 'isFew' => true,
  91 + 'isNew' => false,
  92 + 'url' => ''
  93 + ),
  94 + array(
  95 + 'id' => '',
  96 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  97 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  98 + 'isLike' => false,
  99 + 'price' => 1268,
  100 + 'salePrice' => 589,
  101 + 'isSale' => true,
  102 + 'isFew' => true,
  103 + 'isNew' => false,
  104 + 'url' => ''
  105 + )
  106 + )
  107 + )
  108 + );
35 109
36 $this->_view->assign('title', '新品到着'); 110 $this->_view->assign('title', '新品到着');
37 $this->_view->display('new', $data); 111 $this->_view->display('new', $data);
@@ -65,36 +139,91 @@ class NewsaleController extends AbstractAction @@ -65,36 +139,91 @@ class NewsaleController extends AbstractAction
65 } 139 }
66 } 140 }
67 141
68 - /**  
69 - * 折扣专区  
70 - */ 142 +
71 public function discountAction() 143 public function discountAction()
72 { 144 {
73 145
74 $data = array( 146 $data = array(
75 'header' => array( 147 'header' => array(
76 - 'title' => '折扣专区' 148 + 'title' => 'SALE'
  149 + ),
  150 +
  151 + 'goodsContainer' => array(
  152 + 'goods' => array(
  153 + array(
  154 + 'id' => '',
  155 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  156 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  157 + 'isLike' => false,
  158 + 'price' => 1268,
  159 + 'salePrice' => 589,
  160 + 'isSale' => true,
  161 + 'isFew' => true,
  162 + 'isNew' => false,
  163 + 'url' => ''
  164 + ),
  165 + array(
  166 + 'id' => '',
  167 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  168 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  169 + 'isLike' => false,
  170 + 'price' => 1268,
  171 + 'salePrice' => 589,
  172 + 'isSale' => true,
  173 + 'isFew' => true,
  174 + 'isNew' => false,
  175 + 'url' => ''
  176 + ),
  177 + array(
  178 + 'id' => '',
  179 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  180 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  181 + 'isLike' => false,
  182 + 'price' => 1268,
  183 + 'salePrice' => 589,
  184 + 'isSale' => true,
  185 + 'isFew' => true,
  186 + 'isNew' => false,
  187 + 'url' => ''
  188 + ),
  189 + array(
  190 + 'id' => '',
  191 + 'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
  192 + 'name' => 'GAWS DIGI 丛林数码印花拼接卫衣',
  193 + 'isLike' => false,
  194 + 'price' => 1268,
  195 + 'salePrice' => 589,
  196 + 'isSale' => true,
  197 + 'isFew' => true,
  198 + 'isNew' => false,
  199 + 'url' => ''
  200 + )
  201 + )
77 ) 202 )
78 ); 203 );
79 204
  205 + /*$this->_view->assign('title', '折扣专区');
  206 +
80 // 折扣专区顶部焦点图 207 // 折扣专区顶部焦点图
81 $focusData = Newsale::getNewsaleFocus('e9c9be32d72e2906d404a72ee24cb523'); 208 $focusData = Newsale::getNewsaleFocus('e9c9be32d72e2906d404a72ee24cb523');
82 // 处理返回的数据 209 // 处理返回的数据
83 $focus = array(); 210 $focus = array();
84 if($focusData['code'] == 200) 211 if($focusData['code'] == 200)
85 { 212 {
86 - $focus = $focusData['data']; 213 + foreach ($focusData['data'] as $single)
  214 + {
  215 + foreach ($single['data'] as $val) {
  216 + $val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
  217 + $focus[] = $val;
  218 + }
  219 + }
87 } 220 }
88 - // 折扣专区商品数据  
89 - $products = Newsale::getSaleProducts('1,3', 1);  
90 221
91 - // 更新tabs  
92 - $data += array('tabs' => array_keys($products));  
93 - // 添加商品数据  
94 - $data += NewSaleProcess::newSaleData($focus, $products); 222 + // 折扣专区商品数据
  223 + $products = Newsale::getNewProducts('1,3', 1, 60);
  224 + var_dump($products);
95 225
96 - echo '<pre>';  
97 - var_dump($data);exit; 226 + $this->_view->display('new', compact('focus', 'products'));*/
98 227
99 $this->_view->assign('title', '折扣专区'); 228 $this->_view->assign('title', '折扣专区');
100 $this->_view->display('sale', $data); 229 $this->_view->display('sale', $data);