Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/Lexus-media

src/App.vue

@@ -57,7 +57,7 @@ export default {
       // 正常token
       // dXNlcklkPTEyMyZhY2NvdW50PWRmc2FmYWVyJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTY4NDYxMzkmc2lnbj1mOWUwNzJhZGUwODE4YjhhNzMzN2I0ZTMzMzU2OWJjOA==
       let query = this.$route.query || {};
-      let token = query.token || 'dXNlcklkPTEyMyZhY2NvdW50PWRmc2FmYWVyJmZyb209c2l3ZWkmdGltZXN0YW1wPTE2MTY4NDYxMzkmc2lnbj1mOWUwNzJhZGUwODE4YjhhNzMzN2I0ZTMzMzU2OWJjOA';
+      let token = query.token || '';
       console.log('token:', token);
       if(!token) {
         localStorage.setItem("userId", '');
@@ -78,7 +78,7 @@ export default {
               this.isManufacturer = 'manufacturer';
             }
             this.userAccount = userInfo.userCode;
-            localStorage.setItem("userId", userInfo.userAgentId);
+            localStorage.setItem("userId", userInfo.outId);
           }else {
             let message = res.data.message;
             console.log('message', message);