From 68675ebfe841a44f9acae7cbeb4a60542fedf2dc Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Tue, 31 Oct 2023 18:34:57 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=EB=AA=A9=EB=A1=9D=20-=20?= =?UTF-8?q?=EA=B5=AC=EB=A7=A4=ED=95=9C=20=EC=BD=98=ED=85=90=EC=B8=A0=20?= =?UTF-8?q?=EC=B4=9D=20=EA=B0=9C=EC=88=98=20=ED=91=9C=EC=8B=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyPage/OrderList/OrderListAllView.swift | 18 ++++++++++++++++++ .../OrderList/OrderListAllViewModel.swift | 3 +++ 2 files changed, 21 insertions(+) diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift index ec31c3c..e6fdecc 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllView.swift @@ -33,6 +33,24 @@ struct OrderListAllView: View { .frame(height: 50) .background(Color.black) + HStack(spacing: 0) { + Text("총 ") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "eeeeee")) + + Text("\(viewModel.totalCount)") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "dd4500")) + + Text(" 개") + .font(.custom(Font.medium.rawValue, size: 13.3)) + .foregroundColor(Color(hex: "eeeeee")) + + Spacer() + } + .padding(.horizontal, 13.3) + .padding(.top, 13.3) + ScrollViewReader { reader in ScrollView(.vertical, showsIndicators: false) { LazyVStack(spacing: 10.7) { diff --git a/SodaLive/Sources/MyPage/OrderList/OrderListAllViewModel.swift b/SodaLive/Sources/MyPage/OrderList/OrderListAllViewModel.swift index 48c81ca..8ace5eb 100644 --- a/SodaLive/Sources/MyPage/OrderList/OrderListAllViewModel.swift +++ b/SodaLive/Sources/MyPage/OrderList/OrderListAllViewModel.swift @@ -18,6 +18,7 @@ final class OrderListAllViewModel: ObservableObject { @Published var isLoading = false @Published var orderList = [GetAudioContentOrderListItem]() + @Published var totalCount = 0 @Published var scrollToTop = false var page = 1 @@ -49,6 +50,8 @@ final class OrderListAllViewModel: ObservableObject { self.scrollToTop.toggle() } + self.totalCount = data.totalCount + if !data.items.isEmpty { page += 1 self.orderList.append(contentsOf: data.items)