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

@@ -217,7 +217,7 @@ function search(opt) {
 lazyLoad($('.lazy'));
 lazyLoad($('.lazy'));
 
 
 filter.registerCbFn(search);
 filter.registerCbFn(search);
-loading.initLoadingMask();
+// loading.initLoadingMask();
 
 
 //导航栏点击逻辑说明：
 //导航栏点击逻辑说明：
 //1.点击非active项时切换active状态
 //1.点击非active项时切换active状态
@@ -323,4 +323,7 @@ $(window).scroll(function() {
             search();
             search();
         }
         }
     }
     }
-});
+});
+
+//初始请求最新第一页数据
+search();

@@ -244,7 +244,7 @@ function search(opt) {
 lazyLoad($('.lazy'));
 lazyLoad($('.lazy'));
 
 
 filter.registerCbFn(search);
 filter.registerCbFn(search);
-loading.initLoadingMask();
+// loading.initLoadingMask();
 
 
 //导航栏点击逻辑说明：
 //导航栏点击逻辑说明：
 //1.点击非active项时切换active状态
 //1.点击非active项时切换active状态
@@ -337,4 +337,7 @@ $(window).scroll(function() {
             search();
             search();
         }
         }
     }
     }
-});
+});
+
+//初始请求最新第一页数据
+search();

@@ -81,4 +81,5 @@
         </div>
         </div>
     </div>
     </div>
 </div>
 </div>
-{{> layout/footer}} 
+{{> layout/footer}}
+{{> layout/download_app}}

@@ -40,4 +40,5 @@
         </div>
         </div>
     {{/ category}}
     {{/ category}}
 </div>
 </div>
-{{> layout/footer}}
+{{> layout/footer}}
+{{> layout/download_app}}

@@ -2,4 +2,5 @@
 <div class="good-list-page yoho-page">
 <div class="good-list-page yoho-page">
     {{> product/list}}
     {{> product/list}}
 </div>
 </div>
-{{> layout/footer}}
+{{> layout/footer}}
+{{> layout/download_app}}

@@ -83,4 +83,5 @@
         {{/if}}
         {{/if}}
     
     
 </div>
 </div>
-{{> layout/footer}}
+{{> layout/footer}}
+{{> layout/download_app}}

@@ -94,4 +94,5 @@
         {{/if}}
         {{/if}}
     
     
 </div>
 </div>
-{{> layout/footer}}
+{{> layout/footer}}
+{{> layout/download_app}}

@@ -122,6 +122,7 @@
 {{#if newArrivalPage}}
 {{#if newArrivalPage}}
 <script>
 <script>
     seajs.use('js/product/newsale/newarrival');
     seajs.use('js/product/newsale/newarrival');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 
@@ -129,6 +130,7 @@
 {{#if discountPage}}
 {{#if discountPage}}
 <script>
 <script>
     seajs.use('js/product/newsale/discount');
     seajs.use('js/product/newsale/discount');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 
@@ -136,6 +138,7 @@
 {{#if goodListPage}}
 {{#if goodListPage}}
 <script>
 <script>
     seajs.use('js/product/list');
     seajs.use('js/product/list');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 
@@ -150,6 +153,7 @@
 {{#if categoryPage}}
 {{#if categoryPage}}
 <script>
 <script>
     seajs.use('js/category/index');
     seajs.use('js/category/index');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 
@@ -157,6 +161,7 @@
 {{#if brandPage}}
 {{#if brandPage}}
 <script>
 <script>
     seajs.use('js/category/brand');
     seajs.use('js/category/brand');
+    seajs.use('js/index/footer');
 </script>
 </script>
 {{/if}}
 {{/if}}
 
 

@@ -26,10 +26,6 @@ class NewsaleController extends AbstractAction
         $data = array();
         $data = array();
         $data['newArrivalPage'] = true;
         $data['newArrivalPage'] = true;
         $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
         $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
-        $goodsList = \Product\NewsaleModel::getNewProducts($channel, 60);
-        if (!empty($goodsList)) {
-            $data += $goodsList;
-        }
         // 设置一些筛选的默认参数
         // 设置一些筛选的默认参数
         $data += array(
         $data += array(
             'showDownloadApp'=>true,
             'showDownloadApp'=>true,
@@ -60,10 +56,6 @@ class NewsaleController extends AbstractAction
         $data = array();
         $data = array();
         $data['discountPage'] = true;
         $data['discountPage'] = true;
         $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
         $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
-        $goodsList = \Product\NewsaleModel::getSaleProducts($channel, 60);
-        if (!empty($goodsList)) {
-            $data += $goodsList;
-        }
         // 设置一些筛选的默认参数
         // 设置一些筛选的默认参数
         $data += array(
         $data += array(
             'showDownloadApp'=>true,
             'showDownloadApp'=>true,