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

src/entry/background.js

@@ -39,18 +39,30 @@ import {
 try {
     chrome.runtime.onMessage.addListener(onMessageMethod);
 } catch (error) {
-    console.log('error when background onMessage addListener', error)
+    console.log('error when background onMessage addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onMessage addListener',
+        errMsg: error.message
+    });
 }
 
 try {
     chrome.runtime.onInstalled.addListener(onInstalledMethod);
 } catch (error) {
-    console.log('error when background onInstalled addListener', error)
+    console.log('error when background onInstalled addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onInstalled addListener',
+        errMsg: error.message
+    });
 }
 
 
 
 
+
+
 // chrome.runtime.setUninstallURL('https://denet.me', (e) => { 
 //     console.log('e', e)
 // })
@@ -63,7 +75,13 @@ try {
         });
     });
 } catch (error) {
-    console.log('error when background onConnect addListener', error)
+    console.log('error when background onConnect addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onDisconnect addListener',
+        errMsg: error.message
+    });
+
 }
 
 
@@ -83,7 +101,12 @@ try {
         }
     })
 } catch (error) {
-    console.log('error when background onUpdateAvailable addListener', error)
+    console.log('error when background onUpdateAvailable addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onUpdateAvailable addListener',
+        errMsg: error.message
+    });
 }
 
 
@@ -104,7 +127,12 @@ try {
         }
     });
 } catch (error) {
-    console.log('error when background onAlarm addListener', error)
+    console.log('error when background onAlarm addListener', error);
+    Report.reportLog({
+        objectType: Report.objectType.background_function_catch,
+        funcName: 'onAlarm addListener',
+        errMsg: error.message
+    });
 }
 
 

src/http/fetch.js

@@ -3,10 +3,11 @@ import { getChromeStorage } from '@/uilts/chromeExtension.js'
 
 export async function commonFetch({ url = '', method = 'POST', params = {}, baseInfo = {} }) {
     try {
-        let storage_mid = await getChromeStorage('mid') || ''
+
+        let storage_mid = await getChromeStorage('mid').catch((error) => {console.log(error) }) || ''
         const { mid } = storage_mid || {}
         if (!baseInfo.token || !baseInfo.uid) {
-            const { accessToken: token = '', uid = '' } = await getChromeStorage('userInfo') || {}
+            const { accessToken: token = '', uid = '' } = await getChromeStorage('userInfo').catch((error) => {console.log(error) }) || {}
             baseInfo.token = token
             baseInfo.uid = uid
         }

src/log-center/logger.js

@@ -19,10 +19,10 @@ export async function reportLog(eventData = {}, extParams = {}) {
     // 2.reportLog 异常 存储到本地，再上报
     try {
         if (!userInfo) {
-            userInfo = await getChromeStorage('userInfo') || null;
+            userInfo = await getChromeStorage('userInfo').catch((error) => {console.log(error) }) || null;
         }
         if (!mid) {
-            mid = await getChromeStorage('mid') || '';
+            mid = await getChromeStorage('mid').catch((error) => {console.log(error) }) || '';
         }
         let isMobile = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i);
         let platform = isMobile ? `mobile` : `pc`;

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>
@@ -56,6 +56,7 @@ state.log_invite_list_show = {
 }
 
 onMounted(() => {
+    state.btn_loading = false
     list()
 })
 

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

@@ -1,5 +1,5 @@
 <template>
-    <div class="open-box" v-show-log="state.log_open_box_show">
+    <div class="open-box">
         <div class="background"></div>
         <!-- 开奖页 -->
         <div class="content">
@@ -15,8 +15,7 @@
                     </div>
                 </div>
             </div>
-            <v-btn :txt="'OK'" :font-size="'16px'" class="btn" :icon="false" v-click-log="state.log_open_box_btn_click"
-                @onClick="clickBtn"></v-btn>
+            <v-btn :txt="'OK'" :font-size="'16px'" class="btn" :icon="false" @onClick="clickBtn"></v-btn>
         </div>
     </div>
 </template>
@@ -24,12 +23,12 @@
 import { inject } from 'vue'
 import VBtn from '@/view/iframe/treasure-hunt/components/btn.vue'
 
-import Report from "@/log-center/log"
-
 let state = inject('state')
 
 const clickBtn = () => {
     state.open_box.show = false
+    state.open_box.clicked = true
+    state.init()
 }
 </script>
 <style lang="scss" scoped>

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

@@ -24,7 +24,9 @@ let state = reactive({
     oldDetail: {},
     btn_loading: false,
     open_box: {
+        showed: false,
         show: false,
+        clicked: false,
         data: {}
     },
     open_btn: {
@@ -100,9 +102,39 @@ state.init = (callback) => {
         })
     }
 }
+
+const reportOpenBoxLog = () => {
+    if (state.open_box.showed) {
+        Report.reportLog({
+            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.open_box.showed = false
+    }
+    if (state.open_box.clicked) {
+        Report.reportLog({
+            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
+        });
+        state.open_box.clicked = false
+    }
+}
+
 const handleCommon = (res, callback) => {
     state.detail = res.data
     state.postId = state.detail.postId
+    reportOpenBoxLog()
     try {
         state.tasks = JSON.parse(state.detail.startCondition)
         let follows = state.tasks.filter((item) => { return item.type == 1 })
@@ -154,29 +186,8 @@ state.treasureOpen = () => {
                 }
             }
             state.open_box.show = true
+            state.open_box.showed = 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()