Merge branch 'tianmaoxiaoyuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into tianmaoxiaoyuan

00b5488c · wildfirecode13 · b162f9d9 · 398ac213 · 00b5488c · 00b5488c
Commit 00b5488c authored Oct 12, 2020 by wildfirecode13
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 15380 additions and 1 deletion

pagecanvas.js taobao_mini/client/pages/pagecanvas/pagecanvas.js +8 -1

debug.log taobao_mini/debug.log +15372 -0

No files found.
--- a/taobao_mini/client/pages/pagecanvas/pagecanvas.js
+++ b/taobao_mini/client/pages/pagecanvas/pagecanvas.js
@@ -375,7 +375,14 @@ Page({
            this.setData({
                activityBaseInfo: data
            })
-            this.initCanvas();
+            if(new Date().getTime() < data.startTime){
+                this.setData({
+                    endModalVisible:true
+                })
+            }else{
+                this.initCanvas();
+            }
+            
        }
    },
    /**页面显示登录 */

--- a/taobao_mini/debug.log
+++ b/taobao_mini/debug.log