Merge branch 'dev_lqs' into 'master'

修改

See merge request !56

H5/src/App.vue

@@ -28,7 +28,7 @@ export default {
     // }
     // localStorage.setItem('user', JSON.stringify(user));
     console.log("和App开始交互");
-    // showBottomBar();
+    showBottomBar(false);
     getAuthToken()
       .then(res => {
         console.log("获取token成功", res);

H5/src/views/settings.vue

@@ -72,9 +72,11 @@ export default {
       };
       getUserInfo2(params).then(res => {
         if (res.code == 0) {
-          this.inviteeCode = res.data.inviteCode;
-          this.avatar = "http://8.131.244.76:81" + res.data.headImage;
           localStorage.setItem("user", JSON.stringify(res.data));
+          this.$nextTick(() => {
+            this.inviteeCode = res.data.inviteCode;
+            this.avatar = "http://8.131.244.76:81" + res.data.headImage;
+          })
         }
       });
     },