diff --git a/tests/org-data-isolation.spec.ts b/tests/org-data-isolation.spec.ts
index b3473be..a1971e1 100644
--- a/tests/org-data-isolation.spec.ts
+++ b/tests/org-data-isolation.spec.ts
@@ -214,18 +214,33 @@ test.describe('多机构数据隔离（会话与 token）', () => {
     });
     await expect(page.locator('#app')).toBeVisible({ timeout: 90_000 });
     await page.waitForURL(/\/org\/select/, { timeout: 90_000 });
-    // 与 `org/select.vue` 根节点一致；避免 getByText 在 Vant/拆行下偶发匹配不到
-    await expect(page.locator('.main')).toBeVisible({ timeout: 90_000 });
+
+    if (
+      await page.getByText('请返回微信小程序完成登录').isVisible().catch(() => false)
+    ) {
+      test.skip(true, '打开机构页时会话已退回访客态');
+    }
+
+    // 线上壳层不一定是 .main>h4（路由/构建差异）；任一就绪即可
+    await Promise.race([
+      page.locator('#app').getByText(/请选择机构/).first().waitFor({
+        state: 'visible',
+        timeout: 90_000,
+      }),
+      page.getByText('暂无可用机构').waitFor({ state: 'visible', timeout: 90_000 }),
+      page
+        .locator('#app .van-cell-group .van-cell')
+        .first()
+        .waitFor({ state: 'visible', timeout: 90_000 }),
+    ]);
+
     if (
       await page.getByText('暂无可用机构').isVisible().catch(() => false)
     ) {
       test.skip(true, '机构接口无数据，跳过多机构切换断言');
     }
-    await expect(page.locator('.main h4')).toContainText(/请选择机构/, {
-      timeout: 90_000,
-    });
 
-    const orgCells = page.locator('.main .van-cell-group .van-cell');
+    const orgCells = page.locator('#app .van-cell-group .van-cell');
     const count = await orgCells.count();
     test.skip(
       count < 2,