Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !155

H5/src/App.vue

@@ -22,9 +22,9 @@ export default {
       this.currentTitle = val.meta.title;
     }
   },
-  created() {
+  async created() {
     console.log("和App开始交互");
-    this.$bridgeToAppFun
+    await this.$bridgeToAppFun
       .getAuthToken()
       .then(res => {
         console.log("获取到token成功", res);

H5/src/views/settings.vue

@@ -92,8 +92,8 @@ export default {
   mounted() {
     console.log("读取用户信息");
     this.imageBaseUrl = process.env.VUE_APP_BASE_URL;
-    this.getUser();
     this.getAppVersion();
+    this.getUser();
   },
   methods: {
     onUpdateVersion() {
@@ -121,9 +121,9 @@ export default {
         }
       });
     },
-    getAppVersion() {
+    async getAppVersion() {
       console.log("设置里获取到的版本号", this.$bridgeToAppFun.getAppVersion());
-      this.version = "版本" + this.$bridgeToAppFun.getAppVersion();
+      this.version = "版本" + (await this.$bridgeToAppFun.getAppVersion());
     },
     getUser() {
       const params = {