Merge remote-tracking branch 'origin/jeffrey/feat/coupon-center' into jeffrey/feat/coupon-center

pages/luckDraw/common.js

@@ -13,9 +13,11 @@ export default {
         if (this.isEmpty(v)) {
             return null
         }
-        ymd = ymd.replace(/-/g, '/')     
         if (ymd) {
+            ymd = ymd.replace(/-/g, "/")
             v = ymd + " " + v
+        } else {
+            v = v.replace(/-/g, "/")
         }
         return new Date(v).getTime() / 1000
     },

pages/luckDraw/index.js

@@ -148,6 +148,7 @@ Page({
             return
         }
         const now = new Date();
+        
         this.data.activityList.forEach(v => {
             this.setActivityCountdownTime(now, v)
         })