Merge branch 'lj'

# Conflicts:
#	service/request.js

service/request.js

@@ -1,4 +1,4 @@
-const serverHost = 'https://spsp.feashow.com/api/' //http://xx.xxx.xx
+const serverHost = 'https://spsp.feashow.com/api' //http://xx.xxx.xx
 
 const service = {
 	get(url, data) {
@@ -130,7 +130,7 @@ const apiService = {
 	serverHost,
 	imgUrl: 'https://spsp.feashow.com/',
 	key: 'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB',
-	uploadImgUrl: serverHost + `/upload/image/`,
+	uploadImgUrl: serverHost + '/upload/image/',
 	//登录接口
 	login(data) {
 		const url = '/login/mnpLogin'
@@ -160,10 +160,10 @@ const apiService = {
 		})
 	},
 	// 获取详情
-	getProductDetail(id) {
-		const url = `/home/pdetail/?productId=${id}`
+	getShopDetail(type,id) {
+		const url = `/home/adetail/?type=${type}&id=${id}`
 		return new Promise((resolve, reject) => {
-			resolve(service.get(url, id))
+			resolve(service.get(url))
 		})
 	},
 	//修改
@@ -211,24 +211,31 @@ const apiService = {
 			resolve(service.get(url))
 		})
 	},
+	//获取个人信息
+	getUser() {
+		const url = '/center/userinfo'
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	},
 	//修改个人信息
-	editPersonInfo(data){
-		const url = `center/userupdate`
-		return new Promise((resolve,reject) => {
-			resolve(service.putWithFormData(url,data))
+	editPersonInfo(data) {
+		const url = `/center/userupdate`
+		return new Promise((resolve, reject) => {
+			resolve(service.post(url, data))
 		})
 	},
 	//获取我的匹配
-	getMyMatch(){
+	getMyMatch() {
 		const url = `/center/match/`
-		return new Promise((resolve,reject) => {
+		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
 		})
 	},
 	//获取行业和业态
-	getClassList(pid){
+	getClassList(pid) {
 		const url = `/home/classlist/?pid=${pid}`
-		return new Promise((resolve,reject) => {
+		return new Promise((resolve, reject) => {
 			resolve(service.post(url))
 		})
 	},