Merge branch 'dev_lqs' into 'master'

安卓调用

See merge request !30

H5/src/utils/bridgeToAppFun.js

 // H5 去调用App的方法
 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("调用失败");
+  }
+}
+
 // 获取Token
 export function getAuthToken() {
-  getUserInfo().then()
-  // return new Promise((resolve, reject) => {
-  //   console.log("调用1");
+  const userAgent = navigator.userAgent;
+  if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) { // android
+    const token = window.android.getAuthToken();
+    saveUser(token);
+  } else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) { // ios
     jsBridge.callhandler("getAuthToken", null, data => {
       console.log("调用2");
       localStorage.setItem("token", data);
@@ -16,13 +32,11 @@ export function getAuthToken() {
             localStorage.setItem("user", JSON.stringify(res.data));
           }
         })
-        // resolve(data);
       } else {
-        // reject("调用失败，未返回data");
         console.log("调用失败");
       }
     });
-  // });
+  }
 }
 
 // 退出