Merge branch 'dev_lqs' into 'master'

Dev lqs

See merge request !65

H5/src/App.vue

@@ -23,12 +23,7 @@ export default {
     }
   },
   created() {
-    // const user = {
-    //   userId: "1313123232"
-    // }
-    // localStorage.setItem('user', JSON.stringify(user));
     console.log("和App开始交互");
-    // showBottomBar(false);
     this.$bridgeToAppFun
       .getAuthToken()
       .then(res => {
@@ -44,8 +39,6 @@ export default {
       if (data) {
         getUserInfo().then(res => {
           console.log("存用户信息");
-          console.log(res);
-          console.log("----");
           if (res.code == 0) {
             localStorage.setItem("user", JSON.stringify(res.data));
           }

H5/src/main.js

@@ -8,8 +8,9 @@ import "amfe-flexible";
 import "@/plugins/vant-ui.js";
 import "@/plugins/echarts-plugins.js";
 import Vconsole from "vconsole";
-import { getUserId } from "./utils/localGetter";
+import { getUserId, getUserAvatar } from "./utils/localGetter";
 Vue.prototype.$userId = getUserId();
+Vue.prototype.$userAvatar = getUserAvatar();
 
 import bridgeToAppFun from "@/utils/bridgeToAppFun";
 Vue.prototype.$bridgeToAppFun = new bridgeToAppFun();

H5/src/utils/bridgeToAppFun.js

@@ -18,10 +18,8 @@ class bridgeToAppFun {
   }
   // 获取Token
   getAuthToken() {
-    console.log("ua", this.userAgent);
     if (this.userAgent === "android") {
       // android
-      console.log("android, 和安卓交互");
       let token = null;
       try {
         token = window.android.getAuthToken();
@@ -29,7 +27,6 @@ class bridgeToAppFun {
       } catch {
         console.log("token获取失败");
       }
-      console.log("an-token", token);
       return new Promise((resolve, reject) => {
         if (token) {
           resolve(token);
@@ -39,13 +36,9 @@ class bridgeToAppFun {
       });
     } else if (this.userAgent === "ios") {
       // ios
-      console.log("ios");
       return new Promise((resolve, reject) => {
-        console.log("调用1");
         jsBridge.callhandler("getAuthToken", null, data => {
-          console.log("调用2");
           localStorage.setItem("token", data);
-          console.log("--------------");
           if (data) {
             resolve(data);
           } else {

H5/src/utils/bridgeToAppFun_bak.js

-// H5 去调用App的方法
-import jsBridge from "./bridge";
-import { getUserInfo } from "@/api/user";
-
-function saveUser(data) {
-  localStorage.setItem("token", data);
-  if (data) {
-    getUserInfo().then(res => {
-      console.log("存用户信息");
-      console.log(res);
-      console.log("----");
-      if (res.code == 0) {
-        localStorage.setItem("user", JSON.stringify(res.data));
-      }
-    });
-  } else {
-    console.log("调用失败");
-  }
-}
-
-// 获取Token
-export function getAuthToken() {
-  const userAgent = navigator.userAgent;
-  console.log("ua", userAgent);
-  if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
-    // android
-    console.log("android, 和安卓交互");
-    const token = window.android.getAuthToken();
-    console.log("an-token", token);
-    return new Promise((resolve, reject) => {
-      if (token) {
-        saveUser(token);
-        resolve(token);
-      } else {
-        reject("失败");
-      }
-    });
-  } else if (userAgent.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/)) {
-    // ios
-    console.log("ios");
-    return new Promise((resolve, reject) => {
-      console.log("调用1");
-      jsBridge.callhandler("getAuthToken", null, data => {
-        console.log("调用2");
-        localStorage.setItem("token", data);
-        console.log("--------------");
-        if (data) {
-          resolve(data);
-          getUserInfo().then(res => {
-            if (res.code === 0) {
-              localStorage.setItem("user", JSON.stringify(res.data));
-            }
-          });
-        } else {
-          console.log("调用失败");
-          reject("getAuthToken", data);
-        }
-      });
-    });
-  }
-}
-
-// 退出
-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");
-  }
-}
-
-export function navigateBack() {
-  console.log("返回");
-  const userAgent = navigator.userAgent;
-  if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
-    console.log("an");
-    window.android.navigateBack();
-  } else {
-    jsBridge.callhandler("navigateBack");
-  }
-}
-
-export function showBottomBar(params) {
-  console.log("隐藏底部");
-  const userAgent = navigator.userAgent;
-  if (userAgent.indexOf("Android") > -1 || userAgent.indexOf("Adr") > -1) {
-    console.log("an");
-    window.android.showBottomBar(params);
-  } else {
-    jsBridge.callhandler("showBottomBar", params);
-  }
-}

H5/src/utils/localGetter.js

@@ -6,3 +6,12 @@ export function getUserId() {
     return "";
   }
 }
+
+export function getUserAvatar() {
+  let userInfo = localStorage.getItem("user");
+  if (userInfo) {
+    return JSON.parse(userInfo).headImage;
+  } else {
+    return "";
+  }
+}

H5/src/views/modefyAvatar.vue

@@ -33,7 +33,6 @@ export default {
     };
   },
   mounted() {
-    console.log("123");
     console.log(this.$route.query);
     const headImage = this.$route.query.headImage;
     if (headImage) {

H5/src/views/my/myStatus.vue

@@ -9,7 +9,7 @@
       >
       <div class="userAvatar">
         <div class="avatar-box">
-          <img class="avatar" src="@/assets/images/avatar.png" alt="头像" />
+          <img class="avatar" :src="avatar" alt="头像" />
           <img class="level-img" src="@/assets/images/等级展示框.png" alt />
           <span class="avatar-level">Lv.{{ userRecommendInfo.userlevel }}</span>
         </div>
@@ -88,6 +88,7 @@ export default {
   },
   data() {
     return {
+      avatar: process.env.VUE_APP_BASE_URL + this.$userAvatar,
       inviteeArr: [],
       userRecommendInfo: {},
       activeTab: "",

H5/src/views/settings.vue

@@ -5,7 +5,7 @@
       <van-cell is-link center title="头像" @click="onModefy">
         <img
           class="avatar-img"
-          :src="process.env.VUE_APP_BASE_URL + avatar"
+          :src="imgBaseUrl + avatar"
           alt="头像"
         />
       </van-cell>
@@ -59,6 +59,7 @@ export default {
   name: "Settings",
   data() {
     return {
+      imgBaseUrl: '',
       avatar: "",
       fileList: [],
       fillCode: "",
@@ -67,6 +68,7 @@ export default {
     };
   },
   mounted() {
+    this.imgBaseUrl = process.env.VUE_APP_BASE_URL;
     this.getUser();
   },
   methods: {