fe / yohobuywap-node · Commits

Go to a project

Authored by htoooth
Commit 8ee4149a50a44e808665bdf4d2f273acc7056895 1 parent 584c2ff8

format js

Inline Side-by-side
Showing 10 changed files with 122 additions and 113 deletions
@@ -13,7 +13,9 @@ function index(req, res, next) { @@ -13,7 +13,9 @@ function index(req, res, next) {
13 req.ctx(YoLuckService).index(type, uid).then(result => { 13 req.ctx(YoLuckService).index(type, uid).then(result => {
14 if (result.error) { 14 if (result.error) {
15 if (type === YOLUCK_LIST_TYPE.joined && result.error === 401) { 15 if (type === YOLUCK_LIST_TYPE.joined && result.error === 401) {
16 - return res.redirect(`/signin.html?refer=//m.yohobuy.com/activity/yoluck/index.html?type=${YOLUCK_LIST_TYPE.joined}`); 16 + return res.redirect(
  17 + `/signin.html?refer=//m.yohobuy.com/activity/yoluck/index.html?type=${YOLUCK_LIST_TYPE.joined}`
  18 + );
17 } else { 19 } else {
18 return next(result.error); 20 return next(result.error);
19 } 21 }
@@ -63,7 +65,7 @@ function detail(req, res, next) { @@ -63,7 +65,7 @@ function detail(req, res, next) {
63 65
64 req.ctx(YoLuckService).getDetail(id, uid).then(result => { 66 req.ctx(YoLuckService).getDetail(id, uid).then(result => {
65 if (result.error) { 67 if (result.error) {
66 - return next(error); 68 + return next(result.error);
67 } 69 }
68 70
69 res.render('yoluck/detail', { 71 res.render('yoluck/detail', {
@@ -84,7 +86,7 @@ function getCode(req, res, next) { @@ -84,7 +86,7 @@ function getCode(req, res, next) {
84 if (!actPrizeId) { 86 if (!actPrizeId) {
85 return { 87 return {
86 error: '活动参数错误' 88 error: '活动参数错误'
87 - } 89 + };
88 } 90 }
89 91
90 req.ctx(YoLuckService).getCode({shareUid, uid, actPrizeId}).then(result => { 92 req.ctx(YoLuckService).getCode({shareUid, uid, actPrizeId}).then(result => {
1 function getDateList(date) { 1 function getDateList(date) {
2 if (!date) { 2 if (!date) {
3 - return [] 3 + return [];
4 } 4 }
5 5
6 - var year = date.getFullYear();  
7 - var month = date.getMonth() + 1;  
8 - var day = date.getDate(); 6 + let year = date.getFullYear();
  7 + let month = date.getMonth() + 1;
  8 + let day = date.getDate();
9 9
10 return [year, month, day]; 10 return [year, month, day];
11 } 11 }
12 12
13 function formatN(format, num) { 13 function formatN(format, num) {
14 - var n = num + '';  
15 - var nList = n.split('')  
16 - var l = nList.length;  
17 - var fl = format.length; 14 + let n = num + '';
  15 + let nList = n.split('');
  16 + let l = nList.length;
  17 + let fl = format.length;
18 18
19 if (format.length < nList.length) { 19 if (format.length < nList.length) {
20 return nList; 20 return nList;
21 } 21 }
22 22
23 - var el = fl - l; 23 + let el = fl - l;
24 24
25 - for(var i = 0; i < el; i++) { 25 + for (let i = 0; i < el; i++) {
26 nList.splice(0, 0, '0'); 26 nList.splice(0, 0, '0');
27 } 27 }
28 28
@@ -30,17 +30,17 @@ function formatN(format, num) { @@ -30,17 +30,17 @@ function formatN(format, num) {
30 } 30 }
31 31
32 function formatTime(start, end) { 32 function formatTime(start, end) {
33 - var startTime = new Date(start * 1000);  
34 - var endTime = new Date(end * 1000); 33 + let startTime = new Date(start * 1000);
  34 + let endTime = new Date(end * 1000);
35 35
36 - var startDate = getDateList(startTime);  
37 - var endDate = getDateList(endTime); 36 + let startDate = getDateList(startTime);
  37 + let endDate = getDateList(endTime);
38 38
39 - var startDateFormat = startDate[0] + '.' + formatN('00', startDate[1]) + '.' + formatN('00', startDate[2])  
40 - var endDateFormat = '-' + formatN('00', endDate[1]) + '.' + formatN('00', endDate[2]); 39 + let startDateFormat = startDate[0] + '.' + formatN('00', startDate[1]) + '.' + formatN('00', startDate[2]);
  40 + let endDateFormat = '-' + formatN('00', endDate[1]) + '.' + formatN('00', endDate[2]);
41 41
42 if (!end) { 42 if (!end) {
43 - return "即将上线：" + startDateFormat; 43 + return '即将上线：' + startDateFormat;
44 } 44 }
45 45
46 return startDateFormat + endDateFormat; 46 return startDateFormat + endDateFormat;
1 module.exports = function(v1, operator, v2, options) { 1 module.exports = function(v1, operator, v2, options) {
2 switch (operator) { 2 switch (operator) {
3 case '==': 3 case '==':
4 - return (v1 == v2) ? options.fn(this) : options.inverse(this); 4 + return (v1 == v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
5 case '===': 5 case '===':
6 return (v1 === v2) ? options.fn(this) : options.inverse(this); 6 return (v1 === v2) ? options.fn(this) : options.inverse(this);
7 case '!=': 7 case '!=':
8 - return (v1 != v2) ? options.fn(this) : options.inverse(this); 8 + return (v1 != v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
9 case '!==': 9 case '!==':
10 return (v1 !== v2) ? options.fn(this) : options.inverse(this); 10 return (v1 !== v2) ? options.fn(this) : options.inverse(this);
11 case '<': 11 case '<':
@@ -328,7 +328,7 @@ class YoLuckService extends global.yoho.BaseModel { @@ -328,7 +328,7 @@ class YoLuckService extends global.yoho.BaseModel {
328 step = STEP.ZERO; 328 step = STEP.ZERO;
329 } else { 329 } else {
330 if (activityStatus === ACTIVITY.START) { 330 if (activityStatus === ACTIVITY.START) {
331 - let myPrizeCount = result.myPrizeCount; 331 + myPrizeCount = result.myPrizeCount;
332 332
333 if (myPrizeCount === 0) { 333 if (myPrizeCount === 0) {
334 step = STEP.ZERO; 334 step = STEP.ZERO;
@@ -372,6 +372,7 @@ class YoLuckService extends global.yoho.BaseModel { @@ -372,6 +372,7 @@ class YoLuckService extends global.yoho.BaseModel {
372 372
373 async getResourceCode(params) { 373 async getResourceCode(params) {
374 const result = await this.api._getResourceCode(params); 374 const result = await this.api._getResourceCode(params);
  375 +
375 return _.get(result, '[0].data.list[0]', ''); 376 return _.get(result, '[0].data.list[0]', '');
376 } 377 }
377 378
@@ -381,11 +382,11 @@ class YoLuckService extends global.yoho.BaseModel { @@ -381,11 +382,11 @@ class YoLuckService extends global.yoho.BaseModel {
381 contentCode: 'ccc32dbedf164a52b4efa34383878860' 382 contentCode: 'ccc32dbedf164a52b4efa34383878860'
382 }); 383 });
383 384
384 - return result 385 + return result;
385 } catch (e) { 386 } catch (e) {
386 return { 387 return {
387 error: '出错了' 388 error: '出错了'
388 - } 389 + };
389 } 390 }
390 } 391 }
391 392
@@ -395,12 +396,11 @@ class YoLuckService extends global.yoho.BaseModel { @@ -395,12 +396,11 @@ class YoLuckService extends global.yoho.BaseModel {
395 contentCode: '5a2203f5656fbc9788bd8af70f2823d3' 396 contentCode: '5a2203f5656fbc9788bd8af70f2823d3'
396 }); 397 });
397 398
398 - return result 399 + return result;
399 } catch (e) { 400 } catch (e) {
400 - console.log(e);  
401 return { 401 return {
402 error: '出错了' 402 error: '出错了'
403 - } 403 + };
404 } 404 }
405 } 405 }
406 406
@@ -420,17 +420,19 @@ class YoLuckService extends global.yoho.BaseModel { @@ -420,17 +420,19 @@ class YoLuckService extends global.yoho.BaseModel {
420 420
421 if (result.code !== 200) { 421 if (result.code !== 200) {
422 logger.error(result); 422 logger.error(result);
  423 +
423 return { 424 return {
424 error: '错误' 425 error: '错误'
425 - } 426 + };
426 } 427 }
427 428
428 return result.data; 429 return result.data;
429 } catch (e) { 430 } catch (e) {
430 logger.error(e); 431 logger.error(e);
  432 +
431 return { 433 return {
432 error: '出错了' 434 error: '出错了'
433 - } 435 + };
434 } 436 }
435 } 437 }
436 } 438 }
@@ -10,12 +10,17 @@ let api = new YolukcApi(); @@ -10,12 +10,17 @@ let api = new YolukcApi();
10 let tip = require('js/plugin/tip'); 10 let tip = require('js/plugin/tip');
11 let yoSdk = require('yoho-activity-sdk'); 11 let yoSdk = require('yoho-activity-sdk');
12 let Clipboard = require('clipboard'); 12 let Clipboard = require('clipboard');
13 -let shareData = require('./yoluck/share'); 13 +let makeShareData = require('./yoluck/share');
  14 +
  15 +function reload() {
  16 + location = location; //eslint-disable-line
  17 +}
  18 +
14 require('js/plugin/modal.alert'); 19 require('js/plugin/modal.alert');
15 20
16 let store = { 21 let store = {
17 running: false, 22 running: false,
18 - shareUid: window.queryString['shareUid'] || '' 23 + shareUid: window.queryString.shareUid || ''
19 }; 24 };
20 25
21 new Swiper('.swiper-container', { 26 new Swiper('.swiper-container', {
@@ -26,7 +31,44 @@ new Swiper('.swiper-container', { @@ -26,7 +31,44 @@ new Swiper('.swiper-container', {
26 autoplay: 3000 31 autoplay: 3000
27 }); 32 });
28 33
29 -var luckAlert = { 34 +function share() {
  35 + let $product = $('.product-name');
  36 + let name = $product.data('name');
  37 + let img = $product.data('img');
  38 + let price = $product.data('price');
  39 + let id = $product.data('id');
  40 +
  41 + yoSdk.getUser().then(user => {
  42 + let shareData = makeShareData({
  43 + name: name,
  44 + imgUrl: img,
  45 + price: price,
  46 + shareUid: user.uid,
  47 + actPrizeId: id
  48 + });
  49 +
  50 + if (yoho.isApp) {
  51 + yoho.invokeMethod('go.showshareaction', shareData.app);
  52 + } else {
  53 + yoSdk.wxShare({
  54 + ...shareData.h5,
  55 + success() {
  56 + tip.show('分享成功', 3500);
  57 + }
  58 + });
  59 + }
  60 + });
  61 +}
  62 +
  63 +function fellow() {
  64 + $.yAlert({
  65 + content: `<div>公众号
  66 + <span style="font-weight: bolder">“潮流有货”</span>已经复制成功，</div>
  67 + <div>打开微信搜索去添加吧~</div>` // eslint-disable-line
  68 + });
  69 +}
  70 +
  71 +let luckAlert = {
30 $el: $('.js-luck-alert'), 72 $el: $('.js-luck-alert'),
31 init() { 73 init() {
32 this.bindEvent(); 74 this.bindEvent();
@@ -67,10 +109,6 @@ clipboard.on('success', function(e) { @@ -67,10 +109,6 @@ clipboard.on('success', function(e) {
67 e.clearSelection(); 109 e.clearSelection();
68 }); 110 });
69 111
70 -function reload() {  
71 - location = location;  
72 -}  
73 -  
74 luckAlert.init(); 112 luckAlert.init();
75 yoSdk.auth(); 113 yoSdk.auth();
76 114
@@ -85,41 +123,6 @@ setInterval(() => { @@ -85,41 +123,6 @@ setInterval(() => {
85 })); 123 }));
86 }, 1000); 124 }, 1000);
87 125
88 -function share() {  
89 - let $product= $('.product-name');  
90 - let name = $product.data('name');  
91 - let img = $product.data('img');  
92 - let price = $product.data('price');  
93 - let id = $product.data('id');  
94 -  
95 - yoSdk.getUser().then(user => {  
96 - let share = shareData({  
97 - name: name,  
98 - imgUrl: img,  
99 - price: price,  
100 - shareUid: user.uid,  
101 - actPrizeId: id  
102 - });  
103 -  
104 - if (yoho.isApp) {  
105 - yoho.invokeMethod('go.showshareaction', share.app);  
106 - } else {  
107 - yoSdk.wxShare({  
108 - ...share.h5,  
109 - success() {  
110 - tip.show('分享成功', 3500);  
111 - }  
112 - });  
113 - }  
114 - });  
115 -}  
116 -  
117 -function fellow() {  
118 - $.yAlert({  
119 - content: `<div>公众号<span style="font-weight: bolder">“潮流有货”</span>已经复制成功，</div><div>打开微信搜索去添加吧~</div>`  
120 - });  
121 -}  
122 -  
123 // 助力 126 // 助力
124 $('.action-bar-comp').on('click', '.js-join', function() { 127 $('.action-bar-comp').on('click', '.js-join', function() {
125 if (store.running) { 128 if (store.running) {
@@ -8,13 +8,14 @@ let timeCountDownTpl = require('hbs/activity/yoluck/time-countdown.hbs'); @@ -8,13 +8,14 @@ let timeCountDownTpl = require('hbs/activity/yoluck/time-countdown.hbs');
8 let formatCountDown = require('./yoluck/formatCountDown'); 8 let formatCountDown = require('./yoluck/formatCountDown');
9 let yoSdk = require('yoho-activity-sdk'); 9 let yoSdk = require('yoho-activity-sdk');
10 let yoho = require('js/yoho-app'); 10 let yoho = require('js/yoho-app');
11 -require('js/plugin/modal.alert');  
12 const tip = require('js/plugin/tip'); 11 const tip = require('js/plugin/tip');
13 -const shareData = require('./yoluck/share'); 12 +const makeShareData = require('./yoluck/share');
  13 +
  14 +require('js/plugin/modal.alert');
14 15
15 -var footerText = ['内容加载中...', '暂无更多内容']; 16 +let footerText = ['内容加载中...', '暂无更多内容'];
16 17
17 -var store = { 18 +let store = {
18 list: [{ 19 list: [{
19 page: 0, 20 page: 0,
20 }, { 21 }, {
@@ -31,10 +32,10 @@ var store = { @@ -31,10 +32,10 @@ var store = {
31 countDown: [], 32 countDown: [],
32 }; 33 };
33 34
34 -var api = new Api();  
35 -var bus$ = $.Callbacks();  
36 -var $tabpanel = $('.js-tab-comp');  
37 -var tabpanelStore = { 35 +let api = new Api();
  36 +let bus$ = $.Callbacks(); // eslint-disable-line
  37 +let $tabpanel = $('.js-tab-comp');
  38 +let tabpanelStore = {
38 tabs: [], 39 tabs: [],
39 key: 0, 40 key: 0,
40 nodes: [], 41 nodes: [],
@@ -45,6 +46,7 @@ var tabpanelStore = { @@ -45,6 +46,7 @@ var tabpanelStore = {
45 function initStore() { 46 function initStore() {
46 // 初始化为 47 // 初始化为
47 let tabIndex = +$tabpanel.data('type'); 48 let tabIndex = +$tabpanel.data('type');
  49 +
48 store.list[tabIndex].page = 1; 50 store.list[tabIndex].page = 1;
49 store.tabIndex = tabIndex; 51 store.tabIndex = tabIndex;
50 tabpanelStore.currentKey = tabIndex; 52 tabpanelStore.currentKey = tabIndex;
@@ -60,7 +62,7 @@ function updateFooter(msg) { @@ -60,7 +62,7 @@ function updateFooter(msg) {
60 } 62 }
61 63
62 function updateTabs() { 64 function updateTabs() {
63 - tabpanelStore.nodes.map(function(index) { 65 + tabpanelStore.nodes.each(function(index) {
64 let $this = $(this); 66 let $this = $(this);
65 67
66 let active = index === tabpanelStore.key; 68 let active = index === tabpanelStore.key;
@@ -72,7 +74,7 @@ function updateTabs() { @@ -72,7 +74,7 @@ function updateTabs() {
72 } 74 }
73 }); 75 });
74 76
75 - tabpanelStore.tabs.map(function() { 77 + tabpanelStore.tabs.each(function() {
76 let $this = $(this); 78 let $this = $(this);
77 let active = $this.data('index') === tabpanelStore.key; 79 let active = $this.data('index') === tabpanelStore.key;
78 80
@@ -166,8 +168,8 @@ function onReachBottom(type) { @@ -166,8 +168,8 @@ function onReachBottom(type) {
166 function fellow() { 168 function fellow() {
167 $.yAlert({ 169 $.yAlert({
168 content: `<div>微信搜索公众号</div> 170 content: `<div>微信搜索公众号</div>
169 - <div><span style="font-weight: bolder;">“潮流有货”</span>并关注，发送</div>  
170 - <div>关键词<span style="font-weight: bolder;">“开奖”</span>查询中奖信息</div>` 171 + <div><span style="font-weight: bolder;">“潮流有货”</span>并关注，发送</div>
  172 + <div>关键词<span style="font-weight: bolder;">“开奖”</span>查询中奖信息</div>`
171 }); 173 });
172 } 174 }
173 175
@@ -178,7 +180,7 @@ function share($el) { @@ -178,7 +180,7 @@ function share($el) {
178 let id = $el.data('id'); 180 let id = $el.data('id');
179 181
180 yoSdk.getUser().then(user => { 182 yoSdk.getUser().then(user => {
181 - let share = shareData({ 183 + let shareData = makeShareData({
182 name, 184 name,
183 imgUrl: img, 185 imgUrl: img,
184 price: price, 186 price: price,
@@ -187,16 +189,16 @@ function share($el) { @@ -187,16 +189,16 @@ function share($el) {
187 }); 189 });
188 190
189 if (yoho.isApp) { 191 if (yoho.isApp) {
190 - yoho.invokeMethod('go.showshareaction', share.app); 192 + yoho.invokeMethod('go.showshareaction', shareData.app);
191 } else { 193 } else {
192 yoSdk.wxShare({ 194 yoSdk.wxShare({
193 - ...share.h5, 195 + ...shareData.h5,
194 success() { 196 success() {
195 tip.show('分享成功', 3500); 197 tip.show('分享成功', 3500);
196 } 198 }
197 }); 199 });
198 } 200 }
199 - }) 201 + });
200 } 202 }
201 203
202 bus$.add(onTabClick); 204 bus$.add(onTabClick);
@@ -216,19 +218,19 @@ $tabpanel.on('click', '.js-tab', function() { @@ -216,19 +218,19 @@ $tabpanel.on('click', '.js-tab', function() {
216 }); 218 });
217 219
218 $tabpanel 220 $tabpanel
219 - .find('.prize-item-comp')  
220 .on('click', '.js-prizeitem', function() { 221 .on('click', '.js-prizeitem', function() {
221 let id = $(this).data('id'); 222 let id = $(this).data('id');
  223 +
222 yoho.goH5(`/activity/yoluck/${id}.html`); 224 yoho.goH5(`/activity/yoluck/${id}.html`);
223 - return true; 225 + return false;
224 }) 226 })
225 .on('click', '.js-share', function() { 227 .on('click', '.js-share', function() {
226 share($(this)); 228 share($(this));
227 - return true; 229 + return false;
228 }) 230 })
229 .on('click', '.js-fellow', function() { 231 .on('click', '.js-fellow', function() {
230 fellow(); 232 fellow();
231 - return true; 233 + return false;
232 }); 234 });
233 235
234 $(window).on('scroll', function() { 236 $(window).on('scroll', function() {
@@ -16,7 +16,7 @@ class Api { @@ -16,7 +16,7 @@ class Api {
16 } 16 }
17 17
18 getCode(shareUid) { 18 getCode(shareUid) {
19 - return $.post('', {shareUid}) 19 + return $.post('', {shareUid});
20 } 20 }
21 } 21 }
22 22
@@ -28,7 +28,7 @@ function shareData({name, imgUrl, price, shareUid, actPrizeId}) { @@ -28,7 +28,7 @@ function shareData({name, imgUrl, price, shareUid, actPrizeId}) {
28 desc: '限时抽奖活动', 28 desc: '限时抽奖活动',
29 link: h5Path(shareUid, actPrizeId), 29 link: h5Path(shareUid, actPrizeId),
30 } 30 }
31 - } 31 + };
32 } 32 }
33 33
34 module.exports = shareData; 34 module.exports = shareData;
1 function getDateList(date) { 1 function getDateList(date) {
2 if (!date) { 2 if (!date) {
3 - return [] 3 + return [];
4 } 4 }
5 5
6 - var year = date.getFullYear();  
7 - var month = date.getMonth() + 1;  
8 - var day = date.getDate(); 6 + let year = date.getFullYear();
  7 + let month = date.getMonth() + 1;
  8 + let day = date.getDate();
9 9
10 return [year, month, day]; 10 return [year, month, day];
11 } 11 }
12 12
13 function formatN(format, num) { 13 function formatN(format, num) {
14 - var n = num + '';  
15 - var nList = n.split('')  
16 - var l = nList.length;  
17 - var fl = format.length; 14 + let n = num + '';
  15 + let nList = n.split('');
  16 + let l = nList.length;
  17 + let fl = format.length;
18 18
19 if (format.length < nList.length) { 19 if (format.length < nList.length) {
20 return nList; 20 return nList;
21 } 21 }
22 22
23 - var el = fl - l; 23 + let el = fl - l;
24 24
25 - for(var i = 0; i < el; i++) { 25 + for (let i = 0; i < el; i++) {
26 nList.splice(0, 0, '0'); 26 nList.splice(0, 0, '0');
27 } 27 }
28 28
@@ -30,17 +30,17 @@ function formatN(format, num) { @@ -30,17 +30,17 @@ function formatN(format, num) {
30 } 30 }
31 31
32 function formatTime(start, end) { 32 function formatTime(start, end) {
33 - var startTime = new Date(start * 1000);  
34 - var endTime = new Date(end * 1000); 33 + let startTime = new Date(start * 1000);
  34 + let endTime = new Date(end * 1000);
35 35
36 - var startDate = getDateList(startTime);  
37 - var endDate = getDateList(endTime); 36 + let startDate = getDateList(startTime);
  37 + let endDate = getDateList(endTime);
38 38
39 - var startDateFormat = startDate[0] + '.' + formatN('00', startDate[1]) + '.' + formatN('00', startDate[2])  
40 - var endDateFormat = '-' + formatN('00', endDate[1]) + '.' + formatN('00', endDate[2]); 39 + let startDateFormat = startDate[0] + '.' + formatN('00', startDate[1]) + '.' + formatN('00', startDate[2]);
  40 + let endDateFormat = '-' + formatN('00', endDate[1]) + '.' + formatN('00', endDate[2]);
41 41
42 if (!end) { 42 if (!end) {
43 - return "即将上线：" + startDateFormat; 43 + return '即将上线：' + startDateFormat;
44 } 44 }
45 45
46 return startDateFormat + endDateFormat; 46 return startDateFormat + endDateFormat;
1 module.exports = function(v1, operator, v2, options) { 1 module.exports = function(v1, operator, v2, options) {
2 switch (operator) { 2 switch (operator) {
3 case '==': 3 case '==':
4 - return (v1 == v2) ? options.fn(this) : options.inverse(this); 4 + return (v1 == v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
5 case '===': 5 case '===':
6 return (v1 === v2) ? options.fn(this) : options.inverse(this); 6 return (v1 === v2) ? options.fn(this) : options.inverse(this);
7 case '!=': 7 case '!=':
8 - return (v1 != v2) ? options.fn(this) : options.inverse(this); 8 + return (v1 != v2) ? options.fn(this) : options.inverse(this); // eslint-disable-line
9 case '!==': 9 case '!==':
10 return (v1 !== v2) ? options.fn(this) : options.inverse(this); 10 return (v1 !== v2) ? options.fn(this) : options.inverse(this);
11 case '<': 11 case '<':