解决合并冲突

pages/in-activity.vue

@@ -214,13 +214,24 @@
   import { Toast } from 'vant';
 
   const cookies = require('cookie-universal')();
+
+  // 校验活动结束后1天还是2天，用以判断是否展示【昨日弹层】以及【昨日榜单】逻辑
+  const checkActiveOver = (time1, time2) => {
+    const nowTime = new Date().getTime(); // 当前时间戳
+    if(nowTime >= time1 && nowTime < time2){
+
+    }else if(nowTime > time2){
+
+    }
+  }
             
   
   let vm = null;
   export default {
     data () {
       return {
-        activeOverTimeStr: new Date('2019/12/27 00:00:00') , // 活动结束 
+        activeOverTimeStr: new Date('2019-12-30 00:00:00').getTime() , // 活动结束 一天
+        activeOverTimeStr2: new Date('2019-12-31 00:00:00').getTime() , // 活动结束 二天
         activityId: 2,    // 上线前等产品通知修改默认值
 
         serverTime: '',
@@ -286,6 +297,12 @@
           id: '',
         },
         isWeb: false,
+        shareObj: {
+          shareUrl: `https://${location.host}/year_end_ssr/shareActive?id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1`,
+          title1: '分享title分享title',
+          title2: '分享desc分享desc',
+          shareImageUrl: 'https://file.yunqueyi.com/h5/nzhd19/share.png'
+        },
         padTop: 0
       }
     },