fix

2025-10-13 17:09:39 +08:00
parent 347a7292cc
commit 104e7f566c
9 changed files with 376 additions and 230 deletions
@@ -329,18 +329,18 @@ export class GirlDetailPanel extends li_BaseView {
    const isRelease = girlData.getIsRelease(this.category.toString(), this.id);
    const isFree = girlData.isGirlFreeType(this.category.toString(), this.id);
    //if (isRelease || isFree) {
-    // 使用带过渡动画的导航方法
-    NavigationManager.Instance.switchToPanel(
-      PanelType.PAST_GIRL_LIST,
-      false,
-      (base) => {
-        const chatData = { girlId: this.id, base: base };
-        NavigationManager.Instance.openSubPanel("ChatPanel", base, chatData, {
-          openAnimation: PageTransitionType.SLIDE_LEFT,
-          closeAnimation: PageTransitionType.SLIDE_RIGHT,
-        });
-      }
-    );
+    // 直接在当前页面打开ChatPanel作为子页面
+    const currentPanel = NavigationManager.Instance.getCurrentActivePanelNode();
+    if (currentPanel) {
+      const chatData = { girlId: this.id, base: currentPanel };
+      NavigationManager.Instance.openSubPanel("ChatPanel", currentPanel, chatData, {
+        openAnimation: PageTransitionType.SLIDE_LEFT,
+        closeAnimation: PageTransitionType.SLIDE_RIGHT,
+        hideBasePanel: true,
+      });
+    } else {
+      logger.warn("[GirlDetailPanel] 无法获取当前激活的主页面");
+    }
    // } else {
    //   //未解锁
    //   NavigationManager.Instance.openPopupPanel("GirlListPopupPanel", {