[edit][ui 和 消息通知定时器]

src/entry/background.js

@@ -30,10 +30,6 @@ import {
     facebookShareSuccess
 } from "@/logic/background/facebook";
 
-setInterval(() => {
-    getLuckMessage()
-}, 5000);
-
 //加载bg.js 执行
 setMessageCount();
 

src/view/iframe/red-packet/luck-draw.vue

@@ -276,14 +276,20 @@
         <!-- 关闭状态 -->
         <div v-else-if="state.status == 'close'" class="close">
             <!-- 红包被领完了 -->
-            <div class="header"
+            <!-- <div class="header"
                 :style="{ 'backgroundImage': `url(${require('@/assets/subject/002-back-head-top.svg')})` }"
                 v-if="state.close_status == '已经过期了'">
                 <div class="rabbit">
                     <img class="flower" :src="require('@/assets/svg/icon-flower.svg')" alt />
                     <p>This Draw is Complete</p>
                 </div>
+            </div> -->
+            <div class="header"
+                :style="{ 'backgroundImage': `url(${require('@/assets/subject/002-back-head-top.svg')})` }"
+                v-show="state.close_status == '已经过期了'">
+                <div class="close-title" v-for="item in state.close_text">{{ item }}</div>
             </div>
+
             <!-- 没有抽中 -->
             <div class="header"
                 :style="{ 'backgroundImage': `url(${require('@/assets/subject/002-back-head-top.svg')})` }"
@@ -1452,7 +1458,8 @@ onMounted(() => {
     // state.loading_show = true
     // state.status = 'success'
     // state.status = 'close'
-    // state.close_status = '等待结果'
+    // state.close_status = '已经过期了'
+    // state.close_text = [`This Giveaways`, `expired on ${moment(state.detail.endTimestamp).format('MM-DD')}`]
     // state.close_status = '没有抽中'
     // state.close_status = '已过期'
 
@@ -2237,7 +2244,8 @@ body {
             line-height: 32px;
             text-align: center;
             letter-spacing: 0.3px;
-
+            font-weight: 800;
+            font-size: 22px;
             color: #ffffff;
         }
 

src/view/iframe/red-packet/red-packet.vue

@@ -395,7 +395,7 @@ let facebookAppConfig = {
 };
 
 let reportParams = {
-  discordFans: '', 
+  discordFans: '',
   twitterFans: '',
   done: {
   },
@@ -465,7 +465,7 @@ async function clickLikeBtn() {
           window.open(`https://twitter.com/intent/like?tweet_id=${state.tweetId}`)
           state.done.like = false
         }
-      }).catch(()=>{
+      }).catch(() => {
         state.loading_show = false
       })
       break
@@ -577,7 +577,7 @@ async function clickRetweetBtn() {
           window.open(`https://twitter.com/retweet/like?tweet_id=${state.tweetId}`)
           state.done.retweet = false
         }
-      }).catch(()=>{
+      }).catch(() => {
         state.loading_show = false
       })
       break;
@@ -815,7 +815,7 @@ async function clickFollowAll(item, is_all) {
           })
           openFollowTabs(arr_name)
         }
-      }).catch(()=>{
+      }).catch(() => {
         state.loading_show = false
       })
       break
@@ -868,7 +868,7 @@ async function clickFollowAll(item, is_all) {
 // 重新绑定
 const reSetBindTwtterId = (_params) => {
   let postBizData = JSON.parse(_params.postBizData);
-  let {taskCondition} = postBizData;
+  let { taskCondition } = postBizData;
   let discordTask = JSON.parse(taskCondition).find(item => item.type == 7);
 
   getChromeStorage('userInfo', (_userInfo) => {
@@ -881,7 +881,7 @@ const reSetBindTwtterId = (_params) => {
       }).then((res) => {
         if (res.code == 0 || res.code == 3003) {
           init({ from: 'reSetBindTwtterId' })
-          reportBindTweetSuccess({discordTask, ..._params});
+          reportBindTweetSuccess({ discordTask, ..._params });
         }
       })
     }
@@ -889,21 +889,21 @@ const reSetBindTwtterId = (_params) => {
 }
 
 const reportBindTweetSuccess = (params) => {
-  let {discordTask, srcUserId} = params || {};
+  let { discordTask, srcUserId } = params || {};
   discordTaskDetail = discordTask;
   sendChromeTabMessage({
-      actionType: "IFRAME_API_GET_TWEET_USER_INFO_REQ",
-      data: {
-        screen_name: srcUserId
-      }
+    actionType: "IFRAME_API_GET_TWEET_USER_INFO_REQ",
+    data: {
+      screen_name: srcUserId
+    }
   })
 
-  if(discordTask) {
-    getDiscordInfo({inviteUrl: JSON.parse(discordTask.bizData).inviteUrl}, (res) => {
-      if(res.inviteCode == res.code) {
+  if (discordTask) {
+    getDiscordInfo({ inviteUrl: JSON.parse(discordTask.bizData).inviteUrl }, (res) => {
+      if (res.inviteCode == res.code) {
         reportParams.discordFans = res.approximate_member_count;
 
-        if(reportParams.twitterFans !== '' && !reportParams.hasReport) { 
+        if (reportParams.twitterFans !== '' && !reportParams.hasReport) {
           reportParams.hasReport = true;
           Report.reportLog({
             objectType: Report.objectType.tweetPostBinded,
@@ -917,18 +917,18 @@ const reportBindTweetSuccess = (params) => {
 }
 
 const getDiscordInfo = (params, cb) => {
-  let {inviteUrl} = params;
-  if(!inviteUrl) return;
+  let { inviteUrl } = params;
+  if (!inviteUrl) return;
   let inviteCode = '';
   let arr = inviteUrl.split('/');
-  if(arr.length > 0) {
-      inviteCode = arr[arr.length - 1];
+  if (arr.length > 0) {
+    inviteCode = arr[arr.length - 1];
   }
-  if(!inviteCode) {
-      return;
+  if (!inviteCode) {
+    return;
   }
   getInviteGuildInfo({
-      inviteCode
+    inviteCode
   }).then(res => {
     cb && cb({
       ...res,
@@ -1154,14 +1154,14 @@ function init(initParams) {
       state.userId = res.data.srcUserId;
       state.tweet_author = state.detail.postUserInfo && state.detail.postUserInfo.nickName || '';
       // 不要删除这个console
-      console.log('postBizData',state.detail)
+      console.log('postBizData', state.detail)
       checkFacebookReply();
       handleStatusPage()
     } else {
       handleErrorCode(res)
     }
   }).finally(() => {
-      state.loading_redbag = false
+    state.loading_redbag = false
   })
 }
 
@@ -1342,7 +1342,7 @@ function handleRedPacket() {
     } else {
       handleErrorCode(res)
     }
-  }).catch(()=>{
+  }).catch(() => {
     state.loading_show = false
   })
   // 埋点
@@ -1520,7 +1520,7 @@ function handleFinishRedPacket() {
       });
       handleErrorCode(res)
     }
-  }).catch(()=>{
+  }).catch(() => {
     state.loading_show = false
   })
 }
@@ -1722,27 +1722,27 @@ function onRuntimeMsg() {
         doTaskReport(req, sender);
         break;
       case 'CONTENT_RED_PACKET_REPLY_RASK_FINSH':
-        if(req.data && req.data.postId == state.postId) {
+        if (req.data && req.data.postId == state.postId) {
           state.done.reply = true;
           state.done.reply_red = false;
         }
         break;
       case 'CONTENT_API_GET_TWEET_USER_INFO_RES':
-        let {user} = req.data || {};
-        if(user && user.result && user.result.legacy) {
+        let { user } = req.data || {};
+        if (user && user.result && user.result.legacy) {
           let legacy = user.result.legacy;
           reportParams.twitterFans = legacy.followers_count;
 
-          if(!discordTaskDetail) {
-            if(reportParams.hasReport) return;
+          if (!discordTaskDetail) {
+            if (reportParams.hasReport) return;
             reportParams.hasReport = true;
             Report.reportLog({
               objectType: Report.objectType.tweetPostBinded,
               twitterFans: reportParams.twitterFans,
             });
           } else {
-            if(reportParams.discordFans !== '') {
-              if(reportParams.hasReport) return;
+            if (reportParams.discordFans !== '') {
+              if (reportParams.hasReport) return;
               reportParams.hasReport = true;
               Report.reportLog({
                 objectType: Report.objectType.tweetPostBinded,
@@ -2061,7 +2061,8 @@ body {
       line-height: 32px;
       text-align: center;
       letter-spacing: 0.3px;
-
+      font-weight: 800;
+      font-size: 22px;
       color: #ffffff;
     }