zhanbo.xu

feat:优化非账号密码登录

import router from "./router";
import store from "./store";
import { Message, MessageBox } from "element-ui";
import { getToken, getLoginType } from "@/utils/auth";
import { alertWarningMsg, alertSuccessMsg, alertErrorMsg } from "@/utils/index";
import { getToken } from "@/utils/auth";
import { getParamsObj } from "@/utils/parseUrlParams";
const whiteList = [
"/login",
......@@ -12,7 +10,12 @@ const whiteList = [
"/relogin",
];
const userToken = getParamsObj(location.href).token;
router.beforeEach((to, from, next) => {
if (userToken) {
store.dispatch("LoginWithoutPassword", userToken).then(() => {});
}
if (to.path == "/relogin") {
next();
} else {
......@@ -67,7 +70,6 @@ router.beforeEach((to, from, next) => {
next();
} else {
if (to.path === "/reportingData") {
const userToken = getParamsObj(location.href).token;
store.dispatch("LoginWithoutPassword", userToken).then(() => {
next(`/reportingData`);
});
......
......@@ -94,13 +94,16 @@ const user = {
//非账号密码登录
LoginWithoutPassword({ commit }, token) {
return new Promise((resolve) => {
if (!getToken()) {
setToken(token);
commit("SET_TOKEN", token);
resolve(token);
} else {
resolve(token);
}
setToken(token);
commit("SET_TOKEN", token);
resolve(token);
// if (!getToken()) {
// setToken(token);
// commit("SET_TOKEN", token);
// resolve(token);
// } else {
// resolve(token);
// }
});
},
......
......@@ -187,17 +187,17 @@ export default {
slot: true,
},
{
name: "物流运单编号",
value: "logisticsNo",
name: "提运单号",
value: "billNo",
width: "",
align: "left",
slot: true,
},
{
name: "提运单号",
value: "billNo",
name: "物流运单编号",
value: "logisticsNo",
width: "",
align: "left",
slot: true,
},
{
name: "电商企业代码",
......@@ -315,7 +315,7 @@ export default {
preNo: "",
};
this.originalLogisticsNo = "";
this.search(0);
// this.search(0);
},
//查询
search(val) {
......