[edit][message]

src/entry/content_help.js

@@ -12,18 +12,23 @@ const addDomMessage = (element) => {
     createApp(element).mount('#denet_message')
 }
 
-setTimeout(() => {
-    addDomMessage(ViewMessage)
-}, 3000);
-
+let timer = setInterval(() => {
+    if (document.body) {
+        init()
+        clearInterval(timer)
+    }
+}, 1000)
 
-window.onload = () => {
+const init = () => {
     // appendPopupPage();
+    addDomMessage(ViewMessage)
+
     chrome.runtime.sendMessage({
         actionType: "CONTENT_WINDOW_LOADED_SET_POPUP_PAGE",
         data: {}
     }, () => { });
-};
+}
+
 
 chrome.runtime.sendMessage({
     actionType: "CONTENT_SET_POPUP_CONFIG",

src/view/content/message/index.vue

@@ -4,7 +4,7 @@
             <div class="denet-message-area" @click="clickItem(item)" v-if="item.bizType == 2">
                 <img :src="require('@/assets/img/icon-message-fail.png')" alt />
                 <span>You were not selected from jerryWang's giveaway... click to see more giveaway!</span>
-                <div class="denet-message-close" @click="clickClose(item)">
+                <div class="denet-message-close" @click.stop="clickClose(item)">
                     <img :src="require('@/assets/img/icon-message-close.png')" alt />
                 </div>
             </div>
@@ -13,7 +13,7 @@
                 <span>Congratulations! You won <b class="denet-message-money">{{ item.bizData.lotteryMoney }}
                         {{ item.bizData.lotteryTokenSymbol }}</b> from jerryWang's giveaway!
                     🎉</span>
-                <div class="denet-message-close" @click="clickClose(item)">
+                <div class="denet-message-close" @click.stop="clickClose(item)">
                     <img :src="require('@/assets/img/icon-message-close.png')" alt />
                 </div>
             </div>

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

@@ -214,7 +214,7 @@
                     </div>
                     <div class="win">
                         <img :src="require('@/assets/svg/icon-win.svg')" />
-                        <span>{{ state.detail.totalCount }}WINNERS</span>
+                        <span>{{ state.detail.totalCount }} WINNERS</span>
                     </div>
                 </div>
             </div>
@@ -437,11 +437,11 @@ let facebookAppConfig = {
 };
 
 let reportParams = {
-  discordFans: '', 
-  twitterFans: '',
-  done: {
-  },
-  hasReport: false,
+    discordFans: '',
+    twitterFans: '',
+    done: {
+    },
+    hasReport: false,
 }
 
 let discordTaskDetail = null;
@@ -824,37 +824,43 @@ function getValidity() {
     }, 1000)
 }
 
-let stop_open_conut_down_time_type = ''
-function openConutDownTime(end_time_ms, type = '未打开', callback) {
+// 倒计时
+const getTimeStr = (end_time_ms) => {
     let now_time_ms, now_time, end_time
     let _time, _h, _m, _s, _time_str
-    let timer = setInterval(() => {
-        now_time_ms = new Date().getTime()
-        _time = end_time_ms - now_time_ms
-        if (_time > 0) {
-            now_time = moment(now_time_ms)
-            end_time = moment(end_time_ms)
-            _h = moment.duration(end_time.diff(now_time)).hours()
-            _m = moment.duration(end_time.diff(now_time)).minutes()
-            _s = moment.duration(end_time.diff(now_time)).seconds()
-            if (_h < 10) {
-                _h = '0' + _h
-            }
-            if (_m < 10) {
-                _m = '0' + _m
-            }
-            if (_s < 10) {
-                _s = '0' + _s
-            }
-            _time_str = `${_h}:${_m}:${_s}`
-        } else {
-            _time_str = `00:00:00`
+    now_time_ms = new Date().getTime()
+    _time = end_time_ms - now_time_ms
+    if (_time > 0) {
+        now_time = moment(now_time_ms)
+        end_time = moment(end_time_ms)
+        _h = moment.duration(end_time.diff(now_time)).hours()
+        _m = moment.duration(end_time.diff(now_time)).minutes()
+        _s = moment.duration(end_time.diff(now_time)).seconds()
+        if (_h < 10) {
+            _h = '0' + _h
+        }
+        if (_m < 10) {
+            _m = '0' + _m
         }
+        if (_s < 10) {
+            _s = '0' + _s
+        }
+        _time_str = `${_h}:${_m}:${_s}`
+    } else {
+        _time_str = `00:00:00`
+    }
+    return _time_str
+}
+
+let stop_open_conut_down_time_type = ''
+function openConutDownTime(end_time_ms, type = '未打开', callback) {
+    let timer = setInterval(() => {
         if (stop_open_conut_down_time_type == type) {
             clearInterval(timer)
         }
-        callback(_time_str)
+        callback(getTimeStr(end_time_ms))
     }, 1000);
+    callback(getTimeStr(end_time_ms))
 }
 
 const openFollowTabs = (arr_name) => {
@@ -964,7 +970,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) => {
@@ -977,7 +983,7 @@ const reSetBindTwtterId = (_params) => {
             }).then((res) => {
                 if (res.code == 0 || res.code == 3003) {
                     init({ from: 'reSetBindTwtterId' })
-                    reportBindTweetSuccess({discordTask, ..._params});
+                    reportBindTweetSuccess({ discordTask, ..._params });
                 }
             })
         }
@@ -985,7 +991,7 @@ 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",
@@ -994,18 +1000,18 @@ const reportBindTweetSuccess = (params) => {
         }
     })
 
-    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) { 
-                reportParams.hasReport = true;
-                Report.reportLog({
-                    objectType: Report.objectType.tweetPostBinded,
-                    twitterFans: reportParams.twitterFans,
-                    discordFans: reportParams.discordFans
-                });
+                if (reportParams.twitterFans !== '' && !reportParams.hasReport) {
+                    reportParams.hasReport = true;
+                    Report.reportLog({
+                        objectType: Report.objectType.tweetPostBinded,
+                        twitterFans: reportParams.twitterFans,
+                        discordFans: reportParams.discordFans
+                    });
                 }
             }
         })
@@ -1013,15 +1019,15 @@ 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) {
+    if (arr.length > 0) {
         inviteCode = arr[arr.length - 1];
     }
-    if(!inviteCode) {
+    if (!inviteCode) {
         return;
     }
 
@@ -1029,8 +1035,8 @@ const getDiscordInfo = (params, cb) => {
         inviteCode
     }).then(res => {
         cb && cb({
-        ...res,
-        inviteCode
+            ...res,
+            inviteCode
         })
     }).catch((err) => {
     });
@@ -1406,7 +1412,7 @@ const open_timer = () => {
     }
     open_timer_flag = true
 
-    openConutDownTime(state.detail.endTimestamp,'等待结果', (time_str) => {
+    openConutDownTime(state.detail.endTimestamp, '等待结果', (time_str) => {
         state.count_down_time = time_str
         if (time_str == '00:00:00') {
             init()
@@ -1876,21 +1882,21 @@ function onRuntimeMsg() {
                 }
                 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,