Authored by Rock Zhang

修复新品到着,折扣专区js报错,有关页面app下载浮层添加

@@ -217,7 +217,7 @@ function search(opt) { @@ -217,7 +217,7 @@ function search(opt) {
217 lazyLoad($('.lazy')); 217 lazyLoad($('.lazy'));
218 218
219 filter.registerCbFn(search); 219 filter.registerCbFn(search);
220 -loading.initLoadingMask(); 220 +// loading.initLoadingMask();
221 221
222 //导航栏点击逻辑说明: 222 //导航栏点击逻辑说明:
223 //1.点击非active项时切换active状态 223 //1.点击非active项时切换active状态
@@ -323,4 +323,7 @@ $(window).scroll(function() { @@ -323,4 +323,7 @@ $(window).scroll(function() {
323 search(); 323 search();
324 } 324 }
325 } 325 }
326 -});  
  326 +});
  327 +
  328 +//初始请求最新第一页数据
  329 +search();
@@ -244,7 +244,7 @@ function search(opt) { @@ -244,7 +244,7 @@ function search(opt) {
244 lazyLoad($('.lazy')); 244 lazyLoad($('.lazy'));
245 245
246 filter.registerCbFn(search); 246 filter.registerCbFn(search);
247 -loading.initLoadingMask(); 247 +// loading.initLoadingMask();
248 248
249 //导航栏点击逻辑说明: 249 //导航栏点击逻辑说明:
250 //1.点击非active项时切换active状态 250 //1.点击非active项时切换active状态
@@ -337,4 +337,7 @@ $(window).scroll(function() { @@ -337,4 +337,7 @@ $(window).scroll(function() {
337 search(); 337 search();
338 } 338 }
339 } 339 }
340 -});  
  340 +});
  341 +
  342 +//初始请求最新第一页数据
  343 +search();
@@ -83,4 +83,5 @@ @@ -83,4 +83,5 @@
83 </div> 83 </div>
84 </div> 84 </div>
85 </div> 85 </div>
86 -{{> layout/footer}}  
  86 +{{> layout/footer}}
  87 +{{> layout/download_app}}
@@ -40,4 +40,5 @@ @@ -40,4 +40,5 @@
40 </div> 40 </div>
41 {{/ category}} 41 {{/ category}}
42 </div> 42 </div>
43 -{{> layout/footer}}  
  43 +{{> layout/footer}}
  44 +{{> layout/download_app}}
@@ -2,4 +2,5 @@ @@ -2,4 +2,5 @@
2 <div class="good-list-page yoho-page"> 2 <div class="good-list-page yoho-page">
3 {{> product/list}} 3 {{> product/list}}
4 </div> 4 </div>
5 -{{> layout/footer}}  
  5 +{{> layout/footer}}
  6 +{{> layout/download_app}}
@@ -83,4 +83,5 @@ @@ -83,4 +83,5 @@
83 {{/if}} 83 {{/if}}
84 84
85 </div> 85 </div>
86 -{{> layout/footer}}  
  86 +{{> layout/footer}}
  87 +{{> layout/download_app}}
@@ -94,4 +94,5 @@ @@ -94,4 +94,5 @@
94 {{/if}} 94 {{/if}}
95 95
96 </div> 96 </div>
97 -{{> layout/footer}}  
  97 +{{> layout/footer}}
  98 +{{> layout/download_app}}
@@ -122,6 +122,7 @@ @@ -122,6 +122,7 @@
122 {{#if newArrivalPage}} 122 {{#if newArrivalPage}}
123 <script> 123 <script>
124 seajs.use('js/product/newsale/newarrival'); 124 seajs.use('js/product/newsale/newarrival');
  125 + seajs.use('js/index/footer');
125 </script> 126 </script>
126 {{/if}} 127 {{/if}}
127 128
@@ -129,6 +130,7 @@ @@ -129,6 +130,7 @@
129 {{#if discountPage}} 130 {{#if discountPage}}
130 <script> 131 <script>
131 seajs.use('js/product/newsale/discount'); 132 seajs.use('js/product/newsale/discount');
  133 + seajs.use('js/index/footer');
132 </script> 134 </script>
133 {{/if}} 135 {{/if}}
134 136
@@ -136,6 +138,7 @@ @@ -136,6 +138,7 @@
136 {{#if goodListPage}} 138 {{#if goodListPage}}
137 <script> 139 <script>
138 seajs.use('js/product/list'); 140 seajs.use('js/product/list');
  141 + seajs.use('js/index/footer');
139 </script> 142 </script>
140 {{/if}} 143 {{/if}}
141 144
@@ -150,6 +153,7 @@ @@ -150,6 +153,7 @@
150 {{#if categoryPage}} 153 {{#if categoryPage}}
151 <script> 154 <script>
152 seajs.use('js/category/index'); 155 seajs.use('js/category/index');
  156 + seajs.use('js/index/footer');
153 </script> 157 </script>
154 {{/if}} 158 {{/if}}
155 159
@@ -157,6 +161,7 @@ @@ -157,6 +161,7 @@
157 {{#if brandPage}} 161 {{#if brandPage}}
158 <script> 162 <script>
159 seajs.use('js/category/brand'); 163 seajs.use('js/category/brand');
  164 + seajs.use('js/index/footer');
160 </script> 165 </script>
161 {{/if}} 166 {{/if}}
162 167
@@ -26,10 +26,6 @@ class NewsaleController extends AbstractAction @@ -26,10 +26,6 @@ class NewsaleController extends AbstractAction
26 $data = array(); 26 $data = array();
27 $data['newArrivalPage'] = true; 27 $data['newArrivalPage'] = true;
28 $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel); 28 $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
29 - $goodsList = \Product\NewsaleModel::getNewProducts($channel, 60);  
30 - if (!empty($goodsList)) {  
31 - $data += $goodsList;  
32 - }  
33 // 设置一些筛选的默认参数 29 // 设置一些筛选的默认参数
34 $data += array( 30 $data += array(
35 'showDownloadApp'=>true, 31 'showDownloadApp'=>true,
@@ -60,10 +56,6 @@ class NewsaleController extends AbstractAction @@ -60,10 +56,6 @@ class NewsaleController extends AbstractAction
60 $data = array(); 56 $data = array();
61 $data['discountPage'] = true; 57 $data['discountPage'] = true;
62 $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel); 58 $data['headerBanner'] = \Product\NewsaleModel::getNewFocus($channel);
63 - $goodsList = \Product\NewsaleModel::getSaleProducts($channel, 60);  
64 - if (!empty($goodsList)) {  
65 - $data += $goodsList;  
66 - }  
67 // 设置一些筛选的默认参数 59 // 设置一些筛选的默认参数
68 $data += array( 60 $data += array(
69 'showDownloadApp'=>true, 61 'showDownloadApp'=>true,