Merge branch 'dev_lqs' into 'master'

测试

See merge request !26

H5/src/App.vue

@@ -6,6 +6,7 @@
 </template>
 
 <script>
+import { getAuthToken } from "@/utils/bridgeToAppFun";
 import BaseNavBar from "./components/BaseNavBar.vue";
 export default {
   components: {
@@ -20,7 +21,16 @@ export default {
     $route(val) {
       this.currentTitle = val.meta.title;
     }
-  }
+  },
+  mounted() {
+    getAuthToken()
+      .then(res => {
+        console.log('success', res);
+      })
+      .catch(err => {
+        console.log('error', err);
+      });
+  },
 };
 </script>
 

H5/src/utils/bridgeToAppFun.js

@@ -7,12 +7,11 @@ export function getAuthToken() {
     console.log("调用1");
     jsBridge.callhandler("getAuthToken", null, data => {
       console.log("调用2");
-      console.log(data);
       localStorage.setItem('token', data);
       console.log("--------------");
       if (data) {
         alert("获取到的token" + data);
-        resolve();
+        resolve(data);
       } else {
         reject("调用失败，未返回data");
       }

H5/src/views/income/wallet.vue

@@ -73,10 +73,10 @@ export default {
     this.getWalletInfo();
     getAuthToken()
       .then(res => {
-        console.log(res);
+        console.log('success', res);
       })
       .catch(err => {
-        console.log(err);
+        console.log('error', err);
       });
   },
   methods: {