梁航：处理冲突

service/request.js

@@ -1,5 +1,4 @@
 const serverHost = 'https://spsp.feashow.com/api' //http://xx.xxx.xx
-
 const service = {
 	get(url, data) {
 		const header = {}
@@ -253,15 +252,14 @@ const apiService = {
 		return new Promise((resolve,reject) => {
 			resolve(service.get(url))
 		})
-	}
 	},
 	//发布店铺转让
-	publishTransfer(data){
+		publishTransfer(data){
-		const url = `/shop/transfer/`
+			const url = `/shop/transfer/`
-		return new Promise((resolve, reject) => {
+			return new Promise((resolve, reject) => {
-			resolve(service.post(url, data))
+				resolve(service.post(url, data))
-		})
+			})
-	},
+		},
 }
 export {
 	apiService,