'倒计时'

郭成尧
Commit 7077774f4cb611fea305f590eacd2f6a6a3090e5 1 parent 1eaabb61
Showing 1 changed file with 23 additions and 23 deletions
apps/product/models/sale-handler.js
--- a/apps/product/models/sale-handler.js
View file @7077774
+++ b/apps/product/models/sale-handler.js
View file @7077774
@@ -113,21 +113,21 @@ const handleFilterUrl = (originParam, newParam) => {
     let newParamArray = _.keys(newParam);
     // 判断参数是否已经存在
-    let isExist = !_.isEmpty(_.find(originParamArray, function(o) {
+    let isExist = !_.isEmpty(_.find(originParamArray, function (o) {
         return o === newParamArray[0];
     }));
     if (isExist) {
         tempOriginParam = Object.assign(tempOriginParam, originParam);
-        _.forEach(newParam, function(value, key) {
+        _.forEach(newParam, function (value, key) {
             tempOriginParam[key] = value;
         });
     } else {
         tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
     }
-    _.forEach(tempOriginParam, function(value, key) {
+    _.forEach(tempOriginParam, function (value, key) {
         dest = dest + key + '=' + value + '&';
     });
@@ -233,16 +233,16 @@ const handleSalebreakingYardsSortData = (origin, params) => {
     if (!_.isEmpty(params.sort)) {
         // 是否有分类筛选参数，如果有
-        _.forEach(params.sort.split(','), function(sortParam) {
-            _.forEach(origin, function(value) {
+        _.forEach(params.sort.split(','), function (sortParam) {
+            _.forEach(origin, function (value) {
                 // 判断是否在这组数据里面
                 if (!_.isEmpty(_.find(value.sort_id.split(','), o => {
-                    return o === sortParam;
-                }))) {
+                        return o === sortParam;
+                    }))) {
                     // 如果在某组数据里面，组合数据退出循环
-                    _.forEach(value.sub, function(subValue) {
+                    _.forEach(value.sub, function (subValue) {
                         let size = {};
                         size.checked =
@@ -257,8 +257,8 @@ const handleSalebreakingYardsSortData = (origin, params) => {
             });
         });
     } else { // 如果没有筛选参数，返回所有分类
-        _.forEach(origin, function(value) {
-            _.forEach(value.sub, function(subValue) {
+        _.forEach(origin, function (value) {
+            _.forEach(value.sub, function (subValue) {
                 let size = {};
                 size.checked = (parseInt(params.size, 10) === parseInt(subValue.size_id, 10)) ? true : false;
@@ -323,7 +323,7 @@ exports.handleSaleFilterData = (origin, params) => {
     if (!_.isEmpty(origin.brand)) {
         let count = 0;
-        _.forEach(origin.brand, function(value) {
+        _.forEach(origin.brand, function (value) {
             let brand = {};
             brand.checked = (parseInt(params.brand, 10) === parseInt(value.id, 10)) ? true : false;
@@ -350,13 +350,13 @@ exports.handleSaleFilterData = (origin, params) => {
     }
     // 来排排序
-    dest.brand.brandsShow = _.sortBy(dest.brand.brandsShow, function(o) {
+    dest.brand.brandsShow = _.sortBy(dest.brand.brandsShow, function (o) {
         return o.index;
     });
     // 处理 价格 筛选数据
     if (!_.isEmpty(origin.priceRange)) {
-        _.forEach(origin.priceRange, function(value, key) {
+        _.forEach(origin.priceRange, function (value, key) {
             let price = {
                 checked: (params.price === key) ? true : false,
                 href: handleFilterUrl(params, {price: key}),
@@ -542,7 +542,7 @@ exports.handleSaleOptsData = (params, total, extra) => {
     // 上一页下一页
     let preHref = (!_.isEmpty(params.page) && parseInt(params.page, 10) > 1) ?
-        parseInt(params.page, 10) - 1 : 1;
+    parseInt(params.page, 10) - 1 : 1;
     let nextHref = (!_.isEmpty(params.page)) ? parseInt(params.page, 10) + 1 : 2;
     if (dest.pageCount > 1 && (parseInt(params.page, 10) !== 1) &&
@@ -582,7 +582,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
         num: extra
     };
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         let category = {};
@@ -591,7 +591,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
         category.childList = [];
         category.href = handleFilterUrl(params, {sort: value.relation_parameter.sort});
         category.active = false;
-        _.forEach(value.sub, function(subValue) {
+        _.forEach(value.sub, function (subValue) {
             category.childList.push({
                 name: subValue.category_name,
                 num: subValue.node_count,
@@ -621,13 +621,13 @@ exports.handleSaleActivityData = (origin, channel) => {
     dest.big = [];
     dest.normal = [];
-    _.forEach(origin, function(value, key) {
+    _.forEach(origin, function (value, key) {
         let activity = {};
         activity.link =
             helpers.urlFormat('/product/sale/discount/detail', {id: value.id, channel: channel});
         activity.img = value.cover_url;
-        activity.time = processTime(value.left_time);
+        activity.time = processTime(parseInt(value.left_time, 10) * 1000);
         activity.brand = value.logo_url;
         activity.title = value.title;
         activity = Object.assign(activity, discountSplit(value.promotion_name));
@@ -653,7 +653,7 @@ exports.handleDiscountTitleData = (origin) => {
     dest.up = true;
     // dest.time = processTimes(origin.left_time);
-    dest.time = origin.left_time;
+    dest.time = parseInt(origin.left_time, 10) * 1000;
     Object.assign(dest, discountSplit(origin.promotion_name));
     return dest;
@@ -668,9 +668,9 @@ exports.handleSaleBannerData = (origin) => {
     var dest = {};
     dest.list = [];
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         if (value.template_name === 'focus') {
-            _.forEach(value.data, function(subValue) {
+            _.forEach(value.data, function (subValue) {
                 let banner = {};
                 banner.bannerHeight = 450;
@@ -695,9 +695,9 @@ exports.handleSaleBannerSmallData = (origin) => {
     var dest = [];
     let count = 0;
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         if (value.template_name === 'threePicture') {
-            _.forEach(value.data, function(picList) {
+            _.forEach(value.data, function (picList) {
                 if (count++ < 3) {
                     let smallPic = {};