Merge remote-tracking branch 'origin/feature/optim' into release/wap-optim2

@@ -52,7 +52,9 @@ let _channelPage = (req, res, data) => {
         //     }
         // }].concat(result.content);
         // console.log(result.content[9]);
-        res.render('channel', Object.assign({}, _renderData, data, result));
+        res.render('channel', Object.assign({}, _renderData, data, result, {
+            localCss: true
+        }));
     });
 };
 

@@ -69,7 +69,8 @@ const editor = (req, res, next) => {
                     infos: build,
                     isApp: isApp,
                     authorInfo: authorData.data
-                }
+                },
+                localCss: true
             }, parameter));
         } else {
             return next();
@@ -172,7 +173,9 @@ const index = (req, res, next) => {
                 res.set('Cache-Control', 'no-cache');
             }
         }
-        res.render('guang', Object.assign(responseData, result));
+        res.render('guang', Object.assign(responseData, result, {
+            localCss: true
+        }));
     }).catch(next);
 };
 

@@ -357,7 +357,8 @@ const index = (req, res, next) => {
                         page: 'info-index',
                         title: '逛',
                         gender: gender,
-                        wechatShare: true
+                        wechatShare: true,
+                        localCss: true
                     }, data, parameter));
                 });
             } else {

@@ -3,6 +3,10 @@
  * @author: liangzhifeng<zhifeng.liang@yoho.cn>
  * @date: 2015/10/12
  */
+//加载css
+require("channel/home.page.css")
+
+
 var $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper'),
     lazyLoad = require('yoho-jquery-lazyload'),

@@ -3,6 +3,8 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/10/10
  */
+require("guang/index-editor.page.css")
+
 
 var $ = require('yoho-jquery');
 

@@ -3,6 +3,9 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/10/10
  */
+require("guang/index.page.css")
+
+
 
 var $ = require('yoho-jquery');
 

@@ -3,6 +3,7 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/10/13
  */
+require("guang/info-index.page.css")
 
 var $ = require('yoho-jquery'),
     ellipsis = require('yoho-mlellipsis'),

+ @import "../layout/_loading.css";
+ @import "../layout/_utils.css";
+ @import "../layout/_swiper.css";
+ 
+ @import "../common/_filter.css";
+ @import "../common/_good.css";
+ @import "../common/_loading.css";
+ @import "../common/_suspend-home.css";
+ 
+ @import "_banner-bottom.css";
+ @import "_banner-center.css";
+ @import "_banner-top.css";
+ @import "_brand.css";
+ @import "_cate.css";
+ @import "_creative-life.css";
+ @import "_divide-image.css";
+ @import "_fine-brands.css";
+ @import "_floor-header.css";
+ @import "_footer-tab.css";
+ @import "_fresh-only.css";
+ @import "_goods-category.css";
+ @import "_home-header.css";
+ @import "_home.css";
+ @import "_hot-brands.css";
+ @import "_hot-category.css";
+ @import "_hot-single.css";
+ @import "_icons-enter.css";
+ @import "_index.css";
+ @import "_left-right.css";
+ @import "_maybe-like.css";
+ @import "_new-first.css";
+ @import "_new-user-floor.css";
+ @import "_notice.css";
+ @import "_plus-star.css";
+ @import "_sale-floor.css";
+ @import "_search-input.css";
+ @import "_search.css";
+ @import "_seckill.css";
+ @import "_shop-recommand.css";
+ @import "_side-nav.css";
+ @import "_six-lines-floor.css";
+ @import "_three-picture.css";
+ @import "_thumb-row.css";
+ @import "_trend-topics.css";
+ @import "_trend-tops.css";
+ @import "_trendsetter-collocation.css";
+ @import "_two-column-goods.css";
+ @import "_vip-only.css";
\ No newline at end of file

+ @import "../layout/_loading.css";
+ @import "../layout/_swiper.css";
+ @import "../layout/_utils.css";
+ 
+ @import "../common/_loading.css";
+ @import "../common/_suspend-home.css";
+ 
+ @import "_info-list.css";
+ @import "_info.css";
+ @import "_tvls.css";
\ No newline at end of file

+@import "../layout/_loading.css";
+@import "../layout/_swiper.css";
+@import "../layout/_utils.css";
+ 
+@import "../common/_good.css";
+@import "../common/_loading.css";
+@import "../common/_suspend-home.css";
+ 
+@import "../channel/_footer-tab.css";
+ 
+@import "_info-list.css";
+@import "_info.css";
+@import "_tvls.css";
\ No newline at end of file

+@import "../layout/_common.css";
+@import "../layout/_utils.css";
+ 
+@import "../common/_filter.css";
+@import "../common/_good.css";
+@import "../common/_loading.css";
+@import "../common/_suspend-home.css";
+ 
+@import "_detail.css";
+@import "_tvls.css";
\ No newline at end of file