Merge branch 'feature/pageCss' into 'release/5.5.1'

css置顶



See merge request !437

+require('activity/promotion/promotion.page.css');
+
 let $ = require('yoho-jquery');
 let $ = require('yoho-jquery');
 let tip = require('plugin/tip');
 let tip = require('plugin/tip');
 
 
@@ -12,8 +14,6 @@ let $dia = $('.dia-c .dia-main');
 
 
 require('common');
 require('common');
 
 
-require('activity/promotion/promotion.page.css');
-
 let share = require('common/share');
 let share = require('common/share');
 
 
 share({
 share({

@@ -4,6 +4,8 @@
  * @date: 2015/11/10
  * @date: 2015/11/10
  */
  */
 
 
+require('activity/raffle/promotion.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     Hammer = require('yoho-hammer'),
     Hammer = require('yoho-hammer'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
@@ -42,8 +44,6 @@ let orderContent = require('activity/raffle/order-content.hbs');
 
 
 require('common');
 require('common');
 
 
-require('activity/raffle/promotion.page.css');
-
 // 减少计时
 // 减少计时
 function downCount(item) {
 function downCount(item) {
     let hoursItem = item.find('.hours');
     let hoursItem = item.find('.hours');

+require('activity/trend/trend.page.css');
+
 let tip = require('plugin/tip'),
 let tip = require('plugin/tip'),
     IScroll = require('yoho-iscroll');
     IScroll = require('yoho-iscroll');
 
 
@@ -27,7 +29,6 @@ let num = 1,
 let indexAct = require('activity/trend/index');
 let indexAct = require('activity/trend/index');
 
 
 require('common');
 require('common');
-require('activity/trend/trend.page.css');
 require('activity/trend/share');
 require('activity/trend/share');
 if ($('#map').length > 0) {
 if ($('#map').length > 0) {
     require('activity/trend/map');
     require('activity/trend/map');

@@ -5,10 +5,11 @@
  */
  */
 'use strict';
 'use strict';
 
 
-let cookie = require('yoho-cookie');
-
 require('cart/index.page.css');
 require('cart/index.page.css');
 require('common');
 require('common');
+
+let cookie = require('yoho-cookie');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     hbsTemplate = require('cart/index/index.hbs'),
     hbsTemplate = require('cart/index/index.hbs'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),

+require('guang/plusstar/index.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     tip = require('plugin/tip'),
     tip = require('plugin/tip'),
     Swiper = require('yoho-swiper2'),
     Swiper = require('yoho-swiper2'),
@@ -15,8 +17,6 @@ let scrollFn,
     resourcesTp = {},
     resourcesTp = {},
     CID;
     CID;
 
 
-require('guang/plusstar/index.page.css');
-
 require('yoho-jquery-lazyload');
 require('yoho-jquery-lazyload');
 require('common');
 require('common');
 
 

@@ -4,6 +4,8 @@
  * @date: 2015/10/10
  * @date: 2015/10/10
  */
  */
 
 
+require('guang/plustar-detail.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     Hammer = require('common/toy-hammer'),
     Hammer = require('common/toy-hammer'),
     ellipsis = require('yoho-mlellipsis'),
     ellipsis = require('yoho-mlellipsis'),
@@ -26,7 +28,6 @@ let mIntro, aIntro, logoImg;
 
 
 let likeHammer, $goodName, $title;
 let likeHammer, $goodName, $title;
 
 
-require('guang/plustar-detail.page.css');
 require('plugin/wx-share');
 require('plugin/wx-share');
 require('common');
 require('common');
 require('./plustar-detail-render')(function() {
 require('./plustar-detail-render')(function() {

+require('guang/plustar-list.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
     Swiper = require('yoho-swiper');
     Swiper = require('yoho-swiper');
@@ -5,7 +7,6 @@ let $ = require('yoho-jquery'),
 let $navs = $('#nav-tab > li'),
 let $navs = $('#nav-tab > li'),
     $contents = $('#ps-content > .content');
     $contents = $('#ps-content > .content');
 
 
-require('guang/plustar-list.page.css');
 require('common');
 require('common');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));

@@ -3,6 +3,10 @@
  * @author: xuqi<qi.xu@yoho.cn>
  * @author: xuqi<qi.xu@yoho.cn>
  * @date: 2015/11/28
  * @date: 2015/11/28
  */
  */
+
+require('home/record.page.css');
+require('common');
+
 let $ = require('yoho-jquery');
 let $ = require('yoho-jquery');
 
 
 let lazyLoad = require('yoho-jquery-lazyload'),
 let lazyLoad = require('yoho-jquery-lazyload'),
@@ -24,9 +28,6 @@ let end = false,
 
 
 let winH = $(window).height();
 let winH = $(window).height();
 
 
-
-require('home/record.page.css');
-require('common');
 load.init();
 load.init();
 function moreRecord(cb) {
 function moreRecord(cb) {
     let count = $page.children('.browse-record-good').length;
     let count = $page.children('.browse-record-good').length;

 // 不要使用es6
 // 不要使用es6
 'use strict';
 'use strict';
 
 
+require('home/coupons.page.css');
+require('common');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     couponsListHbs = require('home/coupons-list.hbs'),
     couponsListHbs = require('home/coupons-list.hbs'),
     notResultHbs = require('home/coupon-not-result.hbs');
     notResultHbs = require('home/coupon-not-result.hbs');
@@ -15,9 +18,6 @@ let $couponTab1 = $('.coupon-tab1'),
     scrollHandler,
     scrollHandler,
     $tabDom;
     $tabDom;
 
 
-require('home/coupons.page.css');
-require('common');
-
 $('body').css({'background-color': '#f2f2f2'});
 $('body').css({'background-color': '#f2f2f2'});
 
 
 couponFun = function() {
 couponFun = function() {

@@ -3,6 +3,10 @@
  * @author: bikai<kai.bi@yoho.cn>
  * @author: bikai<kai.bi@yoho.cn>
  * @date: 2015/11/12
  * @date: 2015/11/12
  */
  */
+
+require('home/index.page.css');
+require('common');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     noticeScroll = require('plugin/notice-scroll');
     noticeScroll = require('plugin/notice-scroll');
 
 
@@ -14,9 +18,6 @@ let myImage = new Image(),
 
 
 let Swiper = require('yoho-swiper2');
 let Swiper = require('yoho-swiper2');
 
 
-require('home/index.page.css');
-
-require('common');
 if ($('.recommend-for-you').length) {
 if ($('.recommend-for-you').length) {
     require('./recommend-for-you-user-center');
     require('./recommend-for-you-user-center');
 }
 }

+require('common.css');
+require('home/order-address-modify.page.css');
+
 const $ = require('yoho-jquery');
 const $ = require('yoho-jquery');
 const Vue = require('vue');
 const Vue = require('vue');
 const tip = require('plugin/tip');
 const tip = require('plugin/tip');
 
 
-require('home/order-address-modify.page.css');
-require('common.css');
 require('common');
 require('common');
 
 
 let $areaForm = $('#areaForm');
 let $areaForm = $('#areaForm');
@@ -12,7 +13,6 @@ let $province = $('input[name=province]');
 let $provinceCode = $('input[name=provinceCode]');
 let $provinceCode = $('input[name=provinceCode]');
 let $area = $('#area');
 let $area = $('#area');
 
 
-
 let vueAddressAct = require('home/address/address-act.vue');
 let vueAddressAct = require('home/address/address-act.vue');
 
 
 let addressVact = new Vue({
 let addressVact = new Vue({

@@ -4,6 +4,9 @@
  * @date: 2015/11/10
  * @date: 2015/11/10
  */
  */
 
 
+require('layout/_modal.css');
+require('home/order-list.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     Hammer = require('yoho-hammer'),
     Hammer = require('yoho-hammer'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
@@ -41,9 +44,6 @@ let firstScreen = $('.firstscreen-orders').children().size() > 0;
 
 
 require('common');
 require('common');
 require('plugin/modal.alert');
 require('plugin/modal.alert');
-require('layout/_modal.css');
-
-require('home/order-list.page.css');
 
 
 // 减少计时
 // 减少计时
 function downCount(item) {
 function downCount(item) {

@@ -4,6 +4,9 @@
  * @date: 2015/11/16
  * @date: 2015/11/16
  */
  */
 
 
+require('layout/_modal.css');
+require('home/order-detail-index.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
     Hammer = require('yoho-hammer'),
     Hammer = require('yoho-hammer'),
@@ -24,10 +27,8 @@ let orderId = $('#order-detail').data('id'),
 let $sureClose = $('.order-opt').find('.cancel'); // 取消订单按钮
 let $sureClose = $('.order-opt').find('.cancel'); // 取消订单按钮
 let $sureRefund = $('.order-opt').find('.refund'); // 申请退款按钮
 let $sureRefund = $('.order-opt').find('.refund'); // 申请退款按钮
 
 
-require('home/order-detail-index.page.css');
 require('common');
 require('common');
 require('plugin/modal.alert');
 require('plugin/modal.alert');
-require('layout/_modal.css');
 
 
 lazyLoad({
 lazyLoad({
     try_again_css: 'order-failure'
     try_again_css: 'order-failure'

+require('product/outlet/index.page.css');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     Swiper = require('yoho-swiper2'),
     Swiper = require('yoho-swiper2'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
@@ -9,8 +11,6 @@ let $categoryNav = $('.outlet-category-nav');
 
 
 let search = require('./sale/search');
 let search = require('./sale/search');
 
 
-require('product/outlet/index.page.css');
-
 require('./outlet/nav');
 require('./outlet/nav');
 
 
 require('./outlet/fix-nav');
 require('./outlet/fix-nav');

@@ -2,8 +2,9 @@
  * 品牌店铺首页
  * 品牌店铺首页
  */
  */
 
 
-require('./shop/coupon');
 require('product/shop/shop.page.css');
 require('product/shop/shop.page.css');
+require('./shop/coupon');
+
 let $ = require('yoho-jquery'),
 let $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
     Swiper = require('yoho-swiper');
     Swiper = require('yoho-swiper');

-let $ = require('yoho-jquery');
-
 require('service/system.page.css');
 require('service/system.page.css');
 
 
+let $ = require('yoho-jquery');
+
 if ($('.systemMain').height() < $(window).height()) {
 if ($('.systemMain').height() < $(window).height()) {
     $('.systemMain').height($(window).height());
     $('.systemMain').height($(window).height());
 }
 }