diff --git a/app/Utilities/FocusMode.php b/app/Utilities/FocusMode.php new file mode 100644 index 00000000..a244b0ba --- /dev/null +++ b/app/Utilities/FocusMode.php @@ -0,0 +1,18 @@ +route('section') ?: request()->segment(3)); + + return in_array($section, ['financial-risk-control'], true) + && (request()->boolean('focus') || str_contains((string) request()->userAgent(), 'DingTalk')); + } +} diff --git a/resources/views/business/pages/show.blade.php b/resources/views/business/pages/show.blade.php index e3a18c36..af83aa41 100644 --- a/resources/views/business/pages/show.blade.php +++ b/resources/views/business/pages/show.blade.php @@ -587,8 +587,8 @@ @include('business.pages.supplier-payables.navigation', ['section' => $supplierWorkspaceSection]) @elseif ($isCourierFinalDirectory) @include('business.pages.partials.section-page-tabs', ['section' => $section]) - @elseif (($section['slug'] ?? '') === 'financial-risk-control') - {{-- 财务经营风险管控下已有多个页面,用目录内页签切换。 --}} + @elseif (($section['slug'] ?? '') === 'financial-risk-control' && \App\Utilities\FocusMode::activeFor($section['slug'] ?? null)) + {{-- 钉钉单页入口(菜单隐藏时)才需要目录内页签;网页端有左侧菜单和已打开页面标签栏,不再重复。 --}} @include('business.pages.partials.section-page-tabs', ['section' => $section]) @elseif (($section['slug'] ?? '') === 'supplier-reconciliation') {{-- 供应商对账:财务端数据 / 厂家端数据 两个页签。 --}} diff --git a/resources/views/components/layouts/admin.blade.php b/resources/views/components/layouts/admin.blade.php index 4b385da7..3165ac24 100644 --- a/resources/views/components/layouts/admin.blade.php +++ b/resources/views/components/layouts/admin.blade.php @@ -6,9 +6,7 @@ // 让钉钉里点进来就只是这一块内容;网页端登录(非钉钉容器)不受影响。 // 也支持显式 ?focus=1,便于以后给别的入口做同样的单页模式。 // 路由参数在部分上下文取不到时退回按路径段判断(与目录表同一套兼容写法)。 - $focusSection = (string) (request()->route('section') ?: request()->segment(3)); - $focusEntry = in_array($focusSection, ['financial-risk-control'], true) - && (request()->boolean('focus') || str_contains((string) request()->userAgent(), 'DingTalk')); + $focusEntry = \App\Utilities\FocusMode::activeFor(); @endphp