张泽世 / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit a1bd28e455b3665128c552a7a6565eb858e1d6af 2 parents 38f3c0f0 59664427

Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuywap-node into release/4.6

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
@@ -14,13 +14,13 @@ const willEndActivity = { @@ -14,13 +14,13 @@ const willEndActivity = {
14 type: 2, 14 type: 2,
15 template: 'outlet/will-end', 15 template: 'outlet/will-end',
16 page: 'outlet-will-end' 16 page: 'outlet-will-end'
17 -} 17 +};
18 18
19 const willStartActivity = { 19 const willStartActivity = {
20 type: 3, 20 type: 3,
21 template: 'outlet/will-start', 21 template: 'outlet/will-start',
22 page: 'outlet-will-start' 22 page: 'outlet-will-start'
23 -} 23 +};
24 24
25 // 奥莱首页控制器 25 // 奥莱首页控制器
26 exports.index = (req, res, next) => { 26 exports.index = (req, res, next) => {