Merge branch 'dev_1.1.0' into pre

log-center/logger.js

@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { logType } from './logEnum.js';
+import { getBrowser } from '../utils/help';
 
 const logApi = {
 	prod: 'https://log.weiqumeta.com',
@@ -22,7 +23,16 @@ function paramsPretreatmentAndRequest(logType, params) {
         params: {
         }
     }
-    extParams = wrapObject(extParams)
+    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`;
+    let browser = getBrowser();
+    let extData = {
+        url: location.href,
+        browser,
+        platform,
+        ...extParams,
+    }
+    extParams = wrapObject(extData)
     params.params.logType = logType;
     params.params.eventData = JSON.stringify(eventData)
     params.params.extParams  = JSON.stringify(extParams)

pages/index.vue

@@ -332,7 +332,12 @@ export default {
 					eventData: {
 						businessType: Report.businessType.buttonClick,
 						objectType: Report.objectType.copyLinkButton
-					}
+					},
+                    extParams: {
+                        postId: this.detail.postId,
+                        srcContentId: this.detail.srcContentId,
+                        senderId: this.detail.srcUserId,
+                    }
 				}
 			})
 		},
@@ -358,7 +363,12 @@ export default {
 					eventData: {
 						businessType: Report.businessType.buttonClick,
 						objectType: Report.objectType.installButton
-					}
+					},
+                    extParams: {
+                        postId: this.detail.postId,
+                        srcContentId: this.detail.srcContentId,
+                        senderId: this.detail.srcUserId,
+                    }
 				}
 			})
 			switch (extensionsInstallChannel) {
@@ -619,7 +629,12 @@ export default {
 				params: {
 					eventData: {
 						businessType: Report.businessType.pageView
-					}
+					},
+                    extParams: {
+                        postId: this.detail.postId,
+                        srcContentId: this.detail.srcContentId,
+                        senderId: this.detail.srcUserId,
+                    }
 				}
 			})
 			this.show_moblie = true
@@ -664,7 +679,12 @@ export default {
 				params: {
 					eventData: {
 						businessType: Report.businessType.pageView,
-					}
+					},
+                    extParams: {
+                        postId: this.detail.postId,
+                        srcContentId: this.detail.srcContentId,
+                        senderId: this.detail.srcUserId,
+                    }
 				}
 			});
 		} else {

utils/help.js

@@ -48,4 +48,23 @@ export function isBrowser() {
     if (agent.indexOf("chrome") > 0) {
         return 'chrome'
     }
-}
+}
+
+export function getBrowser() {
+    let browser;
+    let UserAgent = navigator.userAgent.toLowerCase();
+    if (UserAgent.indexOf('chrome') > -1 && UserAgent.indexOf('safari') > -1) {
+        browser = `Chrome`
+    } else if (UserAgent.indexOf('firefox') > -1) {
+        browser = `Firefox`
+    } else if (UserAgent.indexOf('opera') > -1) {
+        browser = `Opera`
+    } else if (UserAgent.indexOf('safari') > -1 && UserAgent.indexOf('chrome') == -1) {
+        browser = `Safari`
+    } else if (UserAgent.indexOf('edge') > -1) {
+        browser = `Edge`
+    } else {
+        browser = `Other`
+    }
+    return browser;
+}