Merge pull request '更新 'service/request.js'' (#29) from odjbin-patch-1 into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/29

service/request.js

@@ -1,4 +1,3 @@
-
 const serverHost = 'https://pupil.hchyun.com/api' // https://api-ugo-web.itheima.net'
 function isOutTime(res) {
 	if (res.data.message === '请先登录') {
@@ -16,7 +15,7 @@ function isOutTime(res) {
 }
 
 const service = {
-  get(url,data) {
+	get(url, data) {
 		const header = {}
 		header['Authorization'] = 'Bearer ' + uni.getStorageSync('token')
 		header['content-type'] = 'application/json'
@@ -24,8 +23,8 @@ const service = {
 			uni.request({
 				method: 'get',
 				url: serverHost + url,
+				data: data,
 				header: header,
-        data:data,
 				success: res => {
 					// // 调用接口成功
 					// if (!res.data.data) {
@@ -182,39 +181,70 @@ const apiService = {
 			resolve(service.post(url, data, true))
 		})
 	},
-  // 获取
-  getCategories(data) {
+	// 获取首页分类
+	getCategories() {
 		const url = `/home/classlist`
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
 		})
 	},
-  // 搜索发现   热搜
-  getDiscover(data) {
-    const url = `/home/discover`
+	// 获取首页轮播图
+	getBanner(data) {
+		const url = `/home/banner`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url, data))
+		})
+	},
+	// 获取产品列表
+	getProducts(data) {
+		const url = `/home/product`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url, data))
+		})
+	},
+	// 获取产品详情
+	getProductDetail(id) {
+		const url = `/home/pdetail/?productId=${id}`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url, id))
+		})
+	},
+	// 获取行业新闻
+	getNews() {
+		const url = `/news/nlists/?pageSize=3&pageNum=1`
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
 		})
 	},
-  // 新增
-  addOutboundOrder(data) {
-    const url = `/api`
+	// 获取行业新闻详情
+	getNewsDetail(id) {
+		const url = `/news/ndetail?newsId=${id}`
 		return new Promise((resolve, reject) => {
-      resolve(service.post(url, data))
+			resolve(service.get(url, id))
 		})
 	},
-  // 提交
-  deliveryOrderConfirm(data) {
-    const url = `/api`
+	// 获取认证厂家列表
+	getCertifiedCj() {
+		const url = `/news/flists?pageSize=3&pageNum=1`
 		return new Promise((resolve, reject) => {
-      resolve(service.post(url, data))
+			resolve(service.get(url))
 		})
 	},
+	// 获取认证厂家详情
+	getCertifiedCjDetail(id) {
+		const url = `/news/fdetail?fId=1`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url, id))
+		})
+	},
+
 	// 解密
 	decrypt(data) {
 		const url = `/api`
 		return new Promise((resolve, reject) => {
-      resolve(service.post(url, { data }))
+			resolve(service.post(url, {
+				data
+			}))
 		})
 	},
 	// 国密sm4加密
@@ -225,4 +255,7 @@ const apiService = {
 		})
 	}
 }
-export { apiService, toast }
+export {
+	apiService,
+	toast
+}