Authored by ccbikai

Merge branch 'feature/sale' into release/4.8

@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 const helpers = global.yoho.helpers; 7 const helpers = global.yoho.helpers;
8 8
9 const timeFormat = { 9 const timeFormat = {
10 - y: '剩{y}年{d}天', 10 + y: '剩{y}年{M}月{d}天',
11 d: '剩{d}天', 11 d: '剩{d}天',
12 h: '剩{h}小时', 12 h: '剩{h}小时',
13 m: '剩{m}分钟', 13 m: '剩{m}分钟',