Merge branch 'dev_lqs' into 'master'

修改

See merge request !59

H5/src/App.vue

@@ -6,7 +6,7 @@
 </template>
 
 <script>
-import { getAuthToken, showBottomBar } from "@/utils/bridgeToAppFun";
+import { getAuthToken } from "@/utils/bridgeToAppFun";
 import BaseNavBar from "./components/BaseNavBar.vue";
 export default {
   components: {

H5/src/components/BaseNavBar.vue

@@ -10,6 +10,7 @@
 </template>
 
 <script>
+// import { navigateBack } from "@/utils/bridgeToAppFun";
 export default {
   name: "BaseNavBar",
   props: {
@@ -20,6 +21,13 @@ export default {
   },
   methods: {
     onClickLeft() {
+      // console.log(this.$router);
+      // const currentPage = this.$router.currentRoute;
+      // if (whiteList.indexof(currentPage) > -1) {
+      //   navigateBack();
+      // } else {
+      //   this.$router.go(-1);
+      // }
       this.$router.go(-1);
     },
     onClickRight() {

H5/src/utils/localGetter.js

 export function getUserId() {
   let userInfo = localStorage.getItem("user");
   if (userInfo) {
-    return JSON.parse(userInfo).userId || "";
+    return JSON.parse(userInfo).userId;
   } else {
     return "";
   }

H5/src/views/settings.vue

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