解决合并冲突

pages/in-activity.vue

@@ -187,7 +187,21 @@
         <p class="title">打卡成功</p>
         <p class="message">已获得: {{clockAward.mark}}勤奋分, {{clockAward.bean}}云鹊豆</p>
         <div @click="hideClockModal" class="bottom-btn">我知道了</div>
-        <div class="close-btn"></div>
+        <div class="close-btn" @click="clockSuccessVisible=false"></div>
+      </div>
+    </div>
+
+    <!-- 获奖弹窗 -->
+    <div v-if="awardModalShow" class="toast-wrap" @touchmove.prevent>
+      <div class="full-screen-mask"></div>
+      <div class="content-wrap">
+        <img class="back-image" src="../assets/img/stage-two/clock-success-bg.png" alt="">
+        <!-- <img class="back-image" src="../assets/img/stage-two/win-award-bg.png" alt=""> -->
+        <!-- <img class="back-image" src="../assets/img/stage-two/award-cup-bg.png" alt=""> -->
+        <p class="title">昨日个人排名获奖啦</p>
+        <p class="message">恭喜您获得了{{yestodayAwards}}1台</p>
+        <div @click="hideClockModal" class="bottom-btn">我知道了</div>
+        <div class="close-btn" @click="awardModalShow=false"></div>
       </div>
     </div>
 
@@ -212,29 +226,20 @@
   import h5header from '@/components/h5header';
   import { getShareUrl } from '@/utils/index';
   import { Toast } from 'vant';
-  import { setEventByModuleCode } from '@/utils';
+  import { setEventByModuleCode, getFirstAwards } from '@/utils';
 
   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-30 00:00:00').getTime() , // 活动结束 一天
-        activeOverTimeStr2: new Date('2019-12-31 00:00:00').getTime() , // 活动结束 二天
+        awardModalShow: false, // 根据排名是否显示中奖弹窗
+        showAwadModal: true, // 根据活动时间是否展示中奖弹层以及查看昨日榜单逻辑
+        todayAwards: '', // 今日可获得
+        yestodayAwards: '', // 昨日可获得
         token: '',
-        activeOverTimeStr: new Date('2019/12/27 00:00:00') , // 活动结束 
         activityId: 2,    // 上线前等产品通知修改默认值
 
         serverTime: '',
@@ -279,7 +284,7 @@
           yesterdayDate: 0, // 昨日服务器时间（用来展示对应奖项）
           userYesterdayRank: 0, // 用戶昨日排名
         },
-        
+
         clockSuccessVisible: false,    // 是否显示 打卡成功 弹窗
         activityEndVisible: false,     // 是否显示 活动结束 弹窗
 
@@ -301,7 +306,7 @@
         },
         isWeb: false,
         shareObj: {
-          shareUrl: `https://${location.host}/year_end_ssr/shareActive?id=iRHw8t/pzgUM6TWi8UONRA==&taskId=1&activityId=1`,
+          // 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'
@@ -341,7 +346,7 @@
           }else{  // 10名以后 提示：再获得X勤奋分即可上升到前Y名获得 第10名奖品
             award = vm.awardList.No10;
           }
-          return `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${award}`
+          return `再获得${vm.doctorInfo.targetRequiredScore}勤奋分即可上升到前${vm.doctorInfo.targetRank}名获得${vm.todayAwards}`
         }
       }
     },
@@ -469,7 +474,11 @@
           // alert(JSON.stringify(res));
           vm.doctorInfo = res.data;
           if(vm.doctorInfo.userYesterdayRank>0 && vm.doctorInfo.userYesterdayRank<=10){
-            vm.clockSuccessVisible = true;
+            vm.awardModalShow = true;
+            vm.todayAwards = getFirstAwards(vm.doctorInfo.todayDate);
+            vm.yestodayAwards = getFirstAwards(vm.doctorInfo.yesterdayDate);
+            console.log(vm.todayAwards)
+            console.log(vm.yestodayAwards)
           }
         });
       },
@@ -614,9 +623,13 @@
       // 昨日获奖
       goToYesterdayPrize() {
         alert('跳转至 昨日获奖页面')
-        this.$router.push({
-          name: 'yesterday-prize',
-        });
+        if(!this.showAwadModal){
+          return;
+        }else{
+          this.$router.push({
+            name: 'yesterday-prize',
+          });
+        }
       },
       // 云鹊豆中心
       goToBeanCenter() {
@@ -885,7 +898,6 @@
         }
         return text;
       },
-<<<<<<< HEAD
 
       async jumpPage(url, id) {
         const _this = this;
@@ -1032,6 +1044,14 @@
       getHeaderHeight(val){
         this.padTop = val;
       },
+      // 校验活动结束后1天还是2天，用以判断是否展示【昨日弹层】以及【昨日榜单】逻辑
+      checkActiveOver() {
+        const time2 = new Date('2019-12-31 00:00:00').getTime(); // 活动结束 二天
+        const nowTime = new Date().getTime(); // 当前时间戳
+        if(nowTime >= time2){ // 活动结束2天以上
+          this.showAwadModal = false;
+        }
+      }
     },  
   }
 </script>