feat: 字母描红页样式开发基本完成

2026-04-09 17:43:22 +08:00
parent 653737c481
commit a911da6181
59 changed files with 1043 additions and 206 deletions
@@ -32,6 +32,10 @@
    flex-shrink: 0;
 }

+.nav-bar__back--hidden {
+    visibility: hidden;
+}
+
 .nav-bar__back-icon {
    font-size: 40rpx;
    color: @color-nav-title;
@@ -57,4 +61,4 @@
 .nav-bar__placeholder {
    width: 100%;
    flex-shrink: 0;
-}
+}
@@ -1,5 +1,13 @@
 import { NAV_INNER_PX } from '../../utils/navMetrics';

+const HOME_TAB_URL = '/pages/home/home';
+const TAB_BAR_ROUTES = new Set([
+    'pages/home/home',
+    'pages/age/age',
+    'pages/favorites/favorites',
+    'pages/profile/profile',
+]);
+
 Component({
    options: { multipleSlots: true },
    properties: {
@@ -9,26 +17,53 @@ Component({
    data: {
        statusBarHeight: 0,
        navBlockHeight: 0,
-        showBackButton: false,
+        leftActionType: 'none',
    },
    lifetimes: {
        attached() {
            const { statusBarHeight } = wx.getWindowInfo();
-            const pages = getCurrentPages();
            this.setData({
                statusBarHeight,
                navBlockHeight: statusBarHeight + NAV_INNER_PX,
-                showBackButton: pages.length > 1,
            });
+            this.syncLeftAction();
+        },
+    },
+    pageLifetimes: {
+        show() {
+            this.syncLeftAction();
        },
    },
    methods: {
-        handleBack() {
-            wx.navigateBack({
-                fail: () => {
-                    wx.switchTab({ url: '/pages/home/home' });
-                },
-            });
+        syncLeftAction() {
+            const pages = getCurrentPages();
+            const currentRoute = pages[pages.length - 1]?.route || '';
+            const isTabBarPage = TAB_BAR_ROUTES.has(currentRoute);
+
+            let leftActionType: 'none' | 'back' | 'home' = 'none';
+
+            if (pages.length > 1) {
+                leftActionType = 'back';
+            } else if (!isTabBarPage) {
+                leftActionType = 'home';
+            }
+
+            this.setData({ leftActionType });
+        },
+
+        handleLeftAction() {
+            if (this.data.leftActionType === 'back') {
+                wx.navigateBack({
+                    fail: () => {
+                        wx.switchTab({ url: HOME_TAB_URL });
+                    },
+                });
+                return;
+            }
+
+            if (this.data.leftActionType === 'home') {
+                wx.switchTab({ url: HOME_TAB_URL });
+            }
        },
    },
 });
@@ -1,10 +1,16 @@
-<view class="nav-bar" style="padding-top: {{statusBarHeight}}px; {{background ? 'background:' + background + ';' : ''}}">
+<view
+    class="nav-bar"
+    style="padding-top: {{statusBarHeight}}px; {{background ? 'background:' + background + ';' : ''}}">
    <view class="nav-bar__inner">
        <view
-            wx:if="{{showBackButton}}"
-            class="nav-bar__back"
-            bindtap="handleBack">
-            <text class="toy-icon toy-icon-arrow-left nav-bar__back-icon"></text>
+            class="nav-bar__back {{leftActionType === 'none' ? 'nav-bar__back--hidden' : ''}}"
+            bindtap="handleLeftAction">
+            <text
+                wx:if="{{leftActionType === 'back'}}"
+                class="toy-icon toy-icon-arrow-left nav-bar__back-icon"></text>
+            <text
+                wx:elif="{{leftActionType === 'home'}}"
+                class="toy-icon toy-icon-home-o nav-bar__back-icon"></text>
        </view>
        <slot name="left"></slot>
        <text class="nav-bar__title">{{title}}</text>