Authored by 王水玲

折扣专场

@@ -32,13 +32,13 @@ exports.index = (req, res) => { @@ -32,13 +32,13 @@ exports.index = (req, res) => {
32 }; 32 };
33 33
34 34
35 - saleModel.getSaleDate({ 35 + saleModel.getSaleData({
36 yh_channel: 1, 36 yh_channel: 1,
37 page: 1, 37 page: 1,
38 limit: 10, 38 limit: 10,
39 order: 's_t_desc' 39 order: 's_t_desc'
40 }).then((result) => { 40 }).then((result) => {
41 - 41 + console.log(result.data.filter);
42 // result = { 42 // result = {
43 // headerBanner: { 43 // headerBanner: {
44 // list: [ 44 // list: [
@@ -8,20 +8,35 @@ const library = '../../../library'; @@ -8,20 +8,35 @@ const library = '../../../library';
8 const API = require(`${library}/api`).API; 8 const API = require(`${library}/api`).API;
9 const sign = require(`${library}/sign`); 9 const sign = require(`${library}/sign`);
10 const _ = require('lodash'); 10 const _ = require('lodash');
  11 +const helpers = require(`${library}/helpers`);
11 const camelCase = require(`${library}/camel-case`); 12 const camelCase = require(`${library}/camel-case`);
12 const api = new API(); 13 const api = new API();
  14 +const anHour = 3600000;
  15 +const anDay = anHour * 24;
13 16
14 /** 17 /**
15 - * 折扣专场跳转链接处理 18 + * 折扣专场列表数据处理
16 */ 19 */
17 const processSpecial = (list) => { 20 const processSpecial = (list) => {
18 const formatData = []; 21 const formatData = [];
  22 +
19 23
20 list = list || []; 24 list = list || [];
21 list = camelCase(list); 25 list = camelCase(list);
22 26
23 _.forEach(list, (data) => { 27 _.forEach(list, (data) => {
24 data.specialUrl = `/product/specialDetail?id=${data.id}`; 28 data.specialUrl = `/product/specialDetail?id=${data.id}`;
  29 +
  30 + if (data.leftTime < anHour) {
  31 + data.warnColor = true;
  32 + data.leftTime = '低于1小时';
  33 + } else {
  34 + if (data.leftTime > anDay) {
  35 + data.leftTime = helpers.dateDiffFormat('剩{d}天{h}小时', data.leftTime, 'ms');
  36 + } else {
  37 + data.leftTime = helpers.dateDiffFormat('剩{h}小时', data.leftTime, 'ms');
  38 + }
  39 + }
25 formatData.push(data); 40 formatData.push(data);
26 }); 41 });
27 42
@@ -4,10 +4,9 @@ @@ -4,10 +4,9 @@
4 overflow: hidden; 4 overflow: hidden;
5 5
6 .special-list { 6 .special-list {
7 - background: #fff;  
8 -  
9 li { 7 li {
10 margin-bottom: 30px; 8 margin-bottom: 30px;
  9 + background: #fff;
11 } 10 }
12 11
13 img { 12 img {
@@ -30,10 +29,12 @@ @@ -30,10 +29,12 @@
30 text-overflow: ellipsis; 29 text-overflow: ellipsis;
31 overflow: hidden; 30 overflow: hidden;
32 white-space: nowrap; 31 white-space: nowrap;
  32 + font-size: 24px;
33 } 33 }
34 34
35 .special-time { 35 .special-time {
36 float: right; 36 float: right;
  37 + font-size: 22px;
37 } 38 }
38 39
39 .red-color { 40 .red-color {