diff --git a/service/request.js b/service/request.js
index d6094e0..7686aca 100644
--- a/service/request.js
+++ b/service/request.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-const serverHost = 'http://spsp.feashow.cn/api'//http://xx.xxx.xx
-=======
 const serverHost = 'https://spsp.feashow.com/api/' //http://xx.xxx.xx
->>>>>>> remotes/origin/master
 
 const service = {
 	get(url, data) {
@@ -187,12 +183,6 @@ const apiService = {
 			resolve(service.putWithFormData(url, data))
 		})
 	},
-<<<<<<< HEAD
-	getTradeInfo(data){
-		const url = `/home/classlist?pid=0/`
-		return new Promise((resolve,reject) =>{
-			resolve(service.post(url, data))
-=======
 	// 获取轮播图
 	getBanner() {
 		const url = `/home/banner`
@@ -211,7 +201,6 @@ const apiService = {
 		const url = `/home/stat`
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
->>>>>>> remotes/origin/master
 		})
 	},
 	editPersonInfo(data){