梁航：合并冲突

service/request.js

@@ -254,12 +254,12 @@ const apiService = {
 		})
 	},
 	//发布店铺转让
-		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,