Showing
16 changed files
with
41 additions
and
33 deletions
1 | +require('activity/promotion/promotion.page.css'); | ||
2 | + | ||
1 | let $ = require('yoho-jquery'); | 3 | let $ = require('yoho-jquery'); |
2 | let tip = require('plugin/tip'); | 4 | let tip = require('plugin/tip'); |
3 | 5 | ||
@@ -12,8 +14,6 @@ let $dia = $('.dia-c .dia-main'); | @@ -12,8 +14,6 @@ let $dia = $('.dia-c .dia-main'); | ||
12 | 14 | ||
13 | require('common'); | 15 | require('common'); |
14 | 16 | ||
15 | -require('activity/promotion/promotion.page.css'); | ||
16 | - | ||
17 | let share = require('common/share'); | 17 | let share = require('common/share'); |
18 | 18 | ||
19 | share({ | 19 | share({ |
@@ -4,6 +4,8 @@ | @@ -4,6 +4,8 @@ | ||
4 | * @date: 2015/11/10 | 4 | * @date: 2015/11/10 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | +require('activity/raffle/promotion.page.css'); | ||
8 | + | ||
7 | let $ = require('yoho-jquery'), | 9 | let $ = require('yoho-jquery'), |
8 | Hammer = require('yoho-hammer'), | 10 | Hammer = require('yoho-hammer'), |
9 | lazyLoad = require('yoho-jquery-lazyload'), | 11 | lazyLoad = require('yoho-jquery-lazyload'), |
@@ -42,8 +44,6 @@ let orderContent = require('activity/raffle/order-content.hbs'); | @@ -42,8 +44,6 @@ let orderContent = require('activity/raffle/order-content.hbs'); | ||
42 | 44 | ||
43 | require('common'); | 45 | require('common'); |
44 | 46 | ||
45 | -require('activity/raffle/promotion.page.css'); | ||
46 | - | ||
47 | // 减少计时 | 47 | // 减少计时 |
48 | function downCount(item) { | 48 | function downCount(item) { |
49 | let hoursItem = item.find('.hours'); | 49 | let hoursItem = item.find('.hours'); |
1 | +require('activity/trend/trend.page.css'); | ||
2 | + | ||
1 | let tip = require('plugin/tip'), | 3 | let tip = require('plugin/tip'), |
2 | IScroll = require('yoho-iscroll'); | 4 | IScroll = require('yoho-iscroll'); |
3 | 5 | ||
@@ -27,7 +29,6 @@ let num = 1, | @@ -27,7 +29,6 @@ let num = 1, | ||
27 | let indexAct = require('activity/trend/index'); | 29 | let indexAct = require('activity/trend/index'); |
28 | 30 | ||
29 | require('common'); | 31 | require('common'); |
30 | -require('activity/trend/trend.page.css'); | ||
31 | require('activity/trend/share'); | 32 | require('activity/trend/share'); |
32 | if ($('#map').length > 0) { | 33 | if ($('#map').length > 0) { |
33 | require('activity/trend/map'); | 34 | require('activity/trend/map'); |
@@ -5,10 +5,11 @@ | @@ -5,10 +5,11 @@ | ||
5 | */ | 5 | */ |
6 | 'use strict'; | 6 | 'use strict'; |
7 | 7 | ||
8 | -let cookie = require('yoho-cookie'); | ||
9 | - | ||
10 | require('cart/index.page.css'); | 8 | require('cart/index.page.css'); |
11 | require('common'); | 9 | require('common'); |
10 | + | ||
11 | +let cookie = require('yoho-cookie'); | ||
12 | + | ||
12 | let $ = require('yoho-jquery'), | 13 | let $ = require('yoho-jquery'), |
13 | hbsTemplate = require('cart/index/index.hbs'), | 14 | hbsTemplate = require('cart/index/index.hbs'), |
14 | lazyLoad = require('yoho-jquery-lazyload'), | 15 | lazyLoad = require('yoho-jquery-lazyload'), |
1 | +require('guang/plusstar/index.page.css'); | ||
2 | + | ||
1 | let $ = require('yoho-jquery'), | 3 | let $ = require('yoho-jquery'), |
2 | tip = require('plugin/tip'), | 4 | tip = require('plugin/tip'), |
3 | Swiper = require('yoho-swiper2'), | 5 | Swiper = require('yoho-swiper2'), |
@@ -15,8 +17,6 @@ let scrollFn, | @@ -15,8 +17,6 @@ let scrollFn, | ||
15 | resourcesTp = {}, | 17 | resourcesTp = {}, |
16 | CID; | 18 | CID; |
17 | 19 | ||
18 | -require('guang/plusstar/index.page.css'); | ||
19 | - | ||
20 | require('yoho-jquery-lazyload'); | 20 | require('yoho-jquery-lazyload'); |
21 | require('common'); | 21 | require('common'); |
22 | 22 |
@@ -4,6 +4,8 @@ | @@ -4,6 +4,8 @@ | ||
4 | * @date: 2015/10/10 | 4 | * @date: 2015/10/10 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | +require('guang/plustar-detail.page.css'); | ||
8 | + | ||
7 | let $ = require('yoho-jquery'), | 9 | let $ = require('yoho-jquery'), |
8 | Hammer = require('common/toy-hammer'), | 10 | Hammer = require('common/toy-hammer'), |
9 | ellipsis = require('yoho-mlellipsis'), | 11 | ellipsis = require('yoho-mlellipsis'), |
@@ -26,7 +28,6 @@ let mIntro, aIntro, logoImg; | @@ -26,7 +28,6 @@ let mIntro, aIntro, logoImg; | ||
26 | 28 | ||
27 | let likeHammer, $goodName, $title; | 29 | let likeHammer, $goodName, $title; |
28 | 30 | ||
29 | -require('guang/plustar-detail.page.css'); | ||
30 | require('plugin/wx-share'); | 31 | require('plugin/wx-share'); |
31 | require('common'); | 32 | require('common'); |
32 | require('./plustar-detail-render')(function() { | 33 | require('./plustar-detail-render')(function() { |
1 | +require('guang/plustar-list.page.css'); | ||
2 | + | ||
1 | let $ = require('yoho-jquery'), | 3 | let $ = require('yoho-jquery'), |
2 | lazyLoad = require('yoho-jquery-lazyload'), | 4 | lazyLoad = require('yoho-jquery-lazyload'), |
3 | Swiper = require('yoho-swiper'); | 5 | Swiper = require('yoho-swiper'); |
@@ -5,7 +7,6 @@ let $ = require('yoho-jquery'), | @@ -5,7 +7,6 @@ let $ = require('yoho-jquery'), | ||
5 | let $navs = $('#nav-tab > li'), | 7 | let $navs = $('#nav-tab > li'), |
6 | $contents = $('#ps-content > .content'); | 8 | $contents = $('#ps-content > .content'); |
7 | 9 | ||
8 | -require('guang/plustar-list.page.css'); | ||
9 | require('common'); | 10 | require('common'); |
10 | 11 | ||
11 | lazyLoad($('img.lazy')); | 12 | lazyLoad($('img.lazy')); |
@@ -3,6 +3,10 @@ | @@ -3,6 +3,10 @@ | ||
3 | * @author: xuqi<qi.xu@yoho.cn> | 3 | * @author: xuqi<qi.xu@yoho.cn> |
4 | * @date: 2015/11/28 | 4 | * @date: 2015/11/28 |
5 | */ | 5 | */ |
6 | + | ||
7 | +require('home/record.page.css'); | ||
8 | +require('common'); | ||
9 | + | ||
6 | let $ = require('yoho-jquery'); | 10 | let $ = require('yoho-jquery'); |
7 | 11 | ||
8 | let lazyLoad = require('yoho-jquery-lazyload'), | 12 | let lazyLoad = require('yoho-jquery-lazyload'), |
@@ -24,9 +28,6 @@ let end = false, | @@ -24,9 +28,6 @@ let end = false, | ||
24 | 28 | ||
25 | let winH = $(window).height(); | 29 | let winH = $(window).height(); |
26 | 30 | ||
27 | - | ||
28 | -require('home/record.page.css'); | ||
29 | -require('common'); | ||
30 | load.init(); | 31 | load.init(); |
31 | function moreRecord(cb) { | 32 | function moreRecord(cb) { |
32 | let count = $page.children('.browse-record-good').length; | 33 | let count = $page.children('.browse-record-good').length; |
1 | // 不要使用es6 | 1 | // 不要使用es6 |
2 | 'use strict'; | 2 | 'use strict'; |
3 | 3 | ||
4 | +require('home/coupons.page.css'); | ||
5 | +require('common'); | ||
6 | + | ||
4 | let $ = require('yoho-jquery'), | 7 | let $ = require('yoho-jquery'), |
5 | couponsListHbs = require('home/coupons-list.hbs'), | 8 | couponsListHbs = require('home/coupons-list.hbs'), |
6 | notResultHbs = require('home/coupon-not-result.hbs'); | 9 | notResultHbs = require('home/coupon-not-result.hbs'); |
@@ -15,9 +18,6 @@ let $couponTab1 = $('.coupon-tab1'), | @@ -15,9 +18,6 @@ let $couponTab1 = $('.coupon-tab1'), | ||
15 | scrollHandler, | 18 | scrollHandler, |
16 | $tabDom; | 19 | $tabDom; |
17 | 20 | ||
18 | -require('home/coupons.page.css'); | ||
19 | -require('common'); | ||
20 | - | ||
21 | $('body').css({'background-color': '#f2f2f2'}); | 21 | $('body').css({'background-color': '#f2f2f2'}); |
22 | 22 | ||
23 | couponFun = function() { | 23 | couponFun = function() { |
@@ -3,6 +3,10 @@ | @@ -3,6 +3,10 @@ | ||
3 | * @author: bikai<kai.bi@yoho.cn> | 3 | * @author: bikai<kai.bi@yoho.cn> |
4 | * @date: 2015/11/12 | 4 | * @date: 2015/11/12 |
5 | */ | 5 | */ |
6 | + | ||
7 | +require('home/index.page.css'); | ||
8 | +require('common'); | ||
9 | + | ||
6 | let $ = require('yoho-jquery'), | 10 | let $ = require('yoho-jquery'), |
7 | noticeScroll = require('plugin/notice-scroll'); | 11 | noticeScroll = require('plugin/notice-scroll'); |
8 | 12 | ||
@@ -14,9 +18,6 @@ let myImage = new Image(), | @@ -14,9 +18,6 @@ let myImage = new Image(), | ||
14 | 18 | ||
15 | let Swiper = require('yoho-swiper2'); | 19 | let Swiper = require('yoho-swiper2'); |
16 | 20 | ||
17 | -require('home/index.page.css'); | ||
18 | - | ||
19 | -require('common'); | ||
20 | if ($('.recommend-for-you').length) { | 21 | if ($('.recommend-for-you').length) { |
21 | require('./recommend-for-you-user-center'); | 22 | require('./recommend-for-you-user-center'); |
22 | } | 23 | } |
1 | +require('common.css'); | ||
2 | +require('home/order-address-modify.page.css'); | ||
3 | + | ||
1 | const $ = require('yoho-jquery'); | 4 | const $ = require('yoho-jquery'); |
2 | const Vue = require('vue'); | 5 | const Vue = require('vue'); |
3 | const tip = require('plugin/tip'); | 6 | const tip = require('plugin/tip'); |
4 | 7 | ||
5 | -require('home/order-address-modify.page.css'); | ||
6 | -require('common.css'); | ||
7 | require('common'); | 8 | require('common'); |
8 | 9 | ||
9 | let $areaForm = $('#areaForm'); | 10 | let $areaForm = $('#areaForm'); |
@@ -12,7 +13,6 @@ let $province = $('input[name=province]'); | @@ -12,7 +13,6 @@ let $province = $('input[name=province]'); | ||
12 | let $provinceCode = $('input[name=provinceCode]'); | 13 | let $provinceCode = $('input[name=provinceCode]'); |
13 | let $area = $('#area'); | 14 | let $area = $('#area'); |
14 | 15 | ||
15 | - | ||
16 | let vueAddressAct = require('home/address/address-act.vue'); | 16 | let vueAddressAct = require('home/address/address-act.vue'); |
17 | 17 | ||
18 | let addressVact = new Vue({ | 18 | let addressVact = new Vue({ |
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | * @date: 2015/11/10 | 4 | * @date: 2015/11/10 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | +require('layout/_modal.css'); | ||
8 | +require('home/order-list.page.css'); | ||
9 | + | ||
7 | let $ = require('yoho-jquery'), | 10 | let $ = require('yoho-jquery'), |
8 | Hammer = require('yoho-hammer'), | 11 | Hammer = require('yoho-hammer'), |
9 | lazyLoad = require('yoho-jquery-lazyload'), | 12 | lazyLoad = require('yoho-jquery-lazyload'), |
@@ -41,9 +44,6 @@ let firstScreen = $('.firstscreen-orders').children().size() > 0; | @@ -41,9 +44,6 @@ let firstScreen = $('.firstscreen-orders').children().size() > 0; | ||
41 | 44 | ||
42 | require('common'); | 45 | require('common'); |
43 | require('plugin/modal.alert'); | 46 | require('plugin/modal.alert'); |
44 | -require('layout/_modal.css'); | ||
45 | - | ||
46 | -require('home/order-list.page.css'); | ||
47 | 47 | ||
48 | // 减少计时 | 48 | // 减少计时 |
49 | function downCount(item) { | 49 | function downCount(item) { |
@@ -4,6 +4,9 @@ | @@ -4,6 +4,9 @@ | ||
4 | * @date: 2015/11/16 | 4 | * @date: 2015/11/16 |
5 | */ | 5 | */ |
6 | 6 | ||
7 | +require('layout/_modal.css'); | ||
8 | +require('home/order-detail-index.page.css'); | ||
9 | + | ||
7 | let $ = require('yoho-jquery'), | 10 | let $ = require('yoho-jquery'), |
8 | lazyLoad = require('yoho-jquery-lazyload'), | 11 | lazyLoad = require('yoho-jquery-lazyload'), |
9 | Hammer = require('yoho-hammer'), | 12 | Hammer = require('yoho-hammer'), |
@@ -24,10 +27,8 @@ let orderId = $('#order-detail').data('id'), | @@ -24,10 +27,8 @@ let orderId = $('#order-detail').data('id'), | ||
24 | let $sureClose = $('.order-opt').find('.cancel'); // 取消订单按钮 | 27 | let $sureClose = $('.order-opt').find('.cancel'); // 取消订单按钮 |
25 | let $sureRefund = $('.order-opt').find('.refund'); // 申请退款按钮 | 28 | let $sureRefund = $('.order-opt').find('.refund'); // 申请退款按钮 |
26 | 29 | ||
27 | -require('home/order-detail-index.page.css'); | ||
28 | require('common'); | 30 | require('common'); |
29 | require('plugin/modal.alert'); | 31 | require('plugin/modal.alert'); |
30 | -require('layout/_modal.css'); | ||
31 | 32 | ||
32 | lazyLoad({ | 33 | lazyLoad({ |
33 | try_again_css: 'order-failure' | 34 | try_again_css: 'order-failure' |
1 | +require('product/outlet/index.page.css'); | ||
2 | + | ||
1 | let $ = require('yoho-jquery'), | 3 | let $ = require('yoho-jquery'), |
2 | Swiper = require('yoho-swiper2'), | 4 | Swiper = require('yoho-swiper2'), |
3 | lazyLoad = require('yoho-jquery-lazyload'), | 5 | lazyLoad = require('yoho-jquery-lazyload'), |
@@ -9,8 +11,6 @@ let $categoryNav = $('.outlet-category-nav'); | @@ -9,8 +11,6 @@ let $categoryNav = $('.outlet-category-nav'); | ||
9 | 11 | ||
10 | let search = require('./sale/search'); | 12 | let search = require('./sale/search'); |
11 | 13 | ||
12 | -require('product/outlet/index.page.css'); | ||
13 | - | ||
14 | require('./outlet/nav'); | 14 | require('./outlet/nav'); |
15 | 15 | ||
16 | require('./outlet/fix-nav'); | 16 | require('./outlet/fix-nav'); |
@@ -2,8 +2,9 @@ | @@ -2,8 +2,9 @@ | ||
2 | * 品牌店铺首页 | 2 | * 品牌店铺首页 |
3 | */ | 3 | */ |
4 | 4 | ||
5 | -require('./shop/coupon'); | ||
6 | require('product/shop/shop.page.css'); | 5 | require('product/shop/shop.page.css'); |
6 | +require('./shop/coupon'); | ||
7 | + | ||
7 | let $ = require('yoho-jquery'), | 8 | let $ = require('yoho-jquery'), |
8 | lazyLoad = require('yoho-jquery-lazyload'), | 9 | lazyLoad = require('yoho-jquery-lazyload'), |
9 | Swiper = require('yoho-swiper'); | 10 | Swiper = require('yoho-swiper'); |
1 | -let $ = require('yoho-jquery'); | ||
2 | - | ||
3 | require('service/system.page.css'); | 1 | require('service/system.page.css'); |
4 | 2 | ||
3 | +let $ = require('yoho-jquery'); | ||
4 | + | ||
5 | if ($('.systemMain').height() < $(window).height()) { | 5 | if ($('.systemMain').height() < $(window).height()) { |
6 | $('.systemMain').height($(window).height()); | 6 | $('.systemMain').height($(window).height()); |
7 | } | 7 | } |
-
Please register or login to post a comment