Fedex / EcomWeb

Go to a project
Toggle navigation Toggle navigation pinning
zhanbo.xu
18f09688 1 parent ceb430c7

feat：优化非账号密码登录

Inline Side-by-side
Showing 3 changed files with 142 additions and 118 deletions
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 });
......
1 -import { login, logout } from '@/api/login' 1 +import { login, logout } from "@/api/login";
2 -import { getInfo } from '@/api/system/user.js' 2 +import { getInfo } from "@/api/system/user.js";
3 -import { getLogisticsCodeLis, getDictData } from '@/api/system/dict-api.js' 3 +import { getDictData } from "@/api/system/dict-api.js";
4 -import { getToken, setToken, removeToken, removeUserId, removeTime } from '@/utils/auth' 4 +import {
5 -import { getParamsObj } from '@/utils/parseUrlParams' 5 + getToken,
6 -import { alertWarningMsg } from '@/utils/index.js' 6 + setToken,
7 + removeToken,
8 + removeUserId,
9 + removeTime,
10 +} from "@/utils/auth";
7 11
8 const user = { 12 const user = {
9 state: { 13 state: {
10 token: getToken(), 14 token: getToken(),
11 userData: null, 15 userData: null,
12 - name: '', 16 + name: "",
13 - avatar: '', 17 + avatar: "",
14 roles: [], 18 roles: [],
15 permissions: [], 19 permissions: [],
16 linkList: [], 20 linkList: [],
17 dict: { 21 dict: {
18 - DECLARE_TRAFMODE: [{ itemCode: 'DECLARE_TRAFMODE_AVIATION', itemChineseName: '航空运输', itemValue: '5' }] 22 + DECLARE_TRAFMODE: [
23 + {
24 + itemCode: "DECLARE_TRAFMODE_AVIATION",
25 + itemChineseName: "航空运输",
26 + itemValue: "5",
27 + },
28 + ],
19 }, 29 },
20 loading: { 30 loading: {
21 type: false, 31 type: false,
22 - text: '拼命加载中"' 32 + text: '拼命加载中"',
23 - } 33 + },
24 }, 34 },
25 35
26 mutations: { 36 mutations: {
27 SET_TOKEN: (state, token) => { 37 SET_TOKEN: (state, token) => {
28 - state.token = token 38 + state.token = token;
29 }, 39 },
30 SET_USERDATA: (state, data) => { 40 SET_USERDATA: (state, data) => {
31 - state.userData = data 41 + state.userData = data;
32 }, 42 },
33 SET_NAME: (state, name) => { 43 SET_NAME: (state, name) => {
34 - state.name = name 44 + state.name = name;
35 }, 45 },
36 SET_AVATAR: (state, avatar) => { 46 SET_AVATAR: (state, avatar) => {
37 - state.avatar = avatar 47 + state.avatar = avatar;
38 }, 48 },
39 SET_ROLES: (state, roles) => { 49 SET_ROLES: (state, roles) => {
40 - state.roles = roles 50 + state.roles = roles;
41 }, 51 },
42 SET_PERMISSIONS: (state, permissions) => { 52 SET_PERMISSIONS: (state, permissions) => {
43 - state.permissions = permissions 53 + state.permissions = permissions;
44 }, 54 },
45 SET_LINKLIST: (state, linkList) => { 55 SET_LINKLIST: (state, linkList) => {
46 - state.linkList = linkList 56 + state.linkList = linkList;
47 }, 57 },
48 SET_DICT: (state, dict) => { 58 SET_DICT: (state, dict) => {
49 - state.dict = dict 59 + state.dict = dict;
50 }, 60 },
51 SET_LOAD: (state, loading) => { 61 SET_LOAD: (state, loading) => {
52 - state.loading.type = loading.type 62 + state.loading.type = loading.type;
53 - state.loading.text = loading.text 63 + state.loading.text = loading.text;
54 }, 64 },
55 }, 65 },
56 66
57 actions: { 67 actions: {
58 // 登录 68 // 登录
59 Login({ commit, state }, userInfo) { 69 Login({ commit, state }, userInfo) {
60 - const loginName = userInfo.userName.trim() 70 + const loginName = userInfo.userName.trim();
61 - const password = userInfo.password 71 + const password = userInfo.password;
62 - const rememberMe = userInfo.rememberMe 72 + const rememberMe = userInfo.rememberMe;
63 return new Promise((resolve, reject) => { 73 return new Promise((resolve, reject) => {
64 - login(loginName, password, rememberMe).then(res => { 74 + login(loginName, password, rememberMe)
65 - if (res.code != '200') { 75 + .then((res) => {
66 - reject(res) 76 + if (res.code != "200") {
67 - } else { 77 + reject(res);
68 - if (!getToken()) {
69 - setToken(res.data)
70 - commit('SET_TOKEN', res.data)
71 - resolve(res)
72 } else { 78 } else {
73 - resolve(res) 79 + if (!getToken()) {
80 + setToken(res.data);
81 + commit("SET_TOKEN", res.data);
82 + resolve(res);
83 + } else {
84 + resolve(res);
85 + }
74 } 86 }
75 - } 87 + })
76 - }).catch(error => { 88 + .catch((error) => {
77 - reject(error) 89 + reject(error);
78 - }) 90 + });
79 - }) 91 + });
80 }, 92 },
81 //非账号密码登录 93 //非账号密码登录
82 LoginWithoutPassword({ commit }, token) { 94 LoginWithoutPassword({ commit }, token) {
83 return new Promise((resolve) => { 95 return new Promise((resolve) => {
84 - if (!getToken()) { 96 + setToken(token);
85 - setToken(token) 97 + commit("SET_TOKEN", token);
86 - commit('SET_TOKEN', token) 98 + resolve(token);
87 - resolve(token) 99 + // if (!getToken()) {
88 - } else { 100 + // setToken(token);
89 - resolve(token) 101 + // commit("SET_TOKEN", token);
90 - } 102 + // resolve(token);
91 - }) 103 + // } else {
104 + // resolve(token);
105 + // }
106 + });
92 }, 107 },
93 108
94 // 获取用户信息 109 // 获取用户信息
95 async GetInfo({ commit, state }) { 110 async GetInfo({ commit, state }) {
96 return new Promise((resolve, reject) => { 111 return new Promise((resolve, reject) => {
97 - getInfo().then(res => { 112 + getInfo()
98 - if (res.code === '200') { 113 + .then((res) => {
99 - commit("SET_USERDATA", res.data); 114 + if (res.code === "200") {
100 - resolve(res) 115 + commit("SET_USERDATA", res.data);
101 - } else { 116 + resolve(res);
102 - reject(res) 117 + } else {
103 - } 118 + reject(res);
104 - }).catch(error => { 119 + }
105 - reject(error) 120 + })
106 - }) 121 + .catch((error) => {
107 - }) 122 + reject(error);
123 + });
124 + });
108 }, 125 },
109 126
110 //获取字典数据 127 //获取字典数据
111 async GetDict({ commit, state }, codeList) { 128 async GetDict({ commit, state }, codeList) {
112 - let obj = state.dict 129 + let obj = state.dict;
113 codeList.forEach((item, idx) => { 130 codeList.forEach((item, idx) => {
114 if (obj[item] == undefined || obj[item].length == 0) { 131 if (obj[item] == undefined || obj[item].length == 0) {
115 - obj[item] = [] 132 + obj[item] = [];
116 - getDictData({ doctCode: item }).then(res => { 133 + getDictData({ doctCode: item })
117 - if (res.code === '200') { 134 + .then((res) => {
118 - obj[item] = res.data 135 + if (res.code === "200") {
119 - } 136 + obj[item] = res.data;
120 - }).catch(err => { 137 + }
121 - console.log(err); 138 + })
122 - }).finally(() => { 139 + .catch((err) => {
123 - if (idx == codeList.length - 1) { 140 + console.log(err);
124 - console.log(obj); 141 + })
125 - commit('SET_DICT', obj) 142 + .finally(() => {
126 - } 143 + if (idx == codeList.length - 1) {
127 - }) 144 + console.log(obj);
145 + commit("SET_DICT", obj);
146 + }
147 + });
128 } else { 148 } else {
129 if (idx == codeList.length - 1) { 149 if (idx == codeList.length - 1) {
130 console.log(obj); 150 console.log(obj);
131 - commit('SET_DICT', obj) 151 + commit("SET_DICT", obj);
132 } 152 }
133 } 153 }
134 - }) 154 + });
135 }, 155 },
136 156
137 //退出系统 157 //退出系统
138 LogOut({ commit, state }) { 158 LogOut({ commit, state }) {
139 return new Promise((resolve, reject) => { 159 return new Promise((resolve, reject) => {
140 - logout(state.token).then(() => { 160 + logout(state.token)
141 - commit('SET_TOKEN', '') 161 + .then(() => {
142 - commit('SET_USERDATA', null) 162 + commit("SET_TOKEN", "");
143 - removeToken() 163 + commit("SET_USERDATA", null);
144 - removeTime() 164 + removeToken();
145 - resolve() 165 + removeTime();
146 - }).catch(error => { 166 + resolve();
147 - reject(error) 167 + })
148 - }) 168 + .catch((error) => {
149 - }) 169 + reject(error);
170 + });
171 + });
150 }, 172 },
151 173
152 // 前端 登出 174 // 前端 登出
153 FedLogOut({ commit, state }) { 175 FedLogOut({ commit, state }) {
154 - return new Promise(resolve => { 176 + return new Promise((resolve) => {
155 - commit('SET_TOKEN', '') 177 + commit("SET_TOKEN", "");
156 - commit('SET_USERDATA', null) 178 + commit("SET_USERDATA", null);
157 - removeToken() 179 + removeToken();
158 - removeTime() 180 + removeTime();
159 - removeUserId() 181 + removeUserId();
160 location.replace(process.env.VUE_APP_BASE_ROUTE); 182 location.replace(process.env.VUE_APP_BASE_ROUTE);
161 - resolve() 183 + resolve();
162 - }) 184 + });
163 - } 185 + },
164 - } 186 + },
165 -} 187 +};
166 188
167 function getLogisticsCode() { 189 function getLogisticsCode() {
168 return new Promise((resolve, reject) => { 190 return new Promise((resolve, reject) => {
169 - getLogisticsCodeList().then(res => { 191 + getLogisticsCodeList()
170 - if (res.code === '200') { 192 + .then((res) => {
171 - resolve(res.data) 193 + if (res.code === "200") {
172 - } else { 194 + resolve(res.data);
173 - reject() 195 + } else {
174 - } 196 + reject();
175 - }).catch(err => { 197 + }
176 - console.log(err); 198 + })
177 - reject() 199 + .catch((err) => {
178 - }) 200 + console.log(err);
179 - }) 201 + reject();
202 + });
203 + });
180 } 204 }
181 205
182 - 206 +export default user;
183 -export default user
184 -
......
...@@ -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) {
......