Merge branch 'feature/sale' into release/4.8

@@ -8,6 +8,7 @@ const helpers = global.yoho.helpers;
 
 
 const timeFormat = {
 const timeFormat = {
     y: '剩{y}年{M}月{d}天',
     y: '剩{y}年{M}月{d}天',
+    M: '剩{M}月{d}天',
     d: '剩{d}天',
     d: '剩{d}天',
     h: '剩{h}小时',
     h: '剩{h}小时',
     m: '剩{m}分钟',
     m: '剩{m}分钟',
@@ -19,8 +20,9 @@ const timeFormat = {
 };
 };
 
 
 const anHour = 3600;
 const anHour = 3600;
-const aYear = 31536000;
 const aDay = anHour * 24;
 const aDay = anHour * 24;
+const aMonth = aDay * 30;
+const aYear = aMonth * 12;
 
 
 /**
 /**
  * 折扣专场专题列表过期时间处理 单位:s
  * 折扣专场专题列表过期时间处理 单位:s
@@ -37,6 +39,8 @@ const processTime = (time) => {
     } else {
     } else {
         if (time > aYear) {
         if (time > aYear) {
             type = 'y';
             type = 'y';
+        } else if (time > aMonth) {
+            type = 'M';
         } else if (time > aDay) {
         } else if (time > aDay) {
             type = 'dh';
             type = 'dh';
         } else {
         } else {