diff --git a/src/views/base/wallet/composables/useWalletPage.ts b/src/views/base/wallet/composables/useWalletPage.ts index dc82104..8b1e288 100644 --- a/src/views/base/wallet/composables/useWalletPage.ts +++ b/src/views/base/wallet/composables/useWalletPage.ts @@ -25,6 +25,7 @@ import { loadMoreWalletDeposits, loadMoreWalletWithdrawals, refreshWalletCards, + reloadWalletWithdrawals, walletCardItems, walletDepositItems, walletWithdrawItems, @@ -256,6 +257,7 @@ export function useWalletPage() { extra_note: extraNote.value.trim() || undefined, }) await walletStore.getMyWallet() + await reloadWalletWithdrawals() await message.success('عملیات با موفقیت انجام شد') withdrawInfModal.value = true resetData() @@ -284,6 +286,11 @@ export function useWalletPage() { await loadSupportMessengerFromSettings(true) }) + watch(isDeposit, () => { + const el = activeDepositScrollEl.value + if (el) el.scrollTop = 0 + }) + if (!userStore.isSingle) { useInfiniteScroll( activeDepositScrollEl, diff --git a/src/views/base/wallet/composables/useWalletPageData.ts b/src/views/base/wallet/composables/useWalletPageData.ts index a664c20..7f7e565 100644 --- a/src/views/base/wallet/composables/useWalletPageData.ts +++ b/src/views/base/wallet/composables/useWalletPageData.ts @@ -119,6 +119,16 @@ export async function loadMoreWalletDeposits() { await fetchDepositPage(true) } +export async function reloadWalletWithdrawals() { + walletWithdrawPagination.value.page = 0 + try { + walletWithdrawTableOutput.value = await getTransactionTable(walletWithdrawPagination.value) + walletWithdrawItems.value = [...(walletWithdrawTableOutput.value?.rows ?? [])] + } catch (error) { + console.error('Wallet withdraw table error:', error) + } +} + export async function loadMoreWalletWithdrawals() { if ( !walletWithdrawTableOutput.value diff --git a/src/views/base/wallet/desktop/DesktopWalletView.vue b/src/views/base/wallet/desktop/DesktopWalletView.vue index 1cf3d7a..2d676e4 100644 --- a/src/views/base/wallet/desktop/DesktopWalletView.vue +++ b/src/views/base/wallet/desktop/DesktopWalletView.vue @@ -159,6 +159,25 @@ @add-account="showAddCard = true" @card-deleted="getCards" /> + +
+

تاریخچه برداشت

+
+
+ + + + +
+ +
+

+ تراکنش برداشتی ثبت نشده است. +

+
@@ -187,6 +206,7 @@ const { disableButton, cardItems, depositItems, + withdrawItems, loading, loadingMore, desktopDepositScrollEl, diff --git a/src/views/base/wallet/desktop/styles/desktop-wallet.less b/src/views/base/wallet/desktop/styles/desktop-wallet.less index 881ba23..000f8bf 100644 --- a/src/views/base/wallet/desktop/styles/desktop-wallet.less +++ b/src/views/base/wallet/desktop/styles/desktop-wallet.less @@ -201,6 +201,12 @@ justify-content: space-between; gap: 12px; padding: 20px 24px 0; + + &--split { + margin-top: 4px; + padding-top: 16px; + border-top: 1px solid #f1f5f9; + } } &__title { diff --git a/src/views/base/wallet/mobile/MobileWalletView.vue b/src/views/base/wallet/mobile/MobileWalletView.vue index a3ab890..097d181 100644 --- a/src/views/base/wallet/mobile/MobileWalletView.vue +++ b/src/views/base/wallet/mobile/MobileWalletView.vue @@ -117,20 +117,23 @@ class="wallet-withdraw-guide-panel relative z-10" > +

تاریخچه برداشت

- + +

+ {{ isDeposit ? 'تراکنش واریزی ثبت نشده است.' : 'تراکنش برداشتی ثبت نشده است.' }} +

@@ -158,6 +161,7 @@ const { disableButton, cardItems, depositItems, + withdrawItems, loading, loadingMore, mobileDepositScrollEl, @@ -180,7 +184,21 @@ const { .wallet-withdraw-guide-panel { margin-top: 1.25rem; - padding-bottom: 1rem; + padding-bottom: 0.25rem; +} + +.wallet-history-title { + margin: 1rem 0 0; + font-size: 0.875rem; + font-weight: 700; + color: #111827; +} + +.wallet-history-empty { + margin: 0.75rem 0 0; + text-align: center; + font-size: 0.75rem; + color: #9ca3af; } @media screen and (min-width: 426px) {