Compare commits

..

No commits in common. "728510a72d35a3eb1483462d201cfde2654c47ca" and "f0f1cd39b664a56faa3b7784acd806b8e951f320" have entirely different histories.

6 changed files with 7 additions and 7 deletions

View File

@ -77,7 +77,7 @@ struct ContentListItemView: View {
if item.price > 0 { if item.price > 0 {
HStack(spacing: 8) { HStack(spacing: 8) {
Image("ic_can") Image("ic_coin_w")
.resizable() .resizable()
.frame(width: 17, height: 17) .frame(width: 17, height: 17)

View File

@ -29,8 +29,8 @@ final class ContentRepository {
return api.requestPublisher(.registerComment(request: RegisterAudioContentCommentRequest(comment: comment, contentId: audioContentId, parentId: parentId))) return api.requestPublisher(.registerComment(request: RegisterAudioContentCommentRequest(comment: comment, contentId: audioContentId, parentId: parentId)))
} }
func orderAudioContent(contentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> { func orderAudioContent(audioContentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> {
return api.requestPublisher(.orderAudioContent(request: OrderRequest(contentId: contentId, orderType: orderType))) return api.requestPublisher(.orderAudioContent(request: OrderRequest(audioContentId: audioContentId, orderType: orderType)))
} }
func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> { func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {

View File

@ -280,7 +280,7 @@ final class ContentDetailViewModel: ObservableObject {
isShowPreviewAlert = false isShowPreviewAlert = false
isLoading = true isLoading = true
repository.orderAudioContent(contentId: contentId, orderType: orderType) repository.orderAudioContent(audioContentId: contentId, orderType: orderType)
.sink { result in .sink { result in
switch result { switch result {
case .finished: case .finished:

View File

@ -71,7 +71,7 @@ struct ContentOrderDialogView: View {
Spacer() Spacer()
HStack(spacing: 8) { HStack(spacing: 8) {
Image("ic_can") Image("ic_coin_w")
.resizable() .resizable()
.frame(width: 16.7, height: 16.7) .frame(width: 16.7, height: 16.7)

View File

@ -8,7 +8,7 @@
import Foundation import Foundation
struct OrderRequest: Encodable { struct OrderRequest: Encodable {
let contentId: Int let audioContentId: Int
let orderType: OrderType let orderType: OrderType
let container: String = "ios" let container: String = "ios"
} }

View File

@ -50,7 +50,7 @@ extension CanApi: TargetType {
return "/charge" return "/charge"
case .pgVerify: case .pgVerify:
return "/charge/verify" return "/charge/v2/verify"
} }
} }