diff --git a/utils/request.js b/utils/request.js
index 7e26ef6..8cdeea2 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -3,13 +3,8 @@ import utils from '@/utils/encode'
 
 // const env = process.env.NODE_ENV
 // const env = 'production'/*  */
-<<<<<<< HEAD
 const env = 'test'
 const testUrl = 'http://192.168.0.20:38080'
-=======
-const env = 'production'
-const testUrl = 'http://192.168.110.230:38080'
->>>>>>> ec08020202bf7a2252bf4634c43842a7de91db40
 // const productUrl = 'http://121.196.213.68/adminapi' //预生产
 
 const productUrl = 'https://www.xingoil.com/adminapi' // 生产，加密 new 
@@ -60,8 +55,8 @@ service.interceptors.request.use(
 			config.data = data
 			// }
 		} else {
-			// console.log('\n\n-----------------------')
-			// console.log('参数', config.url, '参数加密前', config.data)
+			console.log('\n\n-----------------------')
+			console.log('参数', config.url, '参数加密前', config.data)
 			url = config.url
 		} 
 		return config
@@ -89,8 +84,8 @@ service.interceptors.response.use(
 				// console.log('返回', response.config.url, '返回结果',res)
 			}
 		} else {
-			// console.log('返回', response.config.url, '返回结果未加密', res)
-			// console.log('-------------------------------------------\n\n')
+			console.log('返回', response.config.url, '返回结果未加密', res)
+			console.log('-------------------------------------------\n\n')
 		}
 
 		uni.hideLoading();