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

src/log-center/logger.js

@@ -1,4 +1,5 @@
 import {logApi} from '@/http/logApi'
+import { getBrowser } from '@/uilts/help.js';
 import { logType } from './logEnum.js';
 
 
@@ -12,10 +13,11 @@ export function reportLog(eventData = {}, 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 { url = '' } = tab;
             let platform = isMobile ? `mobile` : `pc`;
+            let browser = getBrowser();
             let extData = {
                 url,
                 platform,
-                browser: window.navigator.appName,
+                browser,
                 ...extParams,
             }
             paramsPretreatmentAndRequest(logType.denet, eventData, extData)

src/uilts/help.js

@@ -109,4 +109,23 @@ export function nextTick(fn, time = 50) {
             resolve();
         }, time)
     })
-}
+}
+
+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;
+}