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

src/entry/background.js

@@ -178,7 +178,7 @@ function onInstalledMethod({ id, previousVersion, reason }) {
             previousVersion,
             reason,
             funcName: 'onInstalledMethodCallback'
-        });
+        })
         // 3.onInstalledMethod 执行了那个
         // 版本更新判断
         getChromeStorage('baseInfo', (info) => {
@@ -201,7 +201,6 @@ function onInstalledMethod({ id, previousVersion, reason }) {
                 thenInstalledMethod()
             }
             console.log('1-appVersionCode', appVersionCode)
-            console.log('1-info.appVersionCode', info.appVersionCode)
             console.log('1-info', info)
         })
         console.log('2-appVersionCode', appVersionCode)

src/view/iframe/publish/give-dialog.vue

@@ -2123,7 +2123,7 @@ const selectPublishMode = (params, index) => {
         pageSource: Report.pageSource.publisherDialog,
         businessType: Report.businessType.pageView,
       }, {
-        type: Report.getCurrentBizType(selectModeInfo.type)
+        type: Report.getCurrentBizType(params.type)
       });
     }
 

src/view/iframe/treasure-hunt/components/invite-friends.vue

@@ -15,7 +15,7 @@
                 @click="clickShare(item)" class="share-item" />
         </div>
         <v-btn :txt="state.open_btn.txt" :font-size="'17px'" class="btn" :icon="false"
-            :disabled="state.open_btn.disabled" v-show-log="state.log_invite_btn_show"
+            :disabled="state.open_btn.disabled" v-show-log="state.log_invite_btn_show" :loading="state.btn_loading"
             v-click-log="state.log_invite_btn_click" @onClick="clickBtn" font-weight="600"></v-btn>
 
     </div>
@@ -62,6 +62,7 @@ state.log_invite_copy_btn_click = {
     postId: state.postId
 }
 onMounted(() => {
+    state.btn_loading = false
     try {
         chrome.management.get('ophjlpahpchlmihnnnihgmmeilfjmjjc', (res) => {
             let linePluginInstalled = 0

src/view/iframe/treasure-hunt/components/invite-list.vue

@@ -15,7 +15,7 @@
             </div>
         </div>
         <div class="footer">
-            <v-btn :txt="state.open_btn.txt" :font-size="'17px'" class="btn" :icon="false"
+            <v-btn :txt="state.open_btn.txt" :font-size="'17px'" class="btn" :icon="false" :loading="state.btn_loading"
                 :disabled="state.open_btn.disabled" v-click-log="state.log_invite_btn_click" @onClick="clickBtn"
                 font-weight="600"></v-btn>
         </div>
@@ -49,13 +49,14 @@ state.log_invite_list_show = {
     businessType: Report.businessType.pageView,
     pageSource: Report.pageSource.beenInvitedPage,
     redPacketType: Report.redPacketType.treasure,
-    shareLinkId: state.invite_code || state.postId,
+    shareLinkId: state.invite_code,
     myShareLinkId: state.detail.inviteCopyUrl,
     currentInvitedNum: state.detail.inviteCount,
     postId: state.postId
 }
 
 onMounted(() => {
+    state.btn_loading = false
     list()
 })
 

src/view/iframe/treasure-hunt/components/open-box.vue

@@ -28,29 +28,6 @@ import Report from "@/log-center/log"
 
 let state = inject('state')
 
-state.log_open_box_show = {
-    businessType: Report.businessType.pageView,
-    pageSource: Report.pageSource.openTreasurePage,
-    redPacketType: Report.redPacketType.treasure,
-    shareLinkId: state.invite_code,
-    myShareLinkId: state.detail.inviteCopyUrl,
-    currentInvitedNum: state.detail.inviteCount,
-    postId: state.postId
-}
-
-
-state.log_open_box_btn_click = {
-    businessType: Report.businessType.buttonClick,
-    pageSource: Report.pageSource.openTreasurePage,
-    objectType: Report.objectType.nextButton,
-    redPacketType: Report.redPacketType.treasure,
-    shareLinkId: state.invite_code,
-    myShareLinkId: state.detail.inviteCopyUrl,
-    currentInvitedNum: state.detail.inviteCount,
-    postId: state.postId
-}
-
-
 const clickBtn = () => {
     state.open_box.show = false
 }

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

@@ -144,7 +144,8 @@ chrome.runtime.onMessage.addListener((req, sender, sendResponse) => {
                       objectType: Report.objectType.repostSuccess,
                       twitterFans: twitterFans,
                       redPacketType: Report.redPacketType.treasure,
-                      postId: state.postId
+                      postId: state.postId,
+                      shareLinkId: state.invite_code,
                   });
                 };
             break;

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

@@ -21,6 +21,7 @@ import Report from "@/log-center/log"
 let state = reactive({
     page: '',
     detail: {},
+    oldDetail: {},
     btn_loading: false,
     open_box: {
         show: false,
@@ -112,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')
@@ -156,6 +155,28 @@ state.treasureOpen = () => {
             }
             state.open_box.show = true
             state.open_box.data = res.data
+            state.oldDetail = state.detail
+
+            state.log_open_box_show = {
+                businessType: Report.businessType.pageView,
+                pageSource: Report.pageSource.openTreasurePage,
+                redPacketType: Report.redPacketType.treasure,
+                shareLinkId: state.invite_code,
+                myShareLinkId: state.oldDetail.inviteCopyUrl,
+                currentInvitedNum: state.oldDetail.inviteCount,
+                postId: state.postId
+            }
+
+            state.log_open_box_btn_click = {
+                businessType: Report.businessType.buttonClick,
+                pageSource: Report.pageSource.openTreasurePage,
+                objectType: Report.objectType.nextButton,
+                redPacketType: Report.redPacketType.treasure,
+                shareLinkId: state.invite_code,
+                myShareLinkId: state.oldDetail.inviteCopyUrl,
+                currentInvitedNum: state.oldDetail.inviteCount,
+                postId: state.postId
+            }
 
             state.init(() => {
                 state.inviteInit()
@@ -194,7 +215,7 @@ state.treasureOpen = () => {
     })
 }
 
-const handleStatus = () => {
+const handleStatus = (callback) => {
     // 如果 夺宝状态 = 未开始
     //   显示未开始页面
     // 如果 夺宝状态 = 进行中
@@ -234,7 +255,9 @@ const handleStatus = () => {
         state.page = '封面页'
         state.cover_status = '奖励已被领光'
         state.btn_loading = false
+        return
     }
+    callback && callback()
 }
 
 function onRuntimeMsg() {
@@ -248,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;
         }