Explorar el Código

修改路由及其他细节

306132416@qq.com hace 4 años
padre
commit
709af675a5
Se han modificado 2 ficheros con 5 adiciones y 10 borrados
  1. 5 9
      src/App.vue
  2. 0 1
      src/router/index.js

+ 5 - 9
src/App.vue

@@ -55,7 +55,8 @@ export default {
     // 测试接口
     getData() {
       // 正常token
-      // dXNlcklkPTEyMyZhY2NvdW50PWRmc2FmYWVyJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTY4NDYxMzkmc2lnbj1mOWUwNzJhZGUwODE4YjhhNzMzN2I0ZTMzMzU2OWJjOA==
+      // dXNlcklkPTEwMDEmYWNjb3VudD1MMDIxMF9NTSZmcm9tPXNpd2VpJnRpbWVzdGFtcD0xNjE4NTU2MTQ4JnNpZ249MWI3MmIwODkzNmZhNDdmMDU5MDRiNDc3N2FkOTdkMTI== //测试经销商TOKEN
+      // dXNlcklkPTE1NiZhY2NvdW50PUwwTTE0X01NJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTg1NTYzMDAmc2lnbj1lNDZmM2Q3MmFiZDI3ODYwMDYyMmY2N2NmZjFiNjZmNw== //测试厂商TOKEN
       let query = this.$route.query || {};
       let token = query.token || '';
       console.log('token:', token);
@@ -71,25 +72,20 @@ export default {
         console.log(res);
         if(res.data.code === 200) {
           let userInfo = res.data.data;
+          this.userAccount = userInfo.userCode;
           if (!userInfo.agentId) {
             this.isManufacturer = 'manufacturer';
-            console.log(this.$route.path,222)
-            if (this.$route.path !== '/uploadInfor') {
-              this.$router.replace({ path: "/uploadInfor" });
-            }
-            return
+            this.$router.replace({ path: "/uploadInfor" });
           } else {
             if (userInfo.userRole == '1' || userInfo.userRole == '2') {
               this.isManufacturer = 'distributor';
+              this.$router.replace({ path: "/inforList" });
               localStorage.setItem("userId", userInfo.agentId);
             } else {
               this.isManufacturer = 'manufacturer';
-              if (this.$route.path !== '/uploadInfor') {
                 this.$router.replace({ path: "/uploadInfor" });
-              }
             }
           }
-          this.userAccount = userInfo.userCode;
         }else {
           let message = res.data.message;
           console.log('message', message);

+ 0 - 1
src/router/index.js

@@ -117,7 +117,6 @@ const routes = [
 ]
 
 const router = new VueRouter({
-  mode: 'history',
   routes
 })