Compare commits
	
		
			3 Commits
		
	
	
		
			f0f1cd39b6
			...
			v1.0.1
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					728510a72d | ||
| 
						 | 
					89fd2f5f0d | ||
| 
						 | 
					52921e78b6 | 
@@ -77,7 +77,7 @@ struct ContentListItemView: View {
 | 
				
			|||||||
                
 | 
					                
 | 
				
			||||||
                if item.price > 0 {
 | 
					                if item.price > 0 {
 | 
				
			||||||
                    HStack(spacing: 8) {
 | 
					                    HStack(spacing: 8) {
 | 
				
			||||||
                        Image("ic_coin_w")
 | 
					                        Image("ic_can")
 | 
				
			||||||
                            .resizable()
 | 
					                            .resizable()
 | 
				
			||||||
                            .frame(width: 17, height: 17)
 | 
					                            .frame(width: 17, height: 17)
 | 
				
			||||||
                        
 | 
					                        
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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(audioContentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> {
 | 
					    func orderAudioContent(contentId: Int, orderType: OrderType) -> AnyPublisher<Response, MoyaError> {
 | 
				
			||||||
        return api.requestPublisher(.orderAudioContent(request: OrderRequest(audioContentId: audioContentId, orderType: orderType)))
 | 
					        return api.requestPublisher(.orderAudioContent(request: OrderRequest(contentId: contentId, orderType: orderType)))
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
 | 
					    func getOrderList(page: Int, size: Int) -> AnyPublisher<Response, MoyaError> {
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -280,7 +280,7 @@ final class ContentDetailViewModel: ObservableObject {
 | 
				
			|||||||
        isShowPreviewAlert = false
 | 
					        isShowPreviewAlert = false
 | 
				
			||||||
        isLoading = true
 | 
					        isLoading = true
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        repository.orderAudioContent(audioContentId: contentId, orderType: orderType)
 | 
					        repository.orderAudioContent(contentId: contentId, orderType: orderType)
 | 
				
			||||||
            .sink { result in
 | 
					            .sink { result in
 | 
				
			||||||
                switch result {
 | 
					                switch result {
 | 
				
			||||||
                case .finished:
 | 
					                case .finished:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -71,7 +71,7 @@ struct ContentOrderDialogView: View {
 | 
				
			|||||||
                        Spacer()
 | 
					                        Spacer()
 | 
				
			||||||
                        
 | 
					                        
 | 
				
			||||||
                        HStack(spacing: 8) {
 | 
					                        HStack(spacing: 8) {
 | 
				
			||||||
                            Image("ic_coin_w")
 | 
					                            Image("ic_can")
 | 
				
			||||||
                                .resizable()
 | 
					                                .resizable()
 | 
				
			||||||
                                .frame(width: 16.7, height: 16.7)
 | 
					                                .frame(width: 16.7, height: 16.7)
 | 
				
			||||||
                            
 | 
					                            
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -8,7 +8,7 @@
 | 
				
			|||||||
import Foundation
 | 
					import Foundation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct OrderRequest: Encodable {
 | 
					struct OrderRequest: Encodable {
 | 
				
			||||||
    let audioContentId: Int
 | 
					    let contentId: Int
 | 
				
			||||||
    let orderType: OrderType
 | 
					    let orderType: OrderType
 | 
				
			||||||
    let container: String = "ios"
 | 
					    let container: String = "ios"
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -50,7 +50,7 @@ extension CanApi: TargetType {
 | 
				
			|||||||
            return "/charge"
 | 
					            return "/charge"
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
        case .pgVerify:
 | 
					        case .pgVerify:
 | 
				
			||||||
            return "/charge/v2/verify"
 | 
					            return "/charge/verify"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user