Showing
6 changed files
with
13 additions
and
17 deletions
@@ -140,7 +140,7 @@ exports.getBreakCodeData = (params) => { | @@ -140,7 +140,7 @@ exports.getBreakCodeData = (params) => { | ||
140 | * @return {[object]} | 140 | * @return {[object]} |
141 | */ | 141 | */ |
142 | exports.getVipData = (params) => { | 142 | exports.getVipData = (params) => { |
143 | - return api.get('', sign.apiSign(Object.assign({ | 143 | + return api.get('', sign.apiSign(Object.assign({ |
144 | method: 'app.activity.get', | 144 | method: 'app.activity.get', |
145 | sort: 2, | 145 | sort: 2, |
146 | plateform: 2 | 146 | plateform: 2 |
@@ -151,4 +151,4 @@ exports.getVipData = (params) => { | @@ -151,4 +151,4 @@ exports.getVipData = (params) => { | ||
151 | return Promise.reject('error'); | 151 | return Promise.reject('error'); |
152 | } | 152 | } |
153 | }); | 153 | }); |
154 | -} | ||
154 | +}; |
@@ -26,6 +26,7 @@ router.get('/special', sale.special); | @@ -26,6 +26,7 @@ router.get('/special', sale.special); | ||
26 | router.get('/specialDetail', sale.specialDetail); | 26 | router.get('/specialDetail', sale.specialDetail); |
27 | router.get('/breakCode', sale.breakCode); | 27 | router.get('/breakCode', sale.breakCode); |
28 | router.get('/vip', sale.vip); | 28 | router.get('/vip', sale.vip); |
29 | + | ||
29 | // router.get('/outlet', sale.outlet); | 30 | // router.get('/outlet', sale.outlet); |
30 | 31 | ||
31 | module.exports = router; | 32 | module.exports = router; |
@@ -10,7 +10,7 @@ var $activityTime = $('.activity-time'); | @@ -10,7 +10,7 @@ var $activityTime = $('.activity-time'); | ||
10 | 10 | ||
11 | lazyLoad($('img.lazy')); | 11 | lazyLoad($('img.lazy')); |
12 | 12 | ||
13 | -function getRTime(){ | 13 | +function getRTime() { |
14 | // var EndTime = $activityTime.data('time-ms'), | 14 | // var EndTime = $activityTime.data('time-ms'), |
15 | var EndTime = 1463743993785, | 15 | var EndTime = 1463743993785, |
16 | NowTime = new Date(), | 16 | NowTime = new Date(), |
@@ -35,8 +35,8 @@ function getRTime(){ | @@ -35,8 +35,8 @@ function getRTime(){ | ||
35 | showTime += h > 0 ? h + '小时' : ''; | 35 | showTime += h > 0 ? h + '小时' : ''; |
36 | showTime += m > 0 ? m + '分钟' : ''; | 36 | showTime += m > 0 ? m + '分钟' : ''; |
37 | showTime += s > 0 ? s + '秒' : ''; | 37 | showTime += s > 0 ? s + '秒' : ''; |
38 | - | 38 | + |
39 | $activityTime.find('span').html(showTime); | 39 | $activityTime.find('span').html(showTime); |
40 | } | 40 | } |
41 | 41 | ||
42 | -setInterval(getRTime,0); | 42 | +setInterval(getRTime, 0); |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | float: left; | 2 | float: left; |
3 | width: 276px; | 3 | width: 276px; |
4 | height: 506px; | 4 | height: 506px; |
5 | - margin: 10px 15px 40px 15px; | 5 | + margin: 10px 15px 40px; |
6 | 6 | ||
7 | .tag-container { | 7 | .tag-container { |
8 | height: 28px; | 8 | height: 28px; |
@@ -64,8 +64,8 @@ | @@ -64,8 +64,8 @@ | ||
64 | position: absolute; | 64 | position: absolute; |
65 | width: 60px; | 65 | width: 60px; |
66 | height: 60px; | 66 | height: 60px; |
67 | - top: 0px; | ||
68 | - right: 0px; | 67 | + top: 0; |
68 | + right: 0; | ||
69 | line-height: 60px; | 69 | line-height: 60px; |
70 | font-size: 30px; | 70 | font-size: 30px; |
71 | text-align: center; | 71 | text-align: center; |
@@ -100,11 +100,6 @@ | @@ -100,11 +100,6 @@ | ||
100 | .name a { | 100 | .name a { |
101 | display: block; | 101 | display: block; |
102 | min-height: 60px; | 102 | min-height: 60px; |
103 | -/* line-height: 29px;*/ | ||
104 | - /*overflow: hidden;*/ | ||
105 | -/* white-space: nowrap; | ||
106 | - text-overflow: ellipsis; | ||
107 | - text-decoration: none;*/ | ||
108 | font-size: 22px; | 103 | font-size: 22px; |
109 | color: #444; | 104 | color: #444; |
110 | margin: 20px 0; | 105 | margin: 20px 0; |
@@ -131,7 +126,7 @@ | @@ -131,7 +126,7 @@ | ||
131 | 126 | ||
132 | .vip-grade { | 127 | .vip-grade { |
133 | width: 52px; | 128 | width: 52px; |
134 | - height: 32px; | 129 | + height: 32px; |
135 | display: inline-block; | 130 | display: inline-block; |
136 | margin-right: 8px; | 131 | margin-right: 8px; |
137 | vertical-align: text-bottom; | 132 | vertical-align: text-bottom; |
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | bottom: 0; | 11 | bottom: 0; |
12 | left: 0; | 12 | left: 0; |
13 | z-index: 2; | 13 | z-index: 2; |
14 | - background: rgba(0, 0 ,0 , .5); | 14 | + background: rgba(0, 0, 0, 0.5); |
15 | text-align: right; | 15 | text-align: right; |
16 | color: #fff; | 16 | color: #fff; |
17 | font-size: 22px; | 17 | font-size: 22px; |
@@ -30,4 +30,4 @@ | @@ -30,4 +30,4 @@ | ||
30 | } | 30 | } |
31 | } | 31 | } |
32 | } | 32 | } |
33 | -} | ||
33 | +} |
-
Please register or login to post a comment