Merge branch 'dev_1.1.0_report_data' into dev_1.1.0

src/log-center/logger.js

@@ -7,7 +7,22 @@ import { logType } from './logEnum.js';
  * @extParams 最终上报到阿里云以json字符串存储的参数，如果extparams传入的不是obj会转换成obj
  */
 export function reportLog(eventData = {}, extParams = {}) {
-    paramsPretreatmentAndRequest(logType.denet, eventData, extParams)
+    if (chrome && chrome.tabs) {
+        chrome.tabs.getCurrent((tab) => {
+            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 { url = '' } = tab;
+            let platform = isMobile ? `mobile` : `pc`;
+            let extData = {
+                url,
+                platform,
+                browser: window.navigator.appName,
+                ...extParams,
+            }
+            paramsPretreatmentAndRequest(logType.denet, eventData, extData)
+        })
+    } else {
+        paramsPretreatmentAndRequest(logType.denet, eventData, extParams)
+    }
 }
 
 function paramsPretreatmentAndRequest(logType, eventData, extParams) {

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

@@ -395,6 +395,7 @@ let facebookAppConfig = {
 
 let state = reactive({
   status: '',
+  userId: '',
   loading_show: false,
   loading_redbag: true,
   detail: {},
@@ -480,6 +481,10 @@ async function clickLikeBtn() {
     objectType: Report.objectType.like,
     pageSource: Report.pageSource.task_page,
     businessType: Report.businessType.buttonClick
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 function clickDone() {
@@ -489,6 +494,10 @@ function clickDone() {
     objectType: Report.objectType.wallet_button,
     pageSource: Report.pageSource.received_success_page,
     businessType: Report.businessType.buttonClick
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 function handleScroll(e) {
@@ -586,6 +595,10 @@ async function clickRetweetBtn() {
     objectType: Report.objectType.retweet,
     pageSource: Report.pageSource.task_page,
     businessType: Report.businessType.buttonClick
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 
@@ -817,7 +830,11 @@ async function clickFollowAll(item, is_all) {
   if (is_all) {
     _log_obj.objectType = Report.objectType.follow_button
   }
-  Report.reportLog(_log_obj);
+  Report.reportLog(_log_obj, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
+  });
 }
 
 
@@ -853,6 +870,10 @@ const showCloseEndTimePageReport = () => {
   Report.reportLog({
     pageSource: Report.pageSource.expired_page,
     businessType: Report.businessType.pageView,
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 
@@ -862,6 +883,10 @@ const showSuccessPage = () => {
   Report.reportLog({
     pageSource: Report.pageSource.received_success_page,
     businessType: Report.businessType.pageView,
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 const showNotOpenPage = () => {
@@ -869,6 +894,10 @@ const showNotOpenPage = () => {
   Report.reportLog({
     pageSource: Report.pageSource.pending_page,
     businessType: Report.businessType.pageView
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 const showOpenedPage = () => {
@@ -881,6 +910,10 @@ const showOpenedPageReport = () => {
   Report.reportLog({
     pageSource: Report.pageSource.task_page,
     businessType: Report.businessType.pageView,
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 
@@ -894,6 +927,10 @@ const showRabbitPageReport = () => {
   Report.reportLog({
     pageSource: Report.pageSource.received_empty_rewards_page,
     businessType: Report.businessType.pageView,
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 
@@ -1035,6 +1072,7 @@ function init(initParams) {
       state.detail = JSON.parse(res.data.postBizData)
       state.detail.taskCondition = state.detail.taskCondition || []
       state.tweetId = state.srcContentId;
+      state.userId = res.data.srcUserId;
       state.tweet_author = state.detail.postUserInfo && state.detail.postUserInfo.nickName || '';
       // 不要删除这个console
       console.log('postBizData',state.detail)
@@ -1232,6 +1270,10 @@ function handleRedPacket() {
     pageSource: Report.pageSource.pending_page,
     businessType: Report.businessType.buttonClick,
     objectType: Report.objectType.open_button
+  }, {
+    postId: state.postId,
+    srcContentId: state.tweetId,
+    senderId: state.userId,
   });
 }
 
@@ -1297,7 +1339,10 @@ function handleFinishRedPacket() {
           businessType: Report.businessType.buttonClick,
           objectType: Report.objectType.get_giveaway
         }, {
-          get_giveaway_result: Report.extParams.success
+          get_giveaway_result: Report.extParams.success,
+          postId: state.postId,
+          srcContentId: state.tweetId,
+          senderId: state.userId,
         });
       } else {
         let _data = res.data.conditionResult
@@ -1373,7 +1418,10 @@ function handleFinishRedPacket() {
           businessType: Report.businessType.buttonClick,
           objectType: Report.objectType.get_giveaway
         }, {
-          get_giveaway_result: Report.extParams.failure
+          get_giveaway_result: Report.extParams.failure,
+          postId: state.postId,
+          srcContentId: state.tweetId,
+          senderId: state.userId,
         });
         if (discordAuthorizeRequired) {
           discordAuth('reAuth');
@@ -1386,7 +1434,10 @@ function handleFinishRedPacket() {
         businessType: Report.businessType.buttonClick,
         objectType: Report.objectType.get_giveaway
       }, {
-        get_giveaway_result: Report.extParams.failure
+        get_giveaway_result: Report.extParams.failure,
+        postId: state.postId,
+        srcContentId: state.tweetId,
+        senderId: state.userId,
       });
       handleErrorCode(res)
     }
@@ -1465,6 +1516,10 @@ function handleErrorCode(res) {
       Report.reportLog({
         pageSource: Report.pageSource.robot_detection_failed_page,
         businessType: Report.businessType.pageView,
+      }, {
+        postId: state.postId,
+        srcContentId: state.tweetId,
+        senderId: state.userId,
       });
       break
     // 无法校验用户Twitter信息