Merge branch 'dev_lqs' into 'master'

修改

See merge request !49

H5/src/utils/bridgeToAppFun.js

@@ -75,6 +75,7 @@ export function logoutToApp() {
   console.log("退出登录");
   const userAgent = navigator.userAgent;
   if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) {
+    console.log('an');
     window.android.logout()
   } else {
     jsBridge.callhandler("logout");

H5/src/views/settings.vue

@@ -68,7 +68,10 @@ export default {
   },
   methods: {
     getUser() {
-      getUserInfo2().then(res => {
+      const params = {
+        userId: this.$userId
+      }
+      getUserInfo2(params).then(res => {
         if (res.code == 0) {
           this.inviteeCode = res.data.inviteCode;
           this.avatar = 'http://8.131.244.76:81/' + res.data.headImage;