Merge branch 'dev_lqs' into 'master'

修改

See merge request !38

H5/src/utils/bridgeToAppFun.js

@@ -2,29 +2,29 @@
 import jsBridge from "./bridge";
 import { getUserInfo } from "@/api/user";
 
-function saveUser(data) {
-  localStorage.setItem("token", data);
-  if (data) {
-    getUserInfo().then(res => {
-      if (res.code === 0) {
-        localStorage.setItem("user", JSON.stringify(res.data));
-      }
-    })
-  } else {
-    console.log("调用失败");
-  }
-}
+// function saveUser(data) {
+//   localStorage.setItem("token", data);
+//   if (data) {
+//     getUserInfo().then(res => {
+//       if (res.code === 0) {
+//         localStorage.setItem("user", JSON.stringify(res.data));
+//       }
+//     })
+//   } else {
+//     console.log("调用失败");
+//   }
+// }
 
 // 获取Token
 export function getAuthToken() {
   const userAgent = navigator.userAgent;
   console.log("ua", userAgent);
-  if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) { // android
-    console.log("android");
-    const token = window.android.getAuthToken();
-    saveUser(token);
-  } else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) { // ios
-    console.log("ios");
+  // if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) { // android
+  //   console.log("android");
+  //   const token = window.android.getAuthToken();
+  //   saveUser(token);
+  // } else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) { // ios
+  //   console.log("ios");
     return jsBridge.callhandler("getAuthToken", null, data => {
       console.log("调用2");
       localStorage.setItem("token", data);
@@ -40,7 +40,7 @@ export function getAuthToken() {
       }
     });
 
-  }
+  // }
 }
 
 // 退出