Commit c1ae3320 authored by xulili's avatar xulili

merge

parents b0255731 fda7ecc8
...@@ -22,8 +22,13 @@ export default { ...@@ -22,8 +22,13 @@ export default {
this.currentTitle = val.meta.title; this.currentTitle = val.meta.title;
} }
}, },
mounted() { created() {
getAuthToken() console.log('和App开始交互');
getAuthToken().then(res => {
console.log('获取token成功', res);
}).catch(err => {
console.log('获取token失败', err);
})
} }
}; };
</script> </script>
......
// H5 去调用App的方法 // H5 去调用App的方法
import jsBridge from "./bridge"; import jsBridge from "./bridge";
import { getUserInfo } from "@/api/user"; 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 // 获取Token
export function getAuthToken() { export function getAuthToken() {
getUserInfo().then() const userAgent = navigator.userAgent;
// return new Promise((resolve, reject) => { console.log("ua", userAgent);
// console.log("调用1"); if (userAgent.indexOf('Android') > -1 || userAgent.indexOf('Adr') > -1) { // android
jsBridge.callhandler("getAuthToken", null, data => { console.log("android, 和安卓交互");
console.log("调用2"); const token = window.android.getAuthToken();
localStorage.setItem("token", data); console.log('an-token', token);
console.log("--------------"); return new Promise((resolve, reject) => {
if (data) { if (token) {
getUserInfo().then(res => { saveUser(token);
if (res.code === 0) { resolve(token)
localStorage.setItem("user", JSON.stringify(res.data));
}
})
// resolve(data);
} else { } else {
// reject("调用失败,未返回data"); reject('失败')
console.log("调用失败");
} }
}); })
// }); } 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() { export function logoutToApp() {
console.log("退出登录");
jsBridge.callhandler("logout"); jsBridge.callhandler("logout");
} }
export function getUserId() { export function getUserId() {
<<<<<<< HEAD
let userInfo = localStorage.getItem('user') let userInfo = localStorage.getItem('user')
if(userInfo){ if(userInfo){
return JSON.parse(userInfo).userId || ''; return JSON.parse(userInfo).userId || '';
...@@ -6,4 +7,11 @@ export function getUserId() { ...@@ -6,4 +7,11 @@ export function getUserId() {
return '' return ''
} }
=======
if (localStorage.getItem("user")) {
return JSON.parse(localStorage.getItem('user')).userId;
} else {
return "";
}
>>>>>>> fda7ecc8c9d2dc436d2ae853fbd549faf9b8cb85
} }
\ No newline at end of file
...@@ -11,8 +11,7 @@ const service = axios.create({ ...@@ -11,8 +11,7 @@ const service = axios.create({
service.interceptors.request.use( service.interceptors.request.use(
config => { config => {
// const token = localStorage.getItem("token"); const token = localStorage.getItem("token");
const token = "b5f71c00b8fa4fe6b2eac577d9f15e19";
// config.headers["Authorization"] = "Bearer " + token; // config.headers["Authorization"] = "Bearer " + token;
config.headers["token"] = token; config.headers["token"] = token;
if (!config.loading) { if (!config.loading) {
...@@ -25,8 +24,6 @@ service.interceptors.request.use( ...@@ -25,8 +24,6 @@ service.interceptors.request.use(
}, },
error => { error => {
if (loading) Toast.clear(); if (loading) Toast.clear();
console.log("rqquest====错误", error);
console.log(error);
this.$toast.fail(error.response.data.error); this.$toast.fail(error.response.data.error);
} }
); );
......
...@@ -107,7 +107,7 @@ export default { ...@@ -107,7 +107,7 @@ export default {
this.$router.push({ name: urlName }); this.$router.push({ name: urlName });
}, },
getstatus() { getstatus() {
const userId = 13933770749; const userId = this.$userId;
const _this = this; const _this = this;
getForestStatus(userId).then(res => { getForestStatus(userId).then(res => {
if (res.code === 0) { if (res.code === 0) {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
</template> </template>
<script> <script>
import { inviteCode } from "@/api/invite"; import { inviteCode } from "@/api/invite";
var userId = "13933770749"; var userId = this.$userId;
export default { export default {
data() { data() {
return { return {
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
</template> </template>
<script> <script>
var userId = 13100911369;
import { getMyTeam } from "@/api/grade"; import { getMyTeam } from "@/api/grade";
export default { export default {
name: "leagueNums", name: "leagueNums",
...@@ -76,7 +75,7 @@ export default { ...@@ -76,7 +75,7 @@ export default {
}, },
methods: { methods: {
getMyTeam() { getMyTeam() {
getMyTeam(userId).then(res => { getMyTeam(this.$userId).then(res => {
if (res.data) { if (res.data) {
this.list.forEach(v => { this.list.forEach(v => {
v.num = res.data[v["field"]]; v.num = res.data[v["field"]];
......
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
fd.append("files", file.file); fd.append("files", file.file);
}); });
fd.append("zxField", this.message); fd.append("zxField", this.message);
fd.append("userId", "13100911369"); fd.append("userId", this.$userId);
uploadImage(fd).then(); uploadImage(fd).then();
}, },
openPopup() { openPopup() {
......
<template> <template>
<div class="settings"> <div class="settings">
<van-cell-group class="group-1"> <van-cell-group class="group-1">
<van-cell title="用户名" value="135****1234" /> <van-cell title="用户名" :value="$userId" />
<van-cell is-link center title="头像" @click="onModefy"> <van-cell is-link center title="头像" @click="onModefy">
<img <img
class="avatar-img" class="avatar-img"
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
</template> </template>
<script> <script>
import { getUserInfo } from "@/api/user";
import { logoutToApp } from "@/utils/bridgeToAppFun"; import { logoutToApp } from "@/utils/bridgeToAppFun";
import { logout } from "@/api/user"; import { logout } from "@/api/user";
import { fillInviteCode } from "@/api/user"; import { fillInviteCode } from "@/api/user";
...@@ -61,7 +62,17 @@ export default { ...@@ -61,7 +62,17 @@ export default {
inviteeCodeDialog: false inviteeCodeDialog: false
}; };
}, },
created() {
this.getUser()
},
methods: { methods: {
getUser() {
getUserInfo().then(res => {
if (res.code === 0) {
localStorage.setItem("user", JSON.stringify(res.data));
}
})
},
logout() { logout() {
const params = { const params = {
token: "qwedskdljlkjlklkjlkjlkjl" token: "qwedskdljlkjlklkjlkjlkjl"
......
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