|
|
@@ -57,7 +57,7 @@ export default {
|
|
|
// 正常token
|
|
|
// dXNlcklkPTEyMyZhY2NvdW50PWRmc2FmYWVyJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTY4NDYxMzkmc2lnbj1mOWUwNzJhZGUwODE4YjhhNzMzN2I0ZTMzMzU2OWJjOA==
|
|
|
let query = this.$route.query || {};
|
|
|
- let token = query.token || '';
|
|
|
+ let token = query.token || 'dXNlcklkPTEwMDEmYWNjb3VudD1MMDIxMF9NTSZmcm9tPXNpd2VpJnRpbWVzdGFtcD0xNjE4NDgxMjAwJnNpZ249M2QzM2EyN2E1ZWZmOGFlYzQ3MjgyYjUwNzc5YzkwMzI=';
|
|
|
console.log('token:', token);
|
|
|
if(!token) {
|
|
|
localStorage.setItem("userId", '');
|
|
|
@@ -69,21 +69,28 @@ export default {
|
|
|
data:token
|
|
|
}).then((res) => {
|
|
|
console.log(res);
|
|
|
- if(res.status === 200){
|
|
|
- if(res.data.code === 200) {
|
|
|
- let userInfo = res.data.data;
|
|
|
+ if(res.data && res.data.code === 200) {
|
|
|
+ let userInfo = res.data.data;
|
|
|
+ if (!userInfo.agentId) {
|
|
|
+ this.isManufacturer = 'manufacturer';
|
|
|
+ console.log(this.$route.path,222)
|
|
|
+ // if (this.$route.path !== '/uploadInfor') {
|
|
|
+ // this.$router.replace({ path: "/uploadInfor" });
|
|
|
+ // }
|
|
|
+ return
|
|
|
+ } else {
|
|
|
if (userInfo.userRole == '1' || userInfo.userRole == '2') {
|
|
|
this.isManufacturer = 'distributor';
|
|
|
+ localStorage.setItem("userId", userInfo.agentId);
|
|
|
} else {
|
|
|
this.isManufacturer = 'manufacturer';
|
|
|
}
|
|
|
- this.userAccount = userInfo.userCode;
|
|
|
- localStorage.setItem("userId", userInfo.agentId);
|
|
|
- }else {
|
|
|
- let message = res.data.message;
|
|
|
- console.log('message', message);
|
|
|
- alert(message);
|
|
|
}
|
|
|
+ this.userAccount = userInfo.userCode;
|
|
|
+ }else {
|
|
|
+ let message = res.data.message;
|
|
|
+ console.log('message', message);
|
|
|
+ alert(message);
|
|
|
}
|
|
|
}).catch((err) => {
|
|
|
alert('无法校验的字符串');
|