Merge branch 'dev_lqs' into 'master'

测试

See merge request !39

H5/src/App.vue

@@ -23,7 +23,11 @@ export default {
     }
   },
   mounted() {
-    getAuthToken()
+    getAuthToken().then(res => {
+      console.log('获取token成功', res);
+    }).catch(err => {
+      console.log('获取token失败', err);
+    })
   }
 };
 </script>

H5/src/utils/bridgeToAppFun.js

@@ -25,11 +25,13 @@ export function getAuthToken() {
   //   saveUser(token);
   // } else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) { // ios
   //   console.log("ios");
-    return jsBridge.callhandler("getAuthToken", null, data => {
+    return new Promise((resolve, reject) => {
+      jsBridge.callhandler("getAuthToken", null, data => {
         console.log("调用2");
         localStorage.setItem("token", data);
         console.log("--------------");
         if (data) {
+          resolve(data)
           getUserInfo().then(res => {
             if (res.code === 0) {
               localStorage.setItem("user", JSON.stringify(res.data));
@@ -37,9 +39,10 @@ export function getAuthToken() {
           })
         } else {
           console.log("调用失败");
+          reject("getAuthToken", data);
         }
       });
-
+    }) 
   // }
 }
 

H5/src/utils/request.js

@@ -24,8 +24,6 @@ service.interceptors.request.use(
   },
   error => {
     if (loading) Toast.clear();
-    console.log("rqquest====错误", error);
-    console.log(error);
     this.$toast.fail(error.response.data.error);
   }
 );