From 1c9a23f61041c532cdbda7b3ca2709ee7bc7d7c1 Mon Sep 17 00:00:00 2001
From: hot777zz <912275990@qq.com>
Date: Wed, 15 Nov 2023 23:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A2=81=E8=88=AA=EF=BC=9A=E8=A7=A3=E5=86=B3re?=
 =?UTF-8?q?quest=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/request.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/service/request.js b/service/request.js
index d6094e0..7686aca 100644
--- a/service/request.js
+++ b/service/request.js
@@ -1,8 +1,4 @@
-<<<<<<< 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) {
@@ -187,12 +183,6 @@ 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`
@@ -211,7 +201,6 @@ const apiService = {
 		const url = `/home/stat`
 		return new Promise((resolve, reject) => {
 			resolve(service.get(url))
->>>>>>> remotes/origin/master
 		})
 	},
 	editPersonInfo(data){