zhanbo.xu

feat:优化非账号密码登录

1 import router from "./router"; 1 import router from "./router";
2 import store from "./store"; 2 import store from "./store";
3 -import { Message, MessageBox } from "element-ui"; 3 +import { getToken } from "@/utils/auth";
4 -import { getToken, getLoginType } from "@/utils/auth";
5 -import { alertWarningMsg, alertSuccessMsg, alertErrorMsg } from "@/utils/index";
6 import { getParamsObj } from "@/utils/parseUrlParams"; 4 import { getParamsObj } from "@/utils/parseUrlParams";
7 const whiteList = [ 5 const whiteList = [
8 "/login", 6 "/login",
...@@ -12,7 +10,12 @@ const whiteList = [ ...@@ -12,7 +10,12 @@ const whiteList = [
12 "/relogin", 10 "/relogin",
13 ]; 11 ];
14 12
13 +const userToken = getParamsObj(location.href).token;
14 +
15 router.beforeEach((to, from, next) => { 15 router.beforeEach((to, from, next) => {
16 + if (userToken) {
17 + store.dispatch("LoginWithoutPassword", userToken).then(() => {});
18 + }
16 if (to.path == "/relogin") { 19 if (to.path == "/relogin") {
17 next(); 20 next();
18 } else { 21 } else {
...@@ -67,7 +70,6 @@ router.beforeEach((to, from, next) => { ...@@ -67,7 +70,6 @@ router.beforeEach((to, from, next) => {
67 next(); 70 next();
68 } else { 71 } else {
69 if (to.path === "/reportingData") { 72 if (to.path === "/reportingData") {
70 - const userToken = getParamsObj(location.href).token;
71 store.dispatch("LoginWithoutPassword", userToken).then(() => { 73 store.dispatch("LoginWithoutPassword", userToken).then(() => {
72 next(`/reportingData`); 74 next(`/reportingData`);
73 }); 75 });
......
...@@ -94,13 +94,16 @@ const user = { ...@@ -94,13 +94,16 @@ const user = {
94 //非账号密码登录 94 //非账号密码登录
95 LoginWithoutPassword({ commit }, token) { 95 LoginWithoutPassword({ commit }, token) {
96 return new Promise((resolve) => { 96 return new Promise((resolve) => {
97 - if (!getToken()) {
98 setToken(token); 97 setToken(token);
99 commit("SET_TOKEN", token); 98 commit("SET_TOKEN", token);
100 resolve(token); 99 resolve(token);
101 - } else { 100 + // if (!getToken()) {
102 - resolve(token); 101 + // setToken(token);
103 - } 102 + // commit("SET_TOKEN", token);
103 + // resolve(token);
104 + // } else {
105 + // resolve(token);
106 + // }
104 }); 107 });
105 }, 108 },
106 109
......
...@@ -187,17 +187,17 @@ export default { ...@@ -187,17 +187,17 @@ export default {
187 slot: true, 187 slot: true,
188 }, 188 },
189 { 189 {
190 - name: "物流运单编号", 190 + name: "提运单号",
191 - value: "logisticsNo", 191 + value: "billNo",
192 width: "", 192 width: "",
193 align: "left", 193 align: "left",
194 - slot: true,
195 }, 194 },
196 { 195 {
197 - name: "提运单号", 196 + name: "物流运单编号",
198 - value: "billNo", 197 + value: "logisticsNo",
199 width: "", 198 width: "",
200 align: "left", 199 align: "left",
200 + slot: true,
201 }, 201 },
202 { 202 {
203 name: "电商企业代码", 203 name: "电商企业代码",
...@@ -315,7 +315,7 @@ export default { ...@@ -315,7 +315,7 @@ export default {
315 preNo: "", 315 preNo: "",
316 }; 316 };
317 this.originalLogisticsNo = ""; 317 this.originalLogisticsNo = "";
318 - this.search(0); 318 + // this.search(0);
319 }, 319 },
320 //查询 320 //查询
321 search(val) { 321 search(val) {
......