Merge branch 'dev-stage2-20191125' of...

Merge branch 'dev-stage2-20191125' of http://192.168.110.53/com.pica.cloud.foundation.frontend/year-end-activitiy into dev-stage2-20191125

pages/activityPage.vue

@@ -390,7 +390,7 @@
           let msecSixteen = new Date('2019/12/16 00:00:00').getTime();
           let msecThirty = new Date('2019/12/29 23:59:59').getTime();
           let notInActivityTips = (msec) => {
-            if( msec < msecSixteen || mesc > msecThirty ){
+            if( msec < msecSixteen || msec > msecThirty ){
               // alert('不在活动期间内')
               vm.scoreAwardTips = '不在活动期间内';
             }else{
@@ -893,7 +893,7 @@
             }
             setTimeout(() => {
               vm.canClockClick = true;
-            }, 1000)
+            }, 2000)
 
           }
         }else{  // 非打卡，直接走积木tims跳转逻辑
@@ -916,7 +916,7 @@
             }
             setTimeout(() => {
               vm.canClick = true;
-            }, 1000)
+            }, 2000)
           }
         }
       },

pages/shareResult.vue

@@ -69,7 +69,7 @@
 			}
 		},
 		mounted(){
-			if(this.$route.query.status=='true'){
+			if(this.$route.query.status.toString()=='true'){
 				this.statusTxt = '领取成功';
 			}else{
 				this.statusTxt = '您已领取';