Commit 98cb3c21 authored by leiqingsong's avatar leiqingsong

修改

parent 6dc5cd87
...@@ -23,12 +23,7 @@ export default { ...@@ -23,12 +23,7 @@ export default {
} }
}, },
created() { created() {
// const user = {
// userId: "1313123232"
// }
// localStorage.setItem('user', JSON.stringify(user));
console.log("和App开始交互"); console.log("和App开始交互");
// showBottomBar(false);
this.$bridgeToAppFun this.$bridgeToAppFun
.getAuthToken() .getAuthToken()
.then(res => { .then(res => {
...@@ -44,8 +39,6 @@ export default { ...@@ -44,8 +39,6 @@ export default {
if (data) { if (data) {
getUserInfo().then(res => { getUserInfo().then(res => {
console.log("存用户信息"); console.log("存用户信息");
console.log(res);
console.log("----");
if (res.code == 0) { if (res.code == 0) {
localStorage.setItem("user", JSON.stringify(res.data)); localStorage.setItem("user", JSON.stringify(res.data));
} }
......
...@@ -18,10 +18,8 @@ class bridgeToAppFun { ...@@ -18,10 +18,8 @@ class bridgeToAppFun {
} }
// 获取Token // 获取Token
getAuthToken() { getAuthToken() {
console.log("ua", this.userAgent);
if (this.userAgent === "android") { if (this.userAgent === "android") {
// android // android
console.log("android, 和安卓交互");
let token = null; let token = null;
try { try {
token = window.android.getAuthToken(); token = window.android.getAuthToken();
...@@ -29,7 +27,6 @@ class bridgeToAppFun { ...@@ -29,7 +27,6 @@ class bridgeToAppFun {
} catch { } catch {
console.log("token获取失败"); console.log("token获取失败");
} }
console.log("an-token", token);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (token) { if (token) {
resolve(token); resolve(token);
...@@ -39,13 +36,9 @@ class bridgeToAppFun { ...@@ -39,13 +36,9 @@ class bridgeToAppFun {
}); });
} else if (this.userAgent === "ios") { } else if (this.userAgent === "ios") {
// ios // ios
console.log("ios");
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
console.log("调用1");
jsBridge.callhandler("getAuthToken", null, data => { jsBridge.callhandler("getAuthToken", null, data => {
console.log("调用2");
localStorage.setItem("token", data); localStorage.setItem("token", data);
console.log("--------------");
if (data) { if (data) {
resolve(data); resolve(data);
} else { } else {
......
// 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);
}
}
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<van-cell is-link center title="头像" @click="onModefy"> <van-cell is-link center title="头像" @click="onModefy">
<img <img
class="avatar-img" class="avatar-img"
:src="process.env.VUE_APP_BASE_URL + avatar" :src="imgBaseUrl + avatar"
alt="头像" alt="头像"
/> />
</van-cell> </van-cell>
...@@ -59,6 +59,7 @@ export default { ...@@ -59,6 +59,7 @@ export default {
name: "Settings", name: "Settings",
data() { data() {
return { return {
imgBaseUrl: '',
avatar: "", avatar: "",
fileList: [], fileList: [],
fillCode: "", fillCode: "",
...@@ -67,6 +68,7 @@ export default { ...@@ -67,6 +68,7 @@ export default {
}; };
}, },
mounted() { mounted() {
this.imgBaseUrl = process.env.VUE_APP_BASE_URL;
this.getUser(); this.getUser();
}, },
methods: { methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment