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

@@ -63,6 +63,11 @@
     //header
     {
         pageHeader: {
+            //页面主题标识
+            boys: true,
+            girls: true,
+            kids: true,
+            lifeStyle: true,
             //对应页面有就传，没有就不传
             navBack: true,
             navTitle: '',

+/**
+ * Loading mask
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2015/10/29
+ */
+
+var $ = require('yoho.zepto');
+
+var $page = $('.yoho-page');
+
+var $loading;
+
+/**
+ * 初始化loading mask
+ * @param $container loading容器, position:relative
+ */
+function initLoadingMask() {
+    var html = '<div class="loading-mask hide"><div class="loading"></div></div>';
+
+    $page.append(html);
+
+    $loading = $page.children('.loading-mask');
+}
+
+//显示loading
+function showLoadingMask() {
+    $loading.removeClass('hide');
+}
+
+//隐藏loading
+function hideLoadingMask() {
+    $loading.addClass('hide');
+}
+
+exports.initLoadingMask = initLoadingMask;
+exports.showLoadingMask = showLoadingMask;
+exports.hideLoadingMask = hideLoadingMask;
\ No newline at end of file

@@ -14,6 +14,7 @@ var $brandHeader = $('#brand-header'),
 var filter = require('../plugin/filter');
 
 var tip = require('../plugin/tip');
+var loading = require('../plugin/loading');
 
 var $goodsContainer = $('#goods-container'),
     $ngc = $goodsContainer.children('.new-goods'),
@@ -40,8 +41,8 @@ var $listNav = $('#list-nav'),
     navInfo = {
         newest: {
             order: 1,
-            reload: false,
-            page: 1,
+            reload: true,
+            page: 0,
             end: false
         },
         price: {
@@ -72,6 +73,10 @@ function search(opt) {
         nav, navType,
         page;
 
+    if (searching) {
+        return;
+    }
+
     if (opt) {
 
         //筛选项变更则重置reload为true
@@ -126,10 +131,6 @@ function search(opt) {
         $.extend(defaultOpt, ext); //扩展筛选项
     }
 
-    if (searching) {
-        return;
-    }
-
     //导航类别
     if ($pre.hasClass('new')) {
         navType = 'newest';
@@ -157,6 +158,7 @@ function search(opt) {
     });
 
     searching = true;
+    loading.showLoadingMask();
 
     $.ajax({
         type: 'GET',
@@ -198,6 +200,7 @@ function search(opt) {
             nav.page = page;
 
             searching = false;
+            loading.hideLoadingMask();
         }
     });
 
@@ -206,6 +209,7 @@ function search(opt) {
 lazyLoad($('.lazy'));
 
 filter.registerCbFn(search);
+loading.initLoadingMask();
 
 //导航栏点击逻辑说明：
 //1.点击非active项时切换active状态
@@ -355,4 +359,7 @@ $brandHeader.children('.btn-col').bind('tap', function() {
             tip.show('网络断开连接了~');
         }
     });
-});
\ No newline at end of file
+});
+
+//初始请求最新第一页数据
+search();
\ No newline at end of file

+.loading-mask {
+    position: absolute;
+    background: rgba(0,0,0,.3);
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    
+    .loading {
+        position: absolute;
+        width: 100rem / $pxConvertRem;
+        height: 40rem / $pxConvertRem;
+        background: image-url('loading.gif') no-repeat;
+        background-size: 100% 100%;
+        top: 50%;
+        left: 50%;
+        margin-left: -50rem / $pxConvertRem;
+        margin-top: -20rem / $pxConvertRem;
+    }
+}
\ No newline at end of file

@@ -93,4 +93,4 @@ a {
 }
 
 
-@import "layout/header", "layout/footer", "good", "filter", "passport/index", "guang/index", "home/index", "category/index", "product/index", "index/index", "shopping-cart/index";
+@import "layout/header", "layout/footer", "good", "filter", "loading", "passport/index", "guang/index", "home/index", "category/index", "product/index", "index/index", "shopping-cart/index";

@@ -26,6 +26,19 @@
                 line-height: 44px;
                 color: white;
             }
+
+            .yoho-icon {
+                float: left;
+                margin-right: 10px;
+                font-size: 22px;
+                line-height: 44px;
+                width: 44px;
+                height: 44px;
+                text-align: center;
+                color: #fff;
+                background-color: #000;
+                border-radius: 10px;
+            }
         }
 
 }

@@ -7,6 +7,22 @@
     height: 88rem / $pxConvertRem;
     line-height: 88rem / $pxConvertRem;
 
+    &.boys {
+        @include background-image(linear-gradient(#323232, #414141));
+    }
+
+    &.girls {
+        background: #ff88ae;
+    }
+
+    &.kids {
+        background: #7ad9f9;
+    }
+
+    &.life-style {
+        background: #4f4138;
+    }
+
     .nav-back {
         position: absolute;
         left: 34rem / $pxConvertRem;

-<div class="good-info" data-id="{{id}}">
-    <div class="tag-container clearfix">
-        {{# tags}}
-            {{# is_new}}
-                <p class="good-tag new-tag">NEW</p>
-            {{/ is_new}}
-            {{# is_advance}}
-                <p class="good-tag renew-tag">再到着</p>
-            {{/ is_advance}}
-            {{# is_discount}}
-                <p class="good-tag sale-tag">SALE</p>
-            {{/ is_discount}}
-            {{# is_yohoood}}
-                <div class="good-tag yohood-tag"></div>
-            {{/ is_yohoood}}
-            {{# is_limited}}
-                <p class="good-tag limit-tag">限量商品</p>
-            {{/ is_limited}}
-        {{/ tags}}
-    </div>
-    <div class="good-detail-img">
-        <a class="good-thumb" href="{{url}}">
-            <img class="lazy" data-original="{{thumb}}">
-        </a>
-        {{# is_soon_sold_out}}
-            <p class="few-tag">即将售罄</p>
-        {{/ is_soon_sold_out}}
-    </div>
-    <div class="good-detail-text">
-        <div class="name">
-            <a href="{{url}}">{{name}}</a>
+{{#if .}} {{!-- 剔除值为false的项 --}}
+    <div class="good-info" data-id="{{id}}">
+        <div class="tag-container clearfix">
+            {{# tags}}
+                {{# is_new}}
+                    <p class="good-tag new-tag">NEW</p>
+                {{/ is_new}}
+                {{# is_advance}}
+                    <p class="good-tag renew-tag">再到着</p>
+                {{/ is_advance}}
+                {{# is_discount}}
+                    <p class="good-tag sale-tag">SALE</p>
+                {{/ is_discount}}
+                {{# is_yohoood}}
+                    <div class="good-tag yohood-tag"></div>
+                {{/ is_yohoood}}
+                {{# is_limited}}
+                    <p class="good-tag limit-tag">限量商品</p>
+                {{/ is_limited}}
+            {{/ tags}}
+        </div>
+        <div class="good-detail-img">
+            <a class="good-thumb" href="{{url}}">
+                <img class="lazy" data-original="{{thumb}}">
+            </a>
+            {{# is_soon_sold_out}}
+                <p class="few-tag">即将售罄</p>
+            {{/ is_soon_sold_out}}
         </div>
-        <div class="price">
-            <span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
-            {{#price}}
-                <span class="market-price">￥{{.}}</span>
-            {{/price}}
+        <div class="good-detail-text">
+            <div class="name">
+                <a href="{{url}}">{{name}}</a>
+            </div>
+            <div class="price">
+                <span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
+                {{#price}}
+                    <span class="market-price">￥{{.}}</span>
+                {{/price}}
+            </div>
         </div>
     </div>
-</div>
+{{/if}}
\ No newline at end of file

@@ -10,7 +10,13 @@
         </ul>
    
         <div id="goods-list">
-            {{> product/goods_container}}
+            {{# goodsContainer}}
+                <div class="goods-list {{^show}}hide{{/show}}">
+                    {{# goods}}
+                        {{> good}}
+                    {{/ goods}}
+                </div>
+            {{/ goodsContainer}}
         </div>
 
     <div id="load-more-info" class="load-more-info">
@@ -19,6 +25,4 @@
         </div>
         <span class="no-more status hide">没有更多啦</span>
     </div>
-</div>
-
-       
\ No newline at end of file
+</div>
\ No newline at end of file

 {{#showDownloadApp}}
 <div class="float-layer hide" id="float-layer-app">
     <div class="float-layer-left">
-        <img src="http://static.yohobuy.com/m/v1/img/yohobuy_new.png" alt="">
+        <span class="yoho-icon iconfont">&#xe60d;</span>
         <p>新用户首单减10元</p>
     </div>
     <a href="javascript:void(0);" id="float-layer-close" >

 {{#pageHeader}} 
-<header class="yoho-header">
+<header class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
     {{#if navBack}}
     <a href="javascript:history.go(-1);" class="nav-back"></a>
     {{/if}}

-{{# goodsContainer}}
-    <div class="goods-list {{^show}}hide{{/show}}">
-        {{# goods}}
-            {{> good}}
-        {{/ goods}}
-    </div>
-{{/ goodsContainer}}
\ No newline at end of file

@@ -82,11 +82,7 @@
         </li>
     </ul>
     <div id="goods-container" class="goods-container">
-        <div class="new-goods container clearfix">
-            {{# new}}
-                {{> good}}
-            {{/ new}}
-        </div>
+        <div class="new-goods container clearfix"></div>
         <div class="price-goods container clearfix hide"></div>
         <div class="discount-goods container clearfix hide"></div>