梁航：合并冲突，个人信息修改

service/request.js

@@ -1,4 +1,8 @@
+<<<<<<< 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) {
@@ -128,17 +132,26 @@ const toast = {
 }
 const apiService = {
 	serverHost,
+	imgUrl:'https://spsp.feashow.com/',
+	key:'ZRKBZ-Q7FWL-GVZPK-MCRBU-4XFB5-ATBDB',
 	uploadImgUrl: serverHost + `/upload/image/`,
 	//登录接口
 	login(data) {
-		const url = `/login`
+		const url = '/login/mnpLogin'
 		return new Promise((resolve, reject) => {
 			resolve(service.post(url, data))
 		})
 	},
-	// 展示用户信息
-	getUserInfo() {
-		const url = '/user'
+	//code换手机号 
+	getMobile(data) {
+		const url = '/user/getMobileByMnp'
+		return new Promise((resolve, reject) => {
+			resolve(service.post(url, data))
+		})
+	},
+	// 获取客服电话
+	getCsTel() {
+		const url = '/center/cfg?key=kf_phone'
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
 		})
@@ -174,10 +187,31 @@ 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`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	},
+	// 获取热门信息
+	getHotInfo() {
+		const url = `/news/nlists/`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+		})
+	},
+	getStat() {
+		const url = `/home/stat`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url))
+>>>>>>> remotes/origin/master
 		})
 	}
 }