Showing
7 changed files
with
41 additions
and
34 deletions
@@ -5104,11 +5104,11 @@ a{ | @@ -5104,11 +5104,11 @@ a{ | ||
5104 | } | 5104 | } |
5105 | .outlet-page .back-ground-white .num{ | 5105 | .outlet-page .back-ground-white .num{ |
5106 | text-align: center; | 5106 | text-align: center; |
5107 | - font-size: 0.625rem; | 5107 | + font-size: 0.5rem; |
5108 | color: #ff0705; | 5108 | color: #ff0705; |
5109 | } | 5109 | } |
5110 | -.outlet-page .back-ground-white .num .discountNum{ | ||
5111 | - font-size: 1rem; | 5110 | +.outlet-page .back-ground-white .num .discount-num{ |
5111 | + font-size: 0.75rem; | ||
5112 | } | 5112 | } |
5113 | .outlet-page .back-ground-white .title{ | 5113 | .outlet-page .back-ground-white .title{ |
5114 | text-align: center; | 5114 | text-align: center; |
@@ -5119,7 +5119,7 @@ a{ | @@ -5119,7 +5119,7 @@ a{ | ||
5119 | overflow: hidden; | 5119 | overflow: hidden; |
5120 | text-overflow: ellipsis; | 5120 | text-overflow: ellipsis; |
5121 | white-space: nowrap; | 5121 | white-space: nowrap; |
5122 | - margin-top: 1.875rem; | 5122 | + margin-top: 2.125rem; |
5123 | } | 5123 | } |
5124 | .outlet-page .back-ground-white .time{ | 5124 | .outlet-page .back-ground-white .time{ |
5125 | text-align: center; | 5125 | text-align: center; |
@@ -5213,6 +5213,26 @@ a{ | @@ -5213,6 +5213,26 @@ a{ | ||
5213 | .outlet-page .hidden{ | 5213 | .outlet-page .hidden{ |
5214 | display: none; | 5214 | display: none; |
5215 | } | 5215 | } |
5216 | +.outlet-page .empty{ | ||
5217 | + position: absolute; | ||
5218 | + width: 9.5rem; | ||
5219 | + left: 50%; | ||
5220 | + top: 7.5rem; | ||
5221 | + margin-left: -4.75rem; | ||
5222 | + font-size: 0.6rem; | ||
5223 | + color: #444; | ||
5224 | + font-family: STHeitiSC Mdedi; | ||
5225 | +} | ||
5226 | +.outlet-page .empty .bag{ | ||
5227 | + display: block; | ||
5228 | + width: 5rem; | ||
5229 | + height: 5rem; | ||
5230 | + margin-left: 2.25rem; | ||
5231 | + margin-bottom: 0.75rem; | ||
5232 | + background-image: url('../img/product/bag_moren.png'); | ||
5233 | + background-repeat: no-repeat; | ||
5234 | + background-size: 100% 100%; | ||
5235 | +} | ||
5216 | .receive-coupon-page *{ | 5236 | .receive-coupon-page *{ |
5217 | margin: 0; | 5237 | margin: 0; |
5218 | padding: 0; | 5238 | padding: 0; |
@@ -5644,6 +5664,7 @@ a{ | @@ -5644,6 +5664,7 @@ a{ | ||
5644 | .star-page .avatar-swiper.avatar-clone{ | 5664 | .star-page .avatar-swiper.avatar-clone{ |
5645 | margin-top: 0; | 5665 | margin-top: 0; |
5646 | position: fixed; | 5666 | position: fixed; |
5667 | + width: 16rem; | ||
5647 | padding: 0.125rem 0; | 5668 | padding: 0.125rem 0; |
5648 | z-index: 9; | 5669 | z-index: 9; |
5649 | background: #000; | 5670 | background: #000; |
This diff could not be displayed because it is too large.
1 | var $ = require('yoho-jquery'), | 1 | var $ = require('yoho-jquery'), |
2 | - countDown = require('../plugin/countdown'); | 2 | + Countdown = require('./outlet/countdown'); |
3 | 3 | ||
4 | var $time = $('.outlet-activity-time'), | 4 | var $time = $('.outlet-activity-time'), |
5 | endTime = $time.data('time-ms'); | 5 | endTime = $time.data('time-ms'); |
6 | 6 | ||
7 | var search = require('./sale/search'); | 7 | var search = require('./sale/search'); |
8 | 8 | ||
9 | +var el = $('.cd-lite'); | ||
9 | search.start(); | 10 | search.start(); |
10 | 11 | ||
11 | -countDown({ | ||
12 | - timeDom: $time, | ||
13 | - endTime: [endTime] | 12 | +new Countdown.countdown({ |
13 | + el: el | ||
14 | }); | 14 | }); |
@@ -12,7 +12,7 @@ require('../common'); | @@ -12,7 +12,7 @@ require('../common'); | ||
12 | 12 | ||
13 | if ($el.length > 0) { | 13 | if ($el.length > 0) { |
14 | $el.each(function() { | 14 | $el.each(function() { |
15 | - new Countdown.Countdown({ | 15 | + new Countdown.countdown({ |
16 | el: $(this) | 16 | el: $(this) |
17 | }); | 17 | }); |
18 | }); | 18 | }); |
@@ -25,11 +25,6 @@ if ($('#index_nav').length > 0) { | @@ -25,11 +25,6 @@ if ($('#index_nav').length > 0) { | ||
25 | }).goto($('#index_nav').find('.active').index()); | 25 | }).goto($('#index_nav').find('.active').index()); |
26 | } | 26 | } |
27 | 27 | ||
28 | -if ($('.will-end-back').length < 1) { | 28 | +if ($('.back-ground-white').length < 1) { |
29 | $('.empty').show(); | 29 | $('.empty').show(); |
30 | } | 30 | } |
31 | - | ||
32 | -$('.will-end-back').on('click', function() { | ||
33 | - tip.show('活动即将结束'); | ||
34 | - return false; | ||
35 | -}); |
@@ -2,22 +2,11 @@ | @@ -2,22 +2,11 @@ | ||
2 | * Created by runner on 16/6/14. | 2 | * Created by runner on 16/6/14. |
3 | */ | 3 | */ |
4 | var $ = require('yoho-jquery'), | 4 | var $ = require('yoho-jquery'), |
5 | - Countdown = require('./outlet/countdown'), | ||
6 | tip = require('../plugin/tip'), | 5 | tip = require('../plugin/tip'), |
7 | iscroll = require('./outlet/nav'); | 6 | iscroll = require('./outlet/nav'); |
8 | 7 | ||
9 | -var $el = $('.cd-lite'); | ||
10 | - | ||
11 | require('../common'); | 8 | require('../common'); |
12 | 9 | ||
13 | -if ($el.length > 0) { | ||
14 | - $el.each(function() { | ||
15 | - new Countdown.Countdown({ | ||
16 | - el: $(this) | ||
17 | - }); | ||
18 | - }); | ||
19 | -} | ||
20 | - | ||
21 | // 导航滚动 | 10 | // 导航滚动 |
22 | if ($('#index_nav').length > 0) { | 11 | if ($('#index_nav').length > 0) { |
23 | iscroll({ | 12 | iscroll({ |
@@ -30,6 +19,8 @@ if ($('.back-ground-white').length < 1) { | @@ -30,6 +19,8 @@ if ($('.back-ground-white').length < 1) { | ||
30 | } | 19 | } |
31 | 20 | ||
32 | $('.back-ground-white').on('click', function() { | 21 | $('.back-ground-white').on('click', function() { |
33 | - tip.show('活动即将开始'); | 22 | + tip.show('活动即将开始,敬请期待!'); |
34 | return false; | 23 | return false; |
35 | }); | 24 | }); |
25 | + | ||
26 | +$('.cd-medium').show(); |
@@ -55,11 +55,11 @@ | @@ -55,11 +55,11 @@ | ||
55 | 55 | ||
56 | .num { | 56 | .num { |
57 | text-align: center; | 57 | text-align: center; |
58 | - font-size: 25px; | 58 | + font-size: 20px; |
59 | color: #ff0705; | 59 | color: #ff0705; |
60 | 60 | ||
61 | .discount-num { | 61 | .discount-num { |
62 | - font-size: 40px; | 62 | + font-size: 30px; |
63 | } | 63 | } |
64 | } | 64 | } |
65 | 65 | ||
@@ -72,7 +72,7 @@ | @@ -72,7 +72,7 @@ | ||
72 | overflow: hidden; | 72 | overflow: hidden; |
73 | text-overflow: ellipsis; | 73 | text-overflow: ellipsis; |
74 | white-space: nowrap; | 74 | white-space: nowrap; |
75 | - margin-top: 75px; | 75 | + margin-top: 85px; |
76 | } | 76 | } |
77 | 77 | ||
78 | .time { | 78 | .time { |
@@ -186,10 +186,10 @@ | @@ -186,10 +186,10 @@ | ||
186 | 186 | ||
187 | .empty { | 187 | .empty { |
188 | position: absolute; | 188 | position: absolute; |
189 | - width: 330px; | 189 | + width: 380px; |
190 | left: 50%; | 190 | left: 50%; |
191 | top: 300px; | 191 | top: 300px; |
192 | - margin-left: -150px; | 192 | + margin-left: -190px; |
193 | font-size: 24px; | 193 | font-size: 24px; |
194 | color: #444; | 194 | color: #444; |
195 | font-family: STHeitiSC Mdedi; | 195 | font-family: STHeitiSC Mdedi; |
@@ -198,7 +198,7 @@ | @@ -198,7 +198,7 @@ | ||
198 | display: block; | 198 | display: block; |
199 | width: 200px; | 199 | width: 200px; |
200 | height: 200px; | 200 | height: 200px; |
201 | - margin-left: 65px; | 201 | + margin-left: 90px; |
202 | margin-bottom: 30px; | 202 | margin-bottom: 30px; |
203 | background-image: resolve("product/bag_moren.png"); | 203 | background-image: resolve("product/bag_moren.png"); |
204 | background-repeat: no-repeat; | 204 | background-repeat: no-repeat; |
-
Please register or login to post a comment