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/in-activity.vue

@@ -182,23 +182,22 @@
       <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">已获得: {{clockAward.mark}}勤奋分, {{clockAward.bean}}云鹊豆</p>
         <div @click="hideClockModal" class="bottom-btn">我知道了</div>
+        <div class="close-btn" @click="clockSuccessVisible=false"></div>
       </div>
     </div>
 
-    <!--昨日个人排名获奖啦  弹窗 -->
-    <div v-if="yesterdayWinVisible" class="toast-wrap" @touchmove.prevent>
+    <!-- 获奖弹窗 -->
+    <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/win-award-bg.png" alt="">
-        <p class="title" style="color: #EC592B;">昨日个人排名获奖啦!</p>
-        <p class="message">恭喜您获得了小米电视1台</p>
-        <div class="bottom-btn">xxxxxx</div>
-        <div class="close-btn"></div>
+        <p class="title">昨日个人排名获奖啦</p>
+        <p class="message">恭喜您获得了{{yestodayAwards}}1台</p>
+        <div @click="goQuest" class="bottom-btn">领奖</div>
+        <div class="close-btn" @click="awardModalShow=false"></div>
       </div>
     </div>
 
@@ -208,7 +207,7 @@
       <div class="content-wrap activity-end">
         <p class="content-text">本次活动已结束，感谢您的参与，最终获奖排名将于12月30日10点公布，届时查看</p>
         <ul class="btn-list">
-          <li @click="goBack">领奖</li>
+          <li @click="goBack">我知道了</li>
           <li @click="goToYesterdayPrize" class="high-light">查看昨日获奖</li>
         </ul>
       </div>
@@ -223,29 +222,19 @@
   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, // 根据活动时间是否展示中奖弹层以及查看昨日榜单逻辑
+        yestodayAwards: '', // 昨日可获得
         token: '',
-        activeOverTimeStr: new Date('2019/12/27 00:00:00') , // 活动结束 
         activityId: 2,    // 上线前等产品通知修改默认值
 
         serverTime: '',
@@ -290,7 +279,7 @@
           yesterdayDate: 0, // 昨日服务器时间（用来展示对应奖项）
           userYesterdayRank: 0, // 用戶昨日排名
         },
-        
+
         clockSuccessVisible: false,    // 是否显示 打卡成功 弹窗
         activityEndVisible: false,     // 是否显示 活动结束 弹窗
         yesterdayWinVisible: false,
@@ -313,7 +302,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'
@@ -366,6 +355,7 @@
     },
     mounted() {
       // 这里需要删掉！！！
+      // vm.getTasks();
       vm.getUserActivityInfo();
       // 这里需要删掉！！！
       vm.isWeb = vm.$rocNative.isWeb;
@@ -418,6 +408,32 @@
       hideClockModal() {
         vm.clockSuccessVisible = false;
       },
+      goQuest(){
+        // window.location.href = 'https://wj.qq.com/s2/5112128/18be/';
+        let url = 'https://wj.qq.com/s2/5112128/18be/';
+        let paramList = [
+          {
+            "key":"pageUrl",
+            "value": url,
+            "type":4,
+            "seqNo":1
+          },{
+            "key":"showTitle",
+            "value": false,
+            "type":1,
+            "seqNo":2
+          },{
+            "key":"title",
+            "value": '',
+            "type":1,
+            "seqNo":3
+          }
+        ]
+        vm.$rocNative.dispatchEventByModuleCode && vm.$rocNative.dispatchEventByModuleCode({
+            modeCode: 'M300',
+            jsonString: paramList
+        })
+      },
       returnStageText() {
         if(vm.currentStage == 0){
           return '';
@@ -493,9 +509,19 @@
           // alert('获取用户及分数信息。。。');
           // alert(JSON.stringify(res));
           vm.doctorInfo = res.data;
-          if(vm.doctorInfo.userYesterdayRank>0 && vm.doctorInfo.userYesterdayRank<=10){
-            vm.clockSuccessVisible = true;
+          if(vm.doctorInfo.userYesterdayRank==1){
+            vm.awardModalShow = true;
+            vm.yestodayAwards = getFirstAwards(vm.doctorInfo.yesterdayDate);
+          }else if(vm.doctorInfo.userYesterdayRank>=2 && vm.doctorInfo.userYesterdayRank<=3){
+            vm.awardModalShow = true;
+            vm.yestodayAwards = vm.awardList.No3;
+          }else if(vm.doctorInfo.userYesterdayRank>=4 && vm.doctorInfo.userYesterdayRank<=10){
+            vm.awardModalShow = true;
+            vm.yestodayAwards = vm.awardList.No10;
+          }else{
+            vm.awardModalShow = false;
           }
+
         });
       },
       goToCheckJoin() {   // 检查是否加入结构
@@ -639,9 +665,13 @@
       // 昨日获奖
       goToYesterdayPrize() {
         alert('跳转至 昨日获奖页面')
-        this.$router.push({
-          name: 'yesterday-prize',
-        });
+        if(!this.showAwadModal){
+          return;
+        }else{
+          this.$router.push({
+            name: 'yesterday-prize',
+          });
+        }
       },
       // 云鹊豆中心
       goToBeanCenter() {
@@ -1055,6 +1085,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>

service/activityMainpage.js

@@ -9,10 +9,10 @@ export const getUserScoreInfo = () => {
 	return request({
     url: `campaign/ranking/user_info`,
     method: 'post',
-    withCredentials: true,
-    // headers: {
-    //   token: '8F685DEFFEAC45C393AA55A4DD9E9048'
-    // }
+    // withCredentials: true,
+    headers: {
+      token: 'D3FFA515261C48478773C0BA17C11F52'
+    }
   })
 }