|
|
@@ -66,6 +66,7 @@ export default {
|
|
|
this.userAccount = userInfo.userCode;
|
|
|
localStorage.setItem('userOutId',userInfo.outId);
|
|
|
localStorage.setItem("userId", userInfo.agentId);
|
|
|
+ sessionStorage.setItem("userNameAccount", userInfo.userCode);
|
|
|
console.log(userInfo.agentId)
|
|
|
if (!userInfo.agentId) {
|
|
|
this.isManufacturer = 'manufacturer';
|
|
|
@@ -98,18 +99,21 @@ export default {
|
|
|
// dXNlcklkPTE1NiZhY2NvdW50PUwwTTE0X01NJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTg1NTYzMDAmc2lnbj1lNDZmM2Q3MmFiZDI3ODYwMDYyMmY2N2NmZjFiNjZmNw== //测试厂商TOKEN
|
|
|
this.userToken = sessionStorage.getItem('setToken');
|
|
|
if(this.userToken){
|
|
|
- console.log('已登录')
|
|
|
+ console.log('已登录',this.userToken,this.$route.path,sessionStorage.getItem('userNameAccount'));
|
|
|
+ this.userAccount = sessionStorage.getItem('userNameAccount');
|
|
|
if(sessionStorage.getItem('userPath') === 'distributor'){
|
|
|
this.isManufacturer = 'distributor';
|
|
|
- this.$router.replace({ path: "/inforList" });
|
|
|
- }else {
|
|
|
+ if(this.$route.path !== '/inforList') this.$router.replace({ path: "/inforList" });
|
|
|
+ }else if (sessionStorage.getItem('userPath') === 'manufacturer') {
|
|
|
this.isManufacturer = 'manufacturer';
|
|
|
- this.$router.replace({ path: "/uploadInfor" });
|
|
|
+ if(this.$route.path !== '/uploadInfor') this.$router.replace({ path: "/uploadInfor" });
|
|
|
+ }else {
|
|
|
+ console.log(this.isManufacturer)
|
|
|
}
|
|
|
}else {
|
|
|
let query = this.$route.query || {};
|
|
|
sessionStorage.setItem('setToken',query.token);
|
|
|
- this.userToken = query.token || '';
|
|
|
+ this.userToken = query.token;
|
|
|
console.log('token:', this.userToken);
|
|
|
this.getTokenRequest();
|
|
|
}
|