Merge branch 'dev-new-campaign-0302' of...

Merge branch 'dev-new-campaign-0302' of http://192.168.110.53/com.pica.cloud.education.frontend/pica-new-compaign into dev-new-campaign-0302

pages/index.vue

@@ -265,7 +265,7 @@ export default {
           //   this.taskTimeFlag = false;
           // }
           //判断是否到瓜分云鹊豆的时间
-          let carveTime = (new Date("2020/04/17 17:00:00")).getTime();//"2020/04/07 17:00:00"
+          let carveTime = (new Date("2020/04/07 17:00:00")).getTime();//"2020/04/07 17:00:00"
           if (carveTime <= nowTime) {
             this.isCarveTime = true;
             this.showLoading = true;