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

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();
+            }
+            
         }
     },
     /**页面显示登录 */