From 00c1846be65d032c508112e3dcc2dc8cd0e900bd Mon Sep 17 00:00:00 2001 From: shanshi <3316401569@qq.com> Date: Wed, 18 Nov 2026 16:09:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=97=A7=E7=BD=91=E9=93=B6=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E5=B9=B6=E7=BB=9F=E4=B8=80=E8=BF=94=E5=9B=9E=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 旧网银钱包仅保留在不保留账户;账户总览及账户档案相关返回按钮统一回到账户总览入口。 --- .../Controllers/Business/FinanceLedger.php | 2 +- .../View/NonStoreAccountMonitorPageData.php | 10 +++--- .../pages/financial-ledger/ledger.blade.php | 6 ++-- .../partials/account-type-cards.blade.php | 2 +- .../non-store-accounts.blade.php | 14 ++------ .../Business/FinanceLedgerNavigationTest.php | 4 +-- .../Business/NonStoreAccountMonitorTest.php | 32 ++++++++++++++++--- 7 files changed, 41 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/Business/FinanceLedger.php b/app/Http/Controllers/Business/FinanceLedger.php index 640bc606..57a32087 100644 --- a/app/Http/Controllers/Business/FinanceLedger.php +++ b/app/Http/Controllers/Business/FinanceLedger.php @@ -68,7 +68,7 @@ class FinanceLedger extends Controller $ledgerData['ledgerStandaloneAccountBackUrl'] = route('business.pages.show', [ 'section' => 'financial-operations', 'page' => 'ledger', - ]) . '?tab=flows&flows_view=basic'; + ]) . '?tab=overview'; return view('business.pages.financial-ledger.account-basic-page', [ 'ledgerData' => $ledgerData, diff --git a/modules/EcommerceFinance/View/NonStoreAccountMonitorPageData.php b/modules/EcommerceFinance/View/NonStoreAccountMonitorPageData.php index 85b8c295..740ca849 100644 --- a/modules/EcommerceFinance/View/NonStoreAccountMonitorPageData.php +++ b/modules/EcommerceFinance/View/NonStoreAccountMonitorPageData.php @@ -96,13 +96,10 @@ final class NonStoreAccountMonitorPageData ->where('category', self::CATEGORY_WANGSHANG) ->values() ->all(); - $fundOverview['legacy_wallet_accounts'] = $retained - ->where('category', self::CATEGORY_LEGACY_WALLET) - ->values() - ->all(); $positiveBalanceTotal = (float) $retained ->sum(static fn (array $row): float => max(0.0, (float) $row['current_balance'])); $fundDistribution = collect(self::CATEGORY_LABELS) + ->except([self::CATEGORY_LEGACY_WALLET]) ->map(function (string $platform, string $category) use ($retained, $positiveBalanceTotal): array { $rows = $retained->where('category', $category)->values(); $summary = $this->summary($rows); @@ -608,7 +605,9 @@ final class NonStoreAccountMonitorPageData ); $categories = $sectionKey === 'direct' ? [self::CATEGORY_BANK => self::CATEGORY_LABELS[self::CATEGORY_BANK]] - : self::CATEGORY_LABELS; + : collect(self::CATEGORY_LABELS) + ->except([self::CATEGORY_LEGACY_WALLET]) + ->all(); foreach ($categories as $category => $label) { $categoryRows = $sectionRows->where('category', $category)->values(); $section['rows'][] = [ @@ -877,7 +876,6 @@ final class NonStoreAccountMonitorPageData self::CATEGORY_BANK => '银行账户', self::CATEGORY_ALIPAY => '支付宝', self::CATEGORY_WANGSHANG => '网商银行', - self::CATEGORY_LEGACY_WALLET => '旧网银钱包', self::CATEGORY_OTHER => '其他账户', ] as $category => $label) { $query = [ diff --git a/resources/views/business/pages/financial-ledger/ledger.blade.php b/resources/views/business/pages/financial-ledger/ledger.blade.php index 9d7da281..0bda27e1 100644 --- a/resources/views/business/pages/financial-ledger/ledger.blade.php +++ b/resources/views/business/pages/financial-ledger/ledger.blade.php @@ -1045,13 +1045,13 @@ @if ($standaloneAccountView !== null)
- +

{{ $standaloneAccountTitle }}

{{ $standaloneAccountDescription }}。当前为独立页面,筛选、列设置和账户编辑均只在本页进行。

- 返回账户基本信息 + 返回账户总览
@else @@ -1793,7 +1793,7 @@ @include('business.pages.financial-ledger.partials.account-home-tabs') @if ($flowView === 'basic') @include('business.pages.financial-ledger.partials.account-type-cards', [ - 'accountTypeCardsBackUrl' => $flowViewUrl('summary'), + 'accountTypeCardsBackUrl' => $ledgerPageUrl . '?tab=overview', ]) @else @if ($flowView === 'daily') diff --git a/resources/views/business/pages/financial-ledger/partials/account-type-cards.blade.php b/resources/views/business/pages/financial-ledger/partials/account-type-cards.blade.php index ae933cc6..435b436a 100644 --- a/resources/views/business/pages/financial-ledger/partials/account-type-cards.blade.php +++ b/resources/views/business/pages/financial-ledger/partials/account-type-cards.blade.php @@ -4,7 +4,7 @@

账户基本信息

点击账户类型卡片查看对应账户资料;每种账户只展示自己需要的表头。

- 返回 + 返回账户总览
@foreach ($ledgerAccountTypeCards as $card) diff --git a/resources/views/business/pages/financial-operations/non-store-accounts.blade.php b/resources/views/business/pages/financial-operations/non-store-accounts.blade.php index a7976fa4..abe7473c 100644 --- a/resources/views/business/pages/financial-operations/non-store-accounts.blade.php +++ b/resources/views/business/pages/financial-operations/non-store-accounts.blade.php @@ -1655,7 +1655,7 @@
- @elseif (in_array($distribution['category'], ['other', 'alipay', 'wangshang', 'legacy_wallet'], true)) + @elseif (in_array($distribution['category'], ['other', 'alipay', 'wangshang'], true))