修改bug

src/common/js/filters.js

@@ -46,8 +46,10 @@ export function dateView(dateStr) {
  */
 export function dateFormat(date, format = 'yyyy-MM-dd') {
     if (date) {
-        date = date.replace(/-/g, '/')
-        date = new Date(Date.parse(date))
+        if(typeof date !== 'object'){
+            date = date.replace(/-/g, '/')
+            date = new Date(Date.parse(date))
+        }
 
         let o = {
             'M+': date.getMonth() + 1, //月份
@@ -223,7 +225,7 @@ export function strMaxLength(val, maxNum = 99) {
  * @param dateStr
  * @returns {string}
  */
-export function  viewDate(dateStr) {
+ export function  viewDate(dateStr) {
     if (!dateStr) {
         return "";
     }
@@ -254,4 +256,37 @@ export function  viewDate(dateStr) {
     } else{
         return `结束时间：${dateFormat(dateStr, "MM-dd hh:mm")}`;
     }
+}
+/**
+ * 日期转倒计时
+ * @param dateStr
+ * @returns {string}
+ */
+export function  viewDate2(dateNum) {
+    if (!dateNum) {
+        return "";
+    }
+    let dateNow = dateNum;
+
+    let mius = dateNow - Date.now();
+
+    let minute = 1000 * 60;
+    let hour = minute * 60;
+    let day = hour * 24;
+    let month = day * 30;
+    let quarter = month * 3;
+    let year = quarter * 12;
+    if (mius < 0) {
+        return `结束时间：${dateFormat(new Date(dateNum), "MM-dd hh:mm")}`;
+    } else if (mius < minute) {
+        return `距结束还有${Math.floor(mius / 1000)}秒`;
+    } else if (mius < hour) {
+        return `距结束还有${Math.floor(mius / minute)}分钟`;
+    } else if (mius < day) {
+        return `距结束还有${Math.floor(mius / hour)}小时`;
+    } else if (mius < month) {
+        return `距结束还有${Math.floor(mius / day)}天`;
+    } else{
+        return `结束时间：${dateFormat(new Date(dateNum), "MM-dd hh:mm")}`;
+    }
 }

src/pages/recommend/list.vue

@@ -16,7 +16,7 @@
                     </div>
                 </div>
                 <div class="time">
-                    {{ activityData.endTime | viewDate }}
+                    {{ activityData.endTime | viewDate2 }}
                 </div>
                 <div class="des" v-if="activityData.description">
                     <span class="key">品牌描述：</span>