From e86e19e5e5909f46e09adec1df430e0214a81590 Mon Sep 17 00:00:00 2001
From: 无故事王国 <841720330@qq.com>
Date: 星期三, 18 十月 2023 18:34:19 +0800
Subject: [PATCH] 修复BUG
---
WanPai/Network/Services.swift | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/WanPai/Network/Services.swift b/WanPai/Network/Services.swift
index 7ecd53f..8b535a4 100644
--- a/WanPai/Network/Services.swift
+++ b/WanPai/Network/Services.swift
@@ -17,7 +17,7 @@
//let All_Url = "https://console-mock.apipost.cn/mock/b5b2dee0-5564-40ae-f082-a352d502a153"
//let All_Url = "http://192.168.110.165:10393/mock/b5b2dee0-5564-40ae-f082-a352d502a153"
#else
-let All_Url = "http://8.137.22.229"
+//let All_Url = "http://8.137.22.229"
let Game_Url = "https://port.daowepark.com"
#endif
@@ -35,6 +35,12 @@
.append(key: "siteId", value: spaceId)
.append(key: "storeId", value: storeId)
return NetworkRequest.request(params: params, method: .post, progress: false)
+ }
+
+ class func game_intro()->Observable<BaseResponse<String>>{
+ let params = ParamsAppender.build(url: All_Url)
+ .interface(url: "/other/api/game/getIntro")
+ return NetworkRequest.request(params: params, method: .post, progress: true)
}
//支付游戏
@@ -353,11 +359,12 @@
return NetworkRequest.request(params: params, method: .post, progress: false)
}
- class func queryStoreList()->Observable<BaseResponse<[NormalSimpleModel]>>{
+ class func queryStoreList(cityCode:Int? = nil)->Observable<BaseResponse<[NormalSimpleModel]>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/other/base/store/queryStoreLists")
.append(key: "lat", value: locationTool.currentLocation?.coordinate.latitude.string)
.append(key: "lon", value: locationTool.currentLocation?.coordinate.longitude.string)
+ .append(key: "cityCode", value: cityCode)
return NetworkRequest.request(params: params, method: .post, progress: false)
}
@@ -588,6 +595,14 @@
return NetworkRequest.request(params: params, method: .post, progress: false)
}
+ static func lessonDetails(lessonId:Int,stuId:Int)->Observable<BaseResponse<SimpleModel>>{
+ let params = ParamsAppender.build(url: All_Url)
+ .interface(url: "/account/api/startCource/lessonDetails")
+ .append(key: "stuId", value: stuId)
+ .append(key: "lessonId", value: lessonId)
+ return NetworkRequest.request(params: params, method: .post, progress: true)
+ }
+
/// 上课首页-课程列表
static func weeksOfCourseDetails(stuId:Int,time:Date,storeId:Int)->Observable<BaseResponse<WeeklyCourseModel>>{
@@ -724,7 +739,7 @@
}
/// 评价门店
- static func evaluationStore(id:Int,content:String,imgs:String,score:Int)->Observable<BaseResponse<SimpleModel>>{
+ static func evaluationStore(id:Int,content:String,imgs:String,score:Double)->Observable<BaseResponse<SimpleModel>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/other/base/storeEvaluation/saveEvaluation")
.append(key: "storeId", value: id)
@@ -839,7 +854,7 @@
}
/// 获取场地列表
- static func querySiteList(pageNum:Int,pageSize:Int,siteTypeId:Int?,cityCode:String?,storeId:Int?,startTime:String?,endTime:String?,search:String?)->Observable<BaseResponse<[SiteItemModel]>>{
+ static func querySiteList(pageNum:Int,pageSize:Int,siteTypeId:Int?,cityCode:Int?,storeId:Int?,startTime:String?,endTime:String?,search:String?)->Observable<BaseResponse<[SiteItemModel]>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/other/base/site/querySiteList")
.append(key: "pageNum", value: pageNum)
@@ -981,7 +996,7 @@
extension Services{
/// 获取赛事列表
- class func queryCompetitionList(cityCode:String?,content:String?,heat:SortType?,registerCondition:Int?)->Observable<BaseResponse<[ActivityListModel]>>{
+ class func queryCompetitionList(cityCode:Int?,content:String?,heat:SortType?,registerCondition:Int?)->Observable<BaseResponse<[ActivityListModel]>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/competition/base/competition/queryCompetitionList")
.append(key: "cityCode", value: cityCode)
@@ -1103,7 +1118,7 @@
}
/// 获取省市数据
- class func queryProvinceAndCity(pcode:String? = nil)->Observable<BaseResponse<[CityProfileModel]>>{
+ class func queryProvinceAndCity(pcode:Int? = nil)->Observable<BaseResponse<[CityProfileModel]>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/other/base/store/queryProvinceAndCity")
.append(key: "pcode", value: pcode)
@@ -1111,7 +1126,7 @@
}
/// 获取城市code获取门店
- class func queryStoreAtCity(cityCode:String)->Observable<BaseResponse<[CityProfileModel]>>{
+ class func queryStoreAtCity(cityCode:Int)->Observable<BaseResponse<[CityProfileModel]>>{
let params = ParamsAppender.build(url: All_Url)
.interface(url: "/other/base/store/queryStoreByCityCode")
.append(key: "cityCode", value: cityCode)
--
Gitblit v1.7.1