Showing
3 changed files
with
12 additions
and
11 deletions
@@ -130,7 +130,6 @@ | @@ -130,7 +130,6 @@ | ||
130 | {{#unless @root.wap.ucenter.removePrefer}} | 130 | {{#unless @root.wap.ucenter.removePrefer}} |
131 | {{> common/recommend-for-you}} | 131 | {{> common/recommend-for-you}} |
132 | {{/unless}} | 132 | {{/unless}} |
133 | - {{> common/suspend-cart}} | ||
134 | </div> | 133 | </div> |
135 | 134 | ||
136 | {{> footer-tab}} | 135 | {{> footer-tab}} |
@@ -25,7 +25,7 @@ const willStartActivity = { | @@ -25,7 +25,7 @@ const willStartActivity = { | ||
25 | // 奥莱首页控制器 | 25 | // 奥莱首页控制器 |
26 | exports.index = (req, res, next) => { | 26 | exports.index = (req, res, next) => { |
27 | let headerData = headerModel.setNav({ | 27 | let headerData = headerModel.setNav({ |
28 | - navTitle: 'OUTLET', | 28 | + navTitle: '奥莱', |
29 | navBtn: false | 29 | navBtn: false |
30 | }); | 30 | }); |
31 | 31 | ||
@@ -36,7 +36,7 @@ exports.index = (req, res, next) => { | @@ -36,7 +36,7 @@ exports.index = (req, res, next) => { | ||
36 | outletModel.getContent(categoryId, yhChannel, contentcode).then(result => { | 36 | outletModel.getContent(categoryId, yhChannel, contentcode).then(result => { |
37 | res.render('outlet', Object.assign({ | 37 | res.render('outlet', Object.assign({ |
38 | pageHeader: headerData, | 38 | pageHeader: headerData, |
39 | - title: 'OUTLET | Yoho!Buy有货 | 潮流购物逛不停', | 39 | + title: '奥莱 | Yoho!Buy有货 | 潮流购物逛不停', |
40 | }, result)); | 40 | }, result)); |
41 | }).catch(next); | 41 | }).catch(next); |
42 | }; | 42 | }; |
@@ -67,7 +67,7 @@ exports.activityTime = (req, res, next) => { | @@ -67,7 +67,7 @@ exports.activityTime = (req, res, next) => { | ||
67 | // 奥莱活动频道列表页 | 67 | // 奥莱活动频道列表页 |
68 | exports.activityList = (req, res, next) => { | 68 | exports.activityList = (req, res, next) => { |
69 | let headerData = headerModel.setNav({ | 69 | let headerData = headerModel.setNav({ |
70 | - navTitle: 'OUTLET', | 70 | + navTitle: '奥莱', |
71 | navBtn: false | 71 | navBtn: false |
72 | }); | 72 | }); |
73 | 73 | ||
@@ -98,4 +98,4 @@ exports.activityList = (req, res, next) => { | @@ -98,4 +98,4 @@ exports.activityList = (req, res, next) => { | ||
98 | pageFooter: true | 98 | pageFooter: true |
99 | }, result)); | 99 | }, result)); |
100 | }).catch(next); | 100 | }).catch(next); |
101 | -}; | 101 | +}; |
@@ -15,7 +15,7 @@ const api = global.yoho.API; | @@ -15,7 +15,7 @@ const api = global.yoho.API; | ||
15 | 15 | ||
16 | const resourcesProcess = require(`${utils}/resources-process`); | 16 | const resourcesProcess = require(`${utils}/resources-process`); |
17 | 17 | ||
18 | -const dateFormate = (str) =>{ | 18 | +const dateFormate = (str) => { |
19 | var time = new Date(str * 1000); | 19 | var time = new Date(str * 1000); |
20 | var y = time.getFullYear(); | 20 | var y = time.getFullYear(); |
21 | var m = time.getMonth() + 1; | 21 | var m = time.getMonth() + 1; |
@@ -85,7 +85,9 @@ const _convertNavData = (list) => { | @@ -85,7 +85,9 @@ const _convertNavData = (list) => { | ||
85 | }); | 85 | }); |
86 | }); | 86 | }); |
87 | 87 | ||
88 | - return {data: formatData}; | 88 | + return { |
89 | + data: formatData | ||
90 | + }; | ||
89 | }; | 91 | }; |
90 | 92 | ||
91 | /** | 93 | /** |
@@ -164,10 +166,10 @@ const _convertActicityData = (data) => { | @@ -164,10 +166,10 @@ const _convertActicityData = (data) => { | ||
164 | const _getActivityDetail = (id) => { | 166 | const _getActivityDetail = (id) => { |
165 | var params = { | 167 | var params = { |
166 | method: 'app.outlets.activityGet', | 168 | method: 'app.outlets.activityGet', |
167 | - sort: 1, // 接口规定传1 | 169 | + sort: 1, // 接口规定传1 |
168 | platform: 3, // h5平台代号 | 170 | platform: 3, // h5平台代号 |
169 | id: id, | 171 | id: id, |
170 | - type: 0 // 接口规定传0 | 172 | + type: 0 // 接口规定传0 |
171 | }; | 173 | }; |
172 | 174 | ||
173 | 175 | ||
@@ -235,7 +237,7 @@ const getActivity = (id) => { | @@ -235,7 +237,7 @@ const getActivity = (id) => { | ||
235 | return { | 237 | return { |
236 | activity: res, | 238 | activity: res, |
237 | productPool: res[0] && res[0].productPoolId || '', | 239 | productPool: res[0] && res[0].productPoolId || '', |
238 | - activityTitle: res[0] && res[0].title || 'OUTLET', | 240 | + activityTitle: res[0] && res[0].title || '奥莱', |
239 | saleType: 4 // 促销类型, 奥莱为4 | 241 | saleType: 4 // 促销类型, 奥莱为4 |
240 | }; | 242 | }; |
241 | }); | 243 | }); |
@@ -288,4 +290,4 @@ module.exports = { | @@ -288,4 +290,4 @@ module.exports = { | ||
288 | getActivity, | 290 | getActivity, |
289 | getRecentActivity, | 291 | getRecentActivity, |
290 | getActivityTime | 292 | getActivityTime |
291 | -}; | 293 | +}; |
-
Please register or login to post a comment