Authored by 王水玲

sale 文件名与pc同意

@@ -63,11 +63,12 @@ exports.index = (req, res) => { @@ -63,11 +63,12 @@ exports.index = (req, res) => {
63 * @param {[object]} res 63 * @param {[object]} res
64 * @return {[type]} 64 * @return {[type]}
65 */ 65 */
66 -exports.breakCode = (req, res) => { 66 +exports.breakingYards = (req, res) => {
67 let headerData = headerModel.setNavHeader('断码区'); 67 let headerData = headerModel.setNavHeader('断码区');
68 let renderData = { 68 let renderData = {
69 module: 'product', 69 module: 'product',
70 page: 'break-code', 70 page: 'break-code',
  71 + title: '断码区',
71 pageHeader: headerData, 72 pageHeader: headerData,
72 pageFooter: true 73 pageFooter: true
73 }; 74 };
@@ -87,17 +88,17 @@ exports.breakCode = (req, res) => { @@ -87,17 +88,17 @@ exports.breakCode = (req, res) => {
87 * @param {[object]} res 88 * @param {[object]} res
88 * @return {[type]} 89 * @return {[type]}
89 */ 90 */
90 -exports.special = (req, res) => { 91 +exports.discount = (req, res) => {
91 let headerData = headerModel.setNavHeader('折扣专场'); 92 let headerData = headerModel.setNavHeader('折扣专场');
92 let renderData = { 93 let renderData = {
93 module: 'product', 94 module: 'product',
94 - page: 'special', 95 + page: 'discount',
95 pageHeader: headerData, 96 pageHeader: headerData,
96 pageFooter: true 97 pageFooter: true
97 }; 98 };
98 99
99 - saleModel.getSpecialData().then((result) => {  
100 - res.render('sale/special', Object.assign(renderData, result)); 100 + saleModel.getDiscountData().then((result) => {
  101 + res.render('sale/discount', Object.assign(renderData, result));
101 }).catch((err) => { 102 }).catch((err) => {
102 saleLogger(err, res); 103 saleLogger(err, res);
103 }); 104 });
@@ -110,19 +111,19 @@ exports.special = (req, res) => { @@ -110,19 +111,19 @@ exports.special = (req, res) => {
110 * @param {[object]} res 111 * @param {[object]} res
111 * @return {[type]} 112 * @return {[type]}
112 */ 113 */
113 -exports.specialDetail = (req, res) => { 114 +exports.discountDetail = (req, res) => {
114 let headerData = headerModel.setNavHeader(); 115 let headerData = headerModel.setNavHeader();
115 let id = req.query.id; 116 let id = req.query.id;
116 let renderData = { 117 let renderData = {
117 module: 'product', 118 module: 'product',
118 - page: 'special-detail', 119 + page: 'discount-detail',
119 pageFooter: true 120 pageFooter: true
120 }; 121 };
121 122
122 - saleModel.getSpecialDetailData(id).then((result) => { 123 + saleModel.getDiscountDetailData(id).then((result) => {
123 headerData.navTitle = result.title; 124 headerData.navTitle = result.title;
124 renderData.pageHeader = headerData; 125 renderData.pageHeader = headerData;
125 - res.render('sale/special-detail', Object.assign(renderData, result)); 126 + res.render('sale/discount-detail', Object.assign(renderData, result));
126 }).catch((err) => { 127 }).catch((err) => {
127 saleLogger(err, res); 128 saleLogger(err, res);
128 }); 129 });
@@ -139,6 +140,7 @@ exports.vip = (req, res) => { @@ -139,6 +140,7 @@ exports.vip = (req, res) => {
139 let renderData = { 140 let renderData = {
140 module: 'product', 141 module: 'product',
141 page: 'vip', 142 page: 'vip',
  143 + title: '会员专享',
142 pageHeader: headerData, 144 pageHeader: headerData,
143 pageFooter: true 145 pageFooter: true
144 }; 146 };
@@ -75,7 +75,7 @@ const processTime = (time) => { @@ -75,7 +75,7 @@ const processTime = (time) => {
75 * @param {[array]} list 75 * @param {[array]} list
76 * @return {[array]} 76 * @return {[array]}
77 */ 77 */
78 -const processSpecial = (list) => { 78 +const processDiscount = (list) => {
79 const formatData = []; 79 const formatData = [];
80 let flag = true; 80 let flag = true;
81 81
@@ -103,7 +103,7 @@ const processSpecial = (list) => { @@ -103,7 +103,7 @@ const processSpecial = (list) => {
103 * @param {[object]} params 103 * @param {[object]} params
104 * @return {[array]} 104 * @return {[array]}
105 */ 105 */
106 -const special = (params) => { 106 +const discount = (params) => {
107 params = params || {}; 107 params = params || {};
108 108
109 return api.get('', sign.apiSign(Object.assign({ 109 return api.get('', sign.apiSign(Object.assign({
@@ -307,13 +307,13 @@ exports.getBreakCodeData = (params) => { @@ -307,13 +307,13 @@ exports.getBreakCodeData = (params) => {
307 * @param {[object]} params 307 * @param {[object]} params
308 * @return {[object]} 308 * @return {[object]}
309 */ 309 */
310 -exports.getSpecialData = (params) => {  
311 - const specialData = {}; 310 +exports.getDiscountData = (params) => {
  311 + const discountData = {};
312 312
313 - return special(params).then((result) => { 313 + return discount(params).then((result) => {
314 if (result && result.code === 200) { 314 if (result && result.code === 200) {
315 - specialData.data = processSpecial(result.data);  
316 - return specialData; 315 + discountData.data = processDiscount(result.data);
  316 + return discountData;
317 } else { 317 } else {
318 logger.error('折扣专场专题列表返回 code 不是 200'); 318 logger.error('折扣专场专题列表返回 code 不是 200');
319 return {}; 319 return {};
@@ -327,16 +327,16 @@ exports.getSpecialData = (params) => { @@ -327,16 +327,16 @@ exports.getSpecialData = (params) => {
327 * @param {[string]} id 327 * @param {[string]} id
328 * @return {[object]} 328 * @return {[object]}
329 */ 329 */
330 -exports.getSpecialDetailData = (id) => { 330 +exports.getDiscountDetailData = (id) => {
331 let res = {}; 331 let res = {};
332 let param = { 332 let param = {
333 id: id 333 id: id
334 }; 334 };
335 335
336 - return special(param).then((result) => { 336 + return discount(param).then((result) => {
337 if (result && result.code === 200) { 337 if (result && result.code === 200) {
338 - res = processSpecial(result.data);  
339 - console.log(res); 338 + res = processDiscount(result.data);
  339 +
340 return { 340 return {
341 title: res[0].title, 341 title: res[0].title,
342 activity: { 342 activity: {
@@ -22,10 +22,10 @@ router.get(/\/pro_([\d]+)_([\d]+)\/(.*)/, detail.index); @@ -22,10 +22,10 @@ router.get(/\/pro_([\d]+)_([\d]+)\/(.*)/, detail.index);
22 router.get('/detail/intro/:productskn', detail.intro); 22 router.get('/detail/intro/:productskn', detail.intro);
23 router.get('/detail/preference/:productskn/:yhchannel/:brandId', detail.preference); 23 router.get('/detail/preference/:productskn/:yhchannel/:brandId', detail.preference);
24 24
25 -router.get('/sale', sale.index);  
26 -router.get('/sale/special', sale.special);  
27 -router.get('/sale/special/detail', sale.specialDetail);  
28 -router.get('/sale/breakCode', sale.breakCode); 25 +router.get('/sale/index', sale.index);
  26 +router.get('/sale/discount', sale.discount);
  27 +router.get('/sale/discount/detail', sale.discountDetail);
  28 +router.get('/sale/breakingYards', sale.breakingYards);
29 router.get('/sale/vip', sale.vip); 29 router.get('/sale/vip', sale.vip);
30 30
31 router.get('/sale/search', sale.search); 31 router.get('/sale/search', sale.search);
1 -<div class="sale-channel-page goods-page yoho-page"> 1 +<div class="discount-detail-page goods-page yoho-page">
2 2
3 {{> product/sale/banner}} 3 {{> product/sale/banner}}
4 4
1 -<div class="sale-special-page yoho-page"> 1 +<div class="discount-page yoho-page">
2 <ul class="special-list"> 2 <ul class="special-list">
3 {{#each data}} 3 {{#each data}}
4 <li> 4 <li>
1 -.sale-channel-page { 1 +.discount-detail-page {
2 .banner { 2 .banner {
3 position: relative; 3 position: relative;
4 overflow: hidden; 4 overflow: hidden;
1 -.sale-special-page { 1 +.discount-page {
2 overflow: hidden; 2 overflow: hidden;
3 height: auto; 3 height: auto;
4 background: #f0f0f0; 4 background: #f0f0f0;
1 @import "break-code"; 1 @import "break-code";
2 @import "goods-list"; 2 @import "goods-list";
3 @import "sale"; 3 @import "sale";
4 -@import "special";  
5 -@import "special-detail"; 4 +@import "discount";
  5 +@import "discount-detail";