Merge branch 'dev_1.1.7' of https://git.yishihui.com/DeNet/de-net into dev_1.1.7

src/view/iframe/treasure-hunt/index.vue

@@ -113,24 +113,22 @@ const handleCommon = (res, callback) => {
     catch (error) {
         console.error('catch', error)
     }
-
-    handleStatus()
     if (!res.data.srcContentId) {
         reSetBindTwtterId({
             postId: state.postId || '',
             tweetId: state.tweetId || ''
         }, () => {
-          sendChromeTabMessage({
-            actionType: "IFRAME_API_GET_TWEET_USER_INFO_REQ",
-            data: {
-                screen_name: state.detail.postUserInfo.nickName,
-                tweetId: state.tweetId,
-                objectType: Report.objectType.tweetPostBinded
-            }
-          })
+            sendChromeTabMessage({
+                actionType: "IFRAME_API_GET_TWEET_USER_INFO_REQ",
+                data: {
+                    screen_name: state.detail.postUserInfo.nickName,
+                    tweetId: state.tweetId,
+                    objectType: Report.objectType.tweetPostBinded
+                }
+            })
         })
     }
-    callback && callback()
+    handleStatus(callback)
 }
 let silver_open_box_big = require('@/assets/img/icon-silver-open-box-big.png')
 let gold_open_box_big = require('@/assets/img/icon-gold-open-box-big.png')
@@ -217,7 +215,7 @@ state.treasureOpen = () => {
     })
 }
 
-const handleStatus = () => {
+const handleStatus = (callback) => {
     // 如果 夺宝状态 = 未开始
     //   显示未开始页面
     // 如果 夺宝状态 = 进行中
@@ -257,7 +255,9 @@ const handleStatus = () => {
         state.page = '封面页'
         state.cover_status = '奖励已被领光'
         state.btn_loading = false
+        return
     }
+    callback && callback()
 }
 
 function onRuntimeMsg() {
@@ -271,12 +271,12 @@ function onRuntimeMsg() {
                     twitterFans = legacy ? legacy.followers_count : 0;
                 }
                 if (state.tweetId == req.tweetId && req.objectType == Report.objectType.tweetPostBinded) {
-                  Report.reportLog({
-                    objectType: Report.objectType.tweetPostBinded,
-                    twitterFans: twitterFans,
-                    redPacketType: Report.redPacketType.treasure,
-                    postId: state.postId
-                  });
+                    Report.reportLog({
+                        objectType: Report.objectType.tweetPostBinded,
+                        twitterFans: twitterFans,
+                        redPacketType: Report.redPacketType.treasure,
+                        postId: state.postId
+                    });
                 }
                 break;
         }