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

@@ -408,3 +408,55 @@
 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"
 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"
 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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+127.0.0.1 - - [15/Oct/2015:17:14:42 +0800] "-" 400 0 "-" "-"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+127.0.0.1 - - [15/Oct/2015:19:17:35 +0800] "-" 400 0 "-" "-"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"
+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"

+.h5-footer {
+    font-size: 12px;
+    background-color: #fff;
+    z-index: 100;
+
+    a {
+        color: #000;
+    }
+
+    .user-name {
+        margin: 0 (24rem / $pxConvertRem) 0 0;
+        text-decoration: underline;
+    }
+
+    .op-row {
+        position: relative;
+        padding: 0 (30rem / $pxConvertRem);
+        height: 60rem / $pxConvertRem;
+        line-height: 60rem / $pxConvertRem;
+    }
+
+    .back-to-top {
+        position: absolute;
+        right: 20rem / $pxConvertRem;
+    }
+
+    .copyright {
+        height: 60rem / $pxConvertRem;
+        line-height: 60rem / $pxConvertRem;
+        text-align: center;
+        color: #666;
+        border-top: 1px solid #ccc;
+        background-color: #eee;
+    }
+}
\ No newline at end of file

-.goods-nav {
-    position: relative;
-    width: 100%;
-    height: 67rem / $pxConvertRem;
-    background: #fff;
-    text-align: center;
-    overflow: hidden;
-
-    &:after {
-        content: '';
-        position: absolute;
-        left: 0;
-        bottom: 0;
+.newarrival-page {
+    background-color: #f0f0f0;
+ 
+    .newarrival-nav {
         width: 100%;
-        border-top: 1px solid #e6e6e6;
-    }
-
-    .swiper-wrapper {
-        white-space: nowrap;
-    }
-
-    li {
-        display: inline-block;
-        width: auto;
-        margin: 0 0 0 (34.4rem / $pxConvertRem);
-        font-size: 28rem / $pxConvertRem;
-        padding: 0 (6rem / $pxConvertRem);
-        height: 67rem / $pxConvertRem;
-        line-height: 67rem / $pxConvertRem;
-        color: #999;
-
-        // border-bottom: (4rem / $pxConvertRem) solid transparent;
-        span {
-            display: inline-block;
-        }
-
-        .sort {
-            width: 24rem / $pxConvertRem;
-            vertical-align: middle;
-        }
-
-        .iconfont {
-            display: block;
-            font-size: 26rem / $pxConvertRem;
-            height: 30rem / $pxConvertRem;
-            line-height: 40rem / $pxConvertRem;
-
-            &.down {
-                line-height: 30rem / $pxConvertRem;
-            }
-
-            &.up + .down {
-                line-height: 20rem / $pxConvertRem;
-            }
-        }
-    }
-
-    li.focus {
-        color: #000;
-
-        &:after {
-            content: '';
-            position: absolute;
-            left: 0;
-            bottom: 0;
-            width: 100%;
-            border-top: (4rem / $pxConvertRem) solid #000;
-            z-index: 1;
-        }
-
-        .sort {
-            .iconfont {
-                color: #c0c0c0;
-
-                &.cur {
-                    color: #000;
-                }
-            }
-        }
+        height: 60rem / $pxConvertRem;
+        padding: 10rem / $pxConvertRem 0;
+        background-color: #fff;
     }
 
-    .screen-nav {
-        .iconfont {
-            line-height: 30rem / $pxConvertRem;
-            transition: transform .1s ease-in;
-            transform: scale(0.83);
-        }
+    .newarrival-nav-item {
+        box-sizing: border-box;
+        float: left;
+        width: 50%;
+        height: 60rem / $pxConvertRem;
+        line-height: 60rem / $pxConvertRem;
+        font-size: 16px;
+        text-align: center;
+        color: #ccc;
 
         &.focus {
-            .iconfont {
-                transform: scale(0.83) rotate(-180deg);
-                -webkit-transform: scale(0.83) rotate(-180deg);
-                color: #000 !important;
-            }
+            color: #000;
         }
-    }
-}
 
-.s-goods-nav {
-    li {
-        float: left;
-        display: inline;
+        &:first-child {
+            border-right: 1px solid #ccc;
+        }
     }
+ 
 }
-
-.size-nav {
-    height: 49rem / $pxConvertRem;
-    line-height: 49rem / $pxConvertRem;
-    background: #f0f0f0;
-    border-bottom: (2rem / $pxConvertRem) solid #e6e6e6;
-    overflow: hidden;
-
-    li {
-        float: left;
-        width: auto;
-        padding: 0 (25rem / $pxConvertRem);
-        font-size: 28rem / $pxConvertRem;
-        color: #999;
-    }
-
-    li.focus {
-        color: #000;
-    }
-}
\ No newline at end of file

+.header-banner {
+    position: relative;
+    width: 100%;
+    height: 200rem / $pxConvertRem;
+    overflow: hidden;
+    .swiper-wrapper{
+        position: relative;
+        width: 100%;
+        height: 100%;
+    }
+    .swiper-slide{
+        float: left;
+        width: 100%;
+        height: 100%;
+    }
+    img {
+        display: block;
+        width: 100%;
+        height: 100%;
+    }
+    .desc {
+        box-sizing: border-box;
+        position:absolute;
+        left: 0;
+        bottom: 0;
+        padding-right: 30rem/$pxConvertRem;
+        width: 100%;
+        font-size: 22rem/$pxConvertRem;
+        line-height: 50rem/$pxConvertRem;
+        color: #fff;
+        background: rgba(120,120,120,.5);
+        text-align: right;
+    }
+}
\ No newline at end of file

@@ -3,11 +3,14 @@
     background: #fff;
 
     li {
+        height: 230rem / $pxConvertRem;
+        overflow: hidden;
+
         .item-img {
             float: left;
             width: 150rem / $pxConvertRem;
             height: 200rem / $pxConvertRem;
-            padding: (12rem / $pxConvertRem) 0;
+            padding: (14rem / $pxConvertRem) 0;
             line-height: 200rem / $pxConvertRem;
             text-align: center;
 
@@ -23,36 +26,48 @@
             width: 407rem / $pxConvertRem;
             height: 213rem / $pxConvertRem;
             margin: 0 0 0 (13rem / $pxConvertRem);
-            padding: (12rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem);
+            padding: (14rem / $pxConvertRem) 0 0 (30rem / $pxConvertRem);
             border-top: 1px solid #e0e0e0;
+            overflow: hidden;
 
             .rank-icon {
                 display: block;
-                height: 50rem / $pxConvertRem;
+                height: 45rem / $pxConvertRem;
                 width: 50rem / $pxConvertRem;
-                line-height: 58rem / $pxConvertRem;
+                line-height: 50rem / $pxConvertRem;
                 text-align: center;
                 font-size: 22rem / $pxConvertRem;
                 color: #fff;
                 background: image-url("sale-icon/rank.png") no-repeat;
-                background-size: 100%;
+                background-position: center top;
+                background-size: auto 100%;
 
                 &.top {
                     background: image-url("sale-icon/rank-t.png") no-repeat;
+                    background-position: center top;
                     background-size: 100%;
+                    line-height: 58rem / $pxConvertRem;
                 }
             }
 
             h2 {
+                margin: (15rem / $pxConvertRem) 0 0 !important;
+                padding: 0 !important;
                 width: 9.5rem;
-                line-height: 1.285;
+                line-height: 36rem / $pxConvertRem;
                 color: #444;
                 font-size: 28rem / $pxConvertRem;
+
+                &.hasActive {
+                    margin: (5rem / $pxConvertRem) 0 0 !important;
+                }
             }
 
             p {
+                margin: 0 !important;
+                padding: 0 !important;
                 width: 9.5rem;
-                line-height: 1.5;
+                line-height: 36rem / $pxConvertRem;
                 font-size: 24rem / $pxConvertRem;
                 color: #d0021b;
                 text-overflow: ellipsis;

-@import "list-nav";
\ No newline at end of file
+@import "list-nav","header","header-banner","sale","floor-header","goods-nav","goods-container","discount","footer","goods-group","goods-item","hot-rank","only-for-member";
\ No newline at end of file

 {{>layout/header}}
-
+<div class="newarrival-page yoho-page">
 {{# headerBanner}}
-      {{> common/banner_top}}
+     <ul id="newarrival-nav" class="newarrival-nav clearfix">
+        {{# tabs}}
+             <li class="newarrival-nav-item">{{title}}</li>
+        {{/ tabs}}
+    </ul>
 {{/ headerBanner}}
  
- 
-
+      <div class="new-arrival ps-block">            
+                <div class="new-arrival-content clearfix">
+                    {{# goodsContainer}}
+                        {{> good}}
+                    {{/ goodsContainer}}
+                </div>
+              
+     </div>
+      
+</div>
 {{>layout/footer}}
 

+{{>layout/header}}
+
  
-    {{> newsale/header}}
-    {{> newsale/header_banner}}
-    {{# saleSection}}
-    <div class="sale-section">
-        <ul class="clearfix">
-            {{# list}}
-            <li>
-                <a href="{{url}}">
-                    <img src="{{img}}" alt="">
-                </a>
-            </li>
-            {{/ list}}
-        </ul>
-    </div>
-    {{/ saleSection}}
-    {{# latestSale}}
-        {{> newsale/floor_header}}
-    {{/ latestSale}}
-    {{# goodsNav}}
-        {{> newsale/goods_nav}}
-    {{/ goodsNav}}
-    {{> newsale/goods_container}}
+
+{{>layout/footer}}
+
  
\ No newline at end of file

-{{# goodsContainer}}
-<div id="goods-content" class="goods-content {{# vipNoLogin}}vip-no-login{{/ vipNoLogin}} {{# vipLogin}}vip-card vip-{{.}}{{/ vipLogin}} clearfix">
-    {{> common/script_good_info}}
-    <div class="new-patterns-container hide">
-        {{# goods}}
-        {{> common/good_info}}
-        {{/ goods}}
-    </div>
-    <div class="sales-volume-container hide"></div>
-    <div class="price-container hide"></div>
-    <div class="cloth-container hide"></div>
-    <div class="pants-container hide"></div>
-    <div class="shose-container hide"></div>
-    <div class="other-container hide"></div>
-    <div id="screen-mask" class="screen-mask hide"></div>
-    <div id="screen-content" class="screen-content hide clearfix">
-        <ul class="classify">
-            <li class="gender c-item active">
-                性别：
-                <h1 id="show-gender" class="chosed default">BOYS</h1>
-            </li>
-            <li class="brand c-item">
-                品牌：
-                <h1 id="show-brand" class="chosed default">全部品牌</h1>
-            </li>
-            <li class="msort c-item">
-                品类：
-                <h1 id="show-msort" class="chosed default">全部品类</h1>
-            </li>
-            <li class="color c-item">
-                颜色：
-                <h1 id="show-color" class="chosed default">全部颜色</h1>
-            </li>
-            <li class="size c-item">
-                尺码：
-                <h1 id="show-size" class="chosed default">全部尺码</h1>
-            </li>
-            <li class="price c-item">
-                价格：
-                <h1 id="show-price" class="chosed default">全部价格</h1>
-            </li>
-            <li class="discount c-item">
-                折扣：
-                <h1 id="show-discount" class="chosed default">全部折扣</h1>
-            </li>
-        </ul>
-        <div class="sub-classify-container">
-            <ul id="sub-gender" class="sub-classify" data-type="gender"></ul>
-            <ul id="sub-brand" class="sub-classify hide" data-type="brand"></ul>
-            <ul id="sub-msort" class="sub-classify hide" data-type="msort"></ul>
-            <ul id="sub-color" class="sub-classify hide" data-type="color"></ul>
-            <ul id="sub-size" class="sub-classify hide" data-type="size"></ul>
-            <ul id="sub-price" class="sub-classify hide" data-type="price"></ul>
-            <ul id="sub-discount" class="sub-classify hide" data-type="discount"></ul>
-        </div>
-    </div>
-</div>
-{{/ goodsContainer}}
\ No newline at end of file

-<ul id="goods-nav" class="goods-nav">
-    {{# all}}
-        <li class="nav-item all-nav focus">
-            <span>全部</span>
-        </li>
-    {{/ all}}
-    {{# newPatterns}}
-        <li class="nav-item new-patterns-nav focus">
-            <span>最新</span>
-        </li>
-    {{/ newPatterns}}
-    {{# price}}
-        <li class="nav-item price-nav">
-            <span>价格</span>
-            <span class="sort">
-                <i class="up iconfont">&#xe615;</i>
-                <i class="down iconfont cur">&#xe616;</i>
-            </span>
-        </li>  
-    {{/ price}}
-    {{# salesCount}}
-        <li class="nav-item sales-count-nav">
-            <span>销量</span>
-        </li>
-    {{/ salesCount}}
-    {{# salesVolume}}
-        <li class="nav-item sales-volume-nav">
-            <span>折扣</span>
-            <span class="sort">
-                <i class="up iconfont">&#xe615;</i>
-                <i class="down iconfont cur">&#xe616;</i>
-            </span>
-        </li>
-    {{/ salesVolume}}
-
-    {{# cloth}}
-        <li class="nav-item cloth-nav">
-            <span>上装</span>
-        </li>
-    {{/ cloth}}
-
-    {{# pants}}
-        <li class="nav-item pants-nav">
-            <span>下装</span>
-        </li>
-    {{/ pants}}
-
-    {{# shoes}}
-        <li class="nav-item shose-nav">
-            <span>鞋</span>
-        </li>
-    {{/ shoes}}
-
-    {{# other}}
-        <li class="nav-item other-nav">
-            <span>其他</span>
-        </li>
-    {{/ other}}
-
-    {{# screen}}
-        <li class="nav-item screen-nav">
-            <span>筛选</span>
-            <span class="sort">
-                <i class="iconfont">&#xe613;</i>
-            </span>
-        </li>
-    {{/ screen}}
-</ul>
-{{# sizeNav}}
-<div id="size-nav" class="size-nav swiper-container">
-    <ul class="swiper-wrapper">
-        {{# list}}
-        <li class="size-nav-item swiper-slide" data-size="{{size}}">{{textCn}}</li>
-        {{/ list}}
-    </ul>
-</div>
-
-{{/ sizeNav}}
\ No newline at end of file

@@ -2,7 +2,7 @@
 
 use Action\AbstractAction;
 use LibModels\wap\Product\NewsaleData as Newsale;
-use Plugin\DataProcess\NewSaleProcess;
+use Plugin\Helpers;
 /**
  * 新品到着
  */
@@ -10,11 +10,7 @@ class NewsaleController extends AbstractAction
 {
     public function indexAction()
     {
-        $data = array(
-            'header' => array(
-                 'title'  =>  '新品到着'
-             )
-        );
+        /*$this->_view->assign('title', '新品到着');
 
         // 新品到着顶部焦点图
         $focusData = Newsale::getNewsaleFocus('a7989369aa86681c678bc40f171b8f1d');
@@ -22,16 +18,94 @@ class NewsaleController extends AbstractAction
         $focus = array();
         if($focusData['code'] == 200)
         {
-            $focus = $focusData['data'];
+            foreach ($focusData['data'] as $single)
+            {
+                foreach ($single['data'] as $val) {
+                    $val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
+                    $focus[] = $val;
+                }
+            }
         }
+
         // 批量获取新品到着商品数据
         $products = Newsale::getNewProducts('1,3', 1, 60);
+        var_dump($focus);
 
-        // 添加商品数据
-        $data += NewSaleProcess::newSaleData($focus, $products);
-
-        echo '<pre>';
-        print_r($data);exit;
+        $this->_view->display('new', compact('focus', 'products'));*/
+ 
+        $data = array(
+            'headerBanner' => array(
+                 'list'  => array(
+                      array(
+                          'url' => '',
+                          'img' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                      )
+                  )
+             ),     
+             'tabs'  => array(
+                      array(
+                          'title' => '10月15日',
+                      ),
+                      array(
+                          'title' => '本周上新'
+                      ),
+                      array(
+                          'title' => '销量'
+                      )
+             ),
+             'goodsContainer'  => array(
+                 'goods'  => array(
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      )
+                  )
+             )      
+        );
 
         $this->_view->assign('title', '新品到着');
         $this->_view->display('new', $data);
@@ -65,17 +139,70 @@ class NewsaleController extends AbstractAction
         }
     }
 
-    /**
-     * 折扣专区
-     */
+
     public function discountAction()
     {
 
         $data = array(
             'header' => array(
-                 'title'  =>  '折扣专区'
+                 'title'  =>  'SALE'
+             ),
+             
+             'goodsContainer'  => array(
+                 'goods'  => array(
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      ),
+                      array(
+                          'id' => '',
+                          'thumb' => 'http://img12.static.yhbimg.com/adpic/2015/08/14/12/0205a06e86edb30a7d1833477a9e886577.jpg?imageView/2/w/640/h/480',
+                          'name'  => 'GAWS DIGI 丛林数码印花拼接卫衣',
+                          'isLike'  => false,
+                          'price'  => 1268,
+                          'salePrice'  => 589,
+                          'isSale'  => true,
+                          'isFew'  => true,
+                          'isNew'  => false,
+                          'url'  => ''
+                      )
+                  )
              )
         );
+ 
+        /*$this->_view->assign('title', '折扣专区');
 
         // 折扣专区顶部焦点图
         $focusData = Newsale::getNewsaleFocus('e9c9be32d72e2906d404a72ee24cb523');
@@ -83,18 +210,20 @@ class NewsaleController extends AbstractAction
         $focus = array();
         if($focusData['code'] == 200)
         {
-            $focus = $focusData['data'];
+            foreach ($focusData['data'] as $single)
+            {
+                foreach ($single['data'] as $val) {
+                    $val['src'] = Helpers::getImageUrl($val['src'], 375, 667, 1);
+                    $focus[] = $val;
+                }
+            }
         }
-        // 折扣专区商品数据
-        $products = Newsale::getSaleProducts('1,3', 1);
 
-        // 更新tabs
-        $data += array('tabs' => array_keys($products));
-        // 添加商品数据
-        $data += NewSaleProcess::newSaleData($focus, $products);
+        // 折扣专区商品数据
+        $products = Newsale::getNewProducts('1,3', 1, 60);
+        var_dump($products);
 
-        echo '<pre>';
-        var_dump($data);exit;
+        $this->_view->display('new', compact('focus', 'products'));*/
 
         $this->_view->assign('title', '折扣专区');
         $this->_view->display('sale', $data);