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

pages/luckDraw/common.js

@@ -81,7 +81,7 @@ export default {
             return time
         }
         const date = new Date(time * 1000)
-        const ymd = date.getFullYear(date) + "-" + (date.getMonth() + 1) + "-" + date.getDate()
+        const ymd = date.getFullYear(date) + "/" + (date.getMonth() + 1) + "/" + date.getDate()
         const fullH = new Date(ymd + " " + hourTime).getTime() / 1000;
         return fullH > time ? fullH : time
 
@@ -91,7 +91,7 @@ export default {
             return time
         }
         const date = new Date(time * 1000)
-        const ymd = date.getFullYear(date) + "-" + (date.getMonth() + 1) + "-" + date.getDate()
+        const ymd = date.getFullYear(date) + "/" + (date.getMonth() + 1) + "/" + date.getDate()
         const fullH = new Date(ymd + " " + hourTime).getTime() / 1000;
         return fullH < time ? fullH : time
     },

pages/luckDraw/detail.js

@@ -489,8 +489,15 @@ Page({
     },
 
     turnActivityListPage() {
-        wx.redirectTo({
-          url: '/pages/luckDraw/index',
+        let pages = getCurrentPages()
+        if (pages.length > 5 || pages.length == 1) {
+            wx.reLaunch({
+              url: '/pages/welfareMall/index/index',
+            })
+            return
+        }
+        wx.navigateBack({
+            delta: 1  
         })
     },