Commit 4f37ed26 authored by 郝聪敏's avatar 郝聪敏

Merge branch 'feature/update_auth' into 'master'

feature: 调整xyqb环境授权

See merge request !240
parents 9dddf37f a9f918fb
......@@ -5,6 +5,13 @@ export const loginByPhone = param => {
return req.post("user/login", param);
};
// 信用钱包用户自动登录
export const getUserInfoByXyqb = param => {
return req.get("/user/info/xyqb_view", {
params: param
});
};
// 信用钱包用户自动登录
export const authByxyqb = param => {
return req.get("user/info/xyqb", {
......
......@@ -37,6 +37,7 @@
<script>
import { mapState, mapActions } from "vuex";
import protocol from "@/api/protocol";
import { authByxyqb } from "@/api/user";
import localStorage from "@/service/localStorage";
export default {
......@@ -84,8 +85,9 @@ export default {
},
methods: {
...mapActions(["setAuthXyqb", "setPublicPopup"]),
confirm() {
localStorage.set("mongoToken", localStorage.get("mongoTokenFromxyqb"));
async confirm() {
const res = await authByxyqb({ xyqbToken: localStorage.get("xyqbToken") });
localStorage.set("mongoToken", res.token);
this.setAuthXyqb(4);
},
showProtocol(idx) {
......
......@@ -5,7 +5,7 @@ import routes from "./routes";
import { parseSearch } from "@/service/utils";
import { isXyqb, isWeixinBrower } from "@/service/validation";
import cfg from "@/config";
import { authByxyqb, getwxOpenId } from "@/api/user";
import { getUserInfoByXyqb, getwxOpenId } from "@/api/user";
import localStorage from "@/service/localStorage";
import goodsList from "@/api/goodsList.mock";
import { getShare } from "@/api/shareInfo";
......@@ -61,9 +61,8 @@ async function getAuthInfo(xyqbToken) {
store.dispatch("setAuthXyqb", 1);
}
if (!xyqbToken || xyqbToken === localStorage.get("xyqbToken")) return;
const res = await authByxyqb({ xyqbToken });
const res = await getUserInfoByXyqb({ xyqbToken });
if (res) {
localStorage.set("mongoTokenFromxyqb", res.token);
localStorage.set("xyqbUserInfo", res);
localStorage.set("xyqbToken", xyqbToken);
}
......
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