梁航：处理合并冲突

service/request.js

@@ -1,4 +1,5 @@
 const serverHost = 'https://spsp.feashow.com/api' //http://xx.xxx.xx
+
 const service = {
 	get(url, data) {
 		const header = {}
@@ -246,6 +247,14 @@ const apiService = {
 			resolve(service.post(url,data))
 		})
 	},
+	//获取商铺列表
+	getShopList(query){
+		const url = `/shop/alllist${query}`
+		return new Promise((resolve,reject) => {
+			resolve(service.get(url))
+		})
+	}
+	},
 	//发布店铺转让
 	publishTransfer(data){
 		const url = `/shop/transfer/`