zhao

.env.production

@@ -2,8 +2,12 @@ NODE_ENV = 'production'
 #VUE_APP_BASE_API = 'http://192.168.100.226:8080/production'
 #VUE_APP_BASE_API = 'http://39.98.150.124:8000/production'
 # VUE_APP_BASE_API = 'http://120.224.103.84:9111/production'
+<<<<<<< HEAD
 # VUE_APP_BASE_API = 'http://60.31.138.166:8000/production'
 
 VUE_APP_LOCAL_API = 'http://60.31.138.166:8000'
+=======
+VUE_APP_BASE_API = 'http://60.31.138.166:8000/production'
+>>>>>>> cc7526dac422cc9d4b3d6ac0d53c3a0490cecfe2
 
 outputDir = 'production'

src/components/comm/CommHeader.vue

@@ -71,7 +71,6 @@ export default {
                // window.open('http://Ndwq.jingkongyun.com/')
                // window.open('http://192.168.3.226:8083/dashboard')
 				// window.open('http://120.224.103.84:8083/dashboard')
-                //window.open('http://10.185.163.57:8001/dashboard')
                 window.open('http://60.31.138.166:8001/dashboard')
 				return;
             }

src/utils/request2.js

@@ -8,8 +8,12 @@ const service = axios.create({
 	// baseURL: 'http://192.168.1.123:8000/',
 	//baseURL: 'http://192.168.3.188:8000/',
 	// baseURL: 'http://120.224.103.84:9111/',
+<<<<<<< HEAD
 		//baseURL: 'http://10.185.163.57:8000/',
 		baseURL: process.env.VUE_APP_LOCAL_API + '/',
+=======
+		baseURL: 'http://60.31.138.166:8000/',
+>>>>>>> cc7526dac422cc9d4b3d6ac0d53c3a0490cecfe2
 	timeout: 30000,
 })
 

src/utils/request5.js

@@ -6,8 +6,13 @@ const service = axios.create({
 	// baseURL: 'http://192.168.3.216:8000/', // 大龙
 	// baseURL: 'http://192.168.1.123:8000/', //小葱
     // baseURL: 'http://120.224.103.84:9111/',
+<<<<<<< HEAD
 	// baseURL: 'http://10.185.163.57:8000/',
 	baseURL: process.env.VUE_APP_LOCAL_API + '/',
+=======
+	baseURL: 'http://60.31.138.166:8000/',
+
+>>>>>>> cc7526dac422cc9d4b3d6ac0d53c3a0490cecfe2
 
 	timeout: 30000,
 })

src/views/Home.vue

@@ -134,15 +134,32 @@ export default {
 	},
 	methods: {
 		getUserInfo() {
+			/**
+			 * 1、如果地址栏有token且为bear开头，则认为是正确token，进行本地存储
+			 * 2、
+			 */
+			if(this.getParameter('token') && this.getParameter('token').indexOf('Bearer') > -1){ // 本地存储token		
+				localStorage.setItem('token4dp', decodeURIComponent(this.getParameter('token')))
+				// console.log('AsD'+localStorage.getItem('token4dp')+'sVsf')
+			}
+			console.log('AsD'+localStorage.getItem('token4dp')+'sVsf')
 			axios({
+<<<<<<< HEAD
 				url: process.env.VUE_APP_LOCAL_API + '/auth/info',
+=======
+				url: 'http://60.31.138.166:8000/auth/info',
+>>>>>>> cc7526dac422cc9d4b3d6ac0d53c3a0490cecfe2
 				method: 'get',
 				headers: {
-					Authorization: decodeURIComponent(this.getParameter('token')),
+					Authorization: localStorage.getItem('token4dp'),
 				},
 			})
 				.then(res => {
 					// console.log('获取用户信息', res)
+					// if(!localStorage.getItem('token4dp')){
+					// 	localStorage.setItem('token4dp', decodeURIComponent(this.getParameter('token')))
+					// }
+					
 				})
 				.catch(err => {
 					// console.log('用户信息错误',err)