refactor(tests): restructure into layered POM architecture with Allure reporting

- Split framework into core/ (config, logger, db, driver factories, screenshot,
  allure integration) and pages/ (PO layer: base/admin/driver); flatten test
  files per platform (web/admin, app/driver_android, cross_end)
- Slim root conftest.py 656 -> ~100 lines: drop inline CN HTML report, add
  Allure severity mapping (p0/p1/p2 -> blocker/normal/minor) and
  environment.properties; support both tests.*-prefixed and bare imports
- Preserve TC-D2S-001/002 cross-end E2E cases with business logic unchanged,
  add allure epic/feature/story/step annotations
- Deduplicate: single makereport hook, shared failure-screenshot helpers,
  single SCREENSHOTS_DIR constant; deterministic auth-state role loading
- Move DB credentials from db_helper.py into test_config.yaml (database section)
- Move pytest.ini to repo root; switch reporting to allure-pytest
  (drop pytest-html/junitxml); update requirements.txt accordingly
- Delete deprecated scaffolding: test_freight_full_flow + 6 stale page
  objects, iOS/shipper empty shells, dead utils
- Fix flaky vxe-table action-row wait: wait for a visible td instead of
  hidden placeholder rows (fixed shipper-payment timeouts)
- Verified end-to-end against live env: both E2E cases pass (2 passed 3m12s);
  run artifacts (logs/screenshots/allure) included per repo convention

tests/web/admin/__init__.py

@@ -0,0 +1 @@
+"""admin 测试包。"""

tests/web/admin/conftest.py

@@ -1,4 +1,4 @@
-"""管理端 fixture — Playwright 浏览器实例 + 登录态复用。
+"""管理端 fixtures — Playwright 浏览器实例 + 登录态复用。
 
 核心机制:
     skip_login: true → 加载 storage_state，跳过验证码
@@ -8,60 +8,38 @@
     python tests/web/admin/save_auth.py
 """
 
-from datetime import datetime
 from pathlib import Path
 
 import pytest
-from playwright.sync_api import sync_playwright, Page
+from playwright.sync_api import Page
 
-SCREENSHOTS_DIR = Path("output/screenshots")
+from tests.core.playwright_support import (
+    admin_browser_page,
+    pick_available_role,
+    save_web_failure_screenshot,
+)
 
 
 @pytest.fixture(params=["chromium", "firefox"])
 def browser_name(admin_config, request):
     """每个浏览器执行一轮。"""
     browsers = admin_config.get("browsers", ["chromium", "firefox"])
-    request.param = browsers[len(getattr(request, "_index", 0))]
+    if request.param not in browsers:
+        pytest.skip(f"浏览器 {request.param} 未在配置 browsers 中启用")
     return request.param
 
 
 @pytest.fixture
 def page(admin_config, browser_name, request) -> Page:
-    """Playwright Page，加载登录态，失败自动截图。"""
-    viewport = admin_config.get("viewport", {"width": 1920, "height": 1080})
-    timeout = admin_config.get("timeout_seconds", 120) * 1000
-    skip_login = admin_config.get("skip_login", True)
+    """Playwright Page，加载可用登录态，失败自动截图。"""
     storage_state_dir = Path(admin_config.get("storage_state_dir", "tests/web/auth"))
+    skip_login = admin_config.get("skip_login", True)
+    role = pick_available_role(storage_state_dir, browser_name) if skip_login else None
 
-    with sync_playwright() as p:
-        browser_launcher = getattr(p, browser_name)
-        browser = browser_launcher.launch(headless=True)
-
-        context_kwargs = {
-            "viewport": {"width": viewport["width"], "height": viewport["height"]},
-            "locale": "zh-CN",
-        }
-
-        loaded_role = None
-        if skip_login:
-            loaded_role = _load_auth_state(context_kwargs, storage_state_dir, browser_name)
-
-        context = browser.new_context(**context_kwargs)
-        page = context.new_page()
-        page.set_default_timeout(timeout)
-        page._auth_role = loaded_role
-
-        yield page
-
-        if hasattr(request.node, "rep_call") and request.node.rep_call.failed:
-            scenario_dir = SCREENSHOTS_DIR / request.node.name
-            scenario_dir.mkdir(parents=True, exist_ok=True)
-            ts = datetime.now().strftime("%Y%m%d_%H%M%S")
-            path = str(scenario_dir / f"FAIL_{browser_name}_{ts}.png")
-            page.screenshot(path=path, full_page=True)
-
-        context.close()
-        browser.close()
+    with admin_browser_page(admin_config, browser_name, role=role) as (p, loaded_role):
+        p._auth_role = loaded_role
+        yield p
+        save_web_failure_screenshot(p, request, tag=browser_name)
 
 
 @pytest.fixture
@@ -96,31 +74,15 @@ def ensure_login(admin_config, page, config):
                 f"  python tests/web/admin/save_auth.py --role {role}"
             )
 
-        # skip_login: false
+        # skip_login: false — 实时 UI 登录
+        from tests.pages.admin.login_page import LoginPage
+
         page.goto(f"{base_url}/#/login")
-        page.get_by_placeholder("请输入用户名").fill(account["phone"])
-        page.get_by_placeholder("请输入密码").fill(account["password"])
-        page.get_by_role("button", name="登录").click()
-        page.wait_for_timeout(3000)
-        if "#/login" in page.url or "/login" in page.url:
+        try:
+            LoginPage(page).login(account["phone"], account["password"])
+        except AssertionError as e:
             raise RuntimeError(
                 "登录失败！可能存在图形验证码。请改为手动登录: python tests/web/admin/save_auth.py"
-            )
+            ) from e
 
     return _ensure_login
-
-
-def _load_auth_state(context_kwargs: dict, storage_dir: Path, browser: str) -> str | None:
-    auth_files = list(storage_dir.glob(f"*_{browser}.json")) if storage_dir.exists() else []
-    if not auth_files:
-        return None
-    auth_file = auth_files[0]
-    context_kwargs["storage_state"] = str(auth_file)
-    return auth_file.stem.replace(f"_{browser}", "")
-
-
-@pytest.hookimpl(tryfirst=True, hookwrapper=True)
-def pytest_runtest_makereport(item, call):
-    outcome = yield
-    rep = outcome.get_result()
-    setattr(item, f"rep_{rep.when}", rep)

tests/web/admin/pages/base_page.py

@@ -1,76 +0,0 @@
-"""Page Object 基类 — 封装所有页面共享的通用操作。
-
-每个具体页面应继承 BasePage，在 __init__ 中声明所有定位器。
-
-Usage:
-    class LoginPage(BasePage):
-        def __init__(self, page):
-            super().__init__(page)
-            self.phone_input = page.get_by_placeholder("请输入用户名")
-            self.login_btn = page.get_by_role("button", name="登录")
-"""
-
-from datetime import datetime
-from pathlib import Path
-from typing import Optional
-
-from playwright.sync_api import Page, Locator, expect
-
-SCREENSHOTS_DIR = Path("output/screenshots")
-
-
-class BasePage:
-    """Page Object 基类。"""
-
-    def __init__(self, page: Page, timeout_ms: int = 30_000):
-        self.page = page
-        self.timeout = timeout_ms
-
-    # ── 通用等待 ──
-
-    def wait_visible(self, locator: Locator, timeout_ms: Optional[int] = None) -> None:
-        """等待元素可见。"""
-        expect(locator).to_be_visible(timeout=timeout_ms or self.timeout)
-
-    def wait_hidden(self, locator: Locator, timeout_ms: Optional[int] = None) -> None:
-        """等待元素消失（如 Loading 遮罩）。"""
-        expect(locator).to_be_hidden(timeout=timeout_ms or self.timeout)
-
-    def wait_for_text(self, text: str, timeout_ms: Optional[int] = None) -> None:
-        """等待页面上出现指定文本。"""
-        expect(self.page.get_by_text(text)).to_be_visible(timeout=timeout_ms or self.timeout)
-
-    # ── 通用操作 ──
-
-    def fill_field(self, locator: Locator, value: str) -> None:
-        """安全填写输入框（先等待可见，再清空后填写）。"""
-        self.wait_visible(locator)
-        locator.clear()
-        locator.fill(value)
-
-    def click_when_ready(self, locator: Locator) -> None:
-        """安全点击（等待可见 + 可操作）。"""
-        self.wait_visible(locator)
-        locator.click()
-
-    def get_text(self, locator: Locator) -> str:
-        """获取元素的 inner text。"""
-        self.wait_visible(locator)
-        return locator.inner_text()
-
-    # ── 截图 ──
-
-    def screenshot(self, name: str, full_page: bool = False) -> str:
-        """关键节点截图，返回文件路径。"""
-        scenario_dir = SCREENSHOTS_DIR / self.__class__.__name__
-        scenario_dir.mkdir(parents=True, exist_ok=True)
-        ts = datetime.now().strftime("%Y%m%d_%H%M%S")
-        path = str(scenario_dir / f"{name}_{ts}.png")
-        self.page.screenshot(path=path, full_page=full_page)
-        return path
-
-    # ── 导航 ──
-
-    def navigate(self, url: str) -> None:
-        """导航到指定 URL 并等待页面加载完成。"""
-        self.page.goto(url, wait_until="domcontentloaded")

tests/web/admin/pages/components/navbar.py

@@ -1,53 +0,0 @@
-"""导航栏公共组件。
-
-跨页面复用的顶部/侧边导航操作。
-
-Usage:
-    from tests.web.admin.pages.components.navbar import NavBar
-
-    navbar = NavBar(page)
-    navbar.go_to("运输管理")
-"""
-
-from playwright.sync_api import Page, expect
-
-from tests.web.admin.pages.base_page import BasePage
-
-
-class NavBar(BasePage):
-    """侧边导航栏组件。"""
-
-    def __init__(self, page: Page):
-        super().__init__(page)
-        # ⚠️ 以下定位器需要根据实际 DOM 调整
-        self.sidebar = page.locator(".ant-layout-sider")
-        self.logout_btn = page.get_by_text("退出登录")
-
-    def go_to(self, menu_name: str) -> None:
-        """点击侧边栏菜单项展开/跳转。
-
-        Args:
-            menu_name: 菜单名称文本（如 "运输管理"、"基础信息"）
-        """
-        menu_item = self.page.get_by_text(menu_name).first
-        self.click_when_ready(menu_item)
-
-    def go_to_submenu(self, parent_menu: str, sub_menu: str) -> None:
-        """点击父级菜单后，点击子菜单项。
-
-        Args:
-            parent_menu: 父级菜单文本（如 "整车运输"）
-            sub_menu: 子菜单文本（如 "运单管理"）
-        """
-        self.go_to(parent_menu)
-        sub_item = self.page.get_by_text(sub_menu).first
-        self.click_when_ready(sub_item)
-
-    def logout(self) -> None:
-        """退出登录。"""
-        self.click_when_ready(self.logout_btn)
-        expect(self.page).to_have_url("#/login", timeout=10_000)
-
-    def is_expanded(self) -> bool:
-        """检查侧边栏是否展开。"""
-        return self.sidebar.is_visible()

tests/web/admin/pages/login_page.py

@@ -1,54 +0,0 @@
-"""登录页面 — Page Object。
-
-Usage:
-    from tests.web.admin.pages.login_page import LoginPage
-
-    login_page = LoginPage(page)
-    login_page.login(phone="super_admin", password="951260684NiAn..")
-"""
-
-from playwright.sync_api import Page, expect
-
-from tests.web.admin.pages.base_page import BasePage
-
-
-class LoginPage(BasePage):
-    """运八管理端登录页。"""
-
-    def __init__(self, page: Page):
-        super().__init__(page)
-        # ── 定位器声明 ──
-        self.username_input = page.get_by_placeholder("请输入用户名")
-        self.password_input = page.get_by_placeholder("请输入密码")
-        self.login_btn = page.get_by_role("button", name="登录")
-        self.error_tip = page.locator(".ant-form-item-explain-error")
-
-    def login(self, phone: str, password: str, expect_success: bool = True) -> None:
-        """执行登录流程。
-
-        Args:
-            phone: 用户名/手机号
-            password: 密码
-            expect_success: True=预期成功跳转，False=预期留在登录页并有错误提示
-        """
-        self.fill_field(self.username_input, phone)
-        self.fill_field(self.password_input, password)
-        self.click_when_ready(self.login_btn)
-
-        if expect_success:
-            # 等待登录成功后页面跳转（hash 路由模式）
-            self.page.wait_for_timeout(3000)
-            assert "/#/login" not in self.page.url and "/login" not in self.page.url, \
-                "登录失败，仍在登录页"
-        else:
-            # 预期登录失败，停留在当前页
-            expect(self.page).to_have_url("**/login**", timeout=5_000)
-
-    def get_error_message(self) -> str:
-        """获取登录失败时的错误提示文本。"""
-        self.wait_visible(self.error_tip)
-        return self.error_tip.inner_text()
-
-    def is_on_login_page(self) -> bool:
-        """检查是否仍在登录页（兼容 hash 路由）。"""
-        return "/login" in self.page.url or "/#/login" in self.page.url

tests/web/admin/save_auth.py

@@ -9,9 +9,10 @@
 
 流程:
     1. 脚本打开浏览器到登录页
-    2. 你在浏览器中手动输入账号、密码、完成验证码并点击登录
-    3. 登录成功后按 Enter 键，脚本自动保存登录态
-    4. 后续 pytest 用例自动复用
+    2. 自动填入账号、密码（从 tests/config/test_config.yaml 读取）
+    3. 你在浏览器中手动完成图形验证码并点击登录
+    4. 登录成功后按 Enter 键，脚本自动保存登录态
+    5. 后续 pytest 用例自动复用
 
 生成的 auth 文件:
     tests/web/auth/super_admin_chromium.json
@@ -21,9 +22,51 @@ import argparse
 import sys
 from pathlib import Path
 
-sys.path.insert(0, str(Path(__file__).parent.parent.parent))
+sys.path.insert(0, str(Path(__file__).parent.parent.parent.parent))
 
-from tests.config.test_config import load_config
+# Windows 中文控制台为 GBK 编码，emoji 等字符无法编码会导致 print 崩溃；
+# 这里把所有无法编码的字符替换为 ?，保证脚本在任何终端都能运行。
+if hasattr(sys.stdout, "reconfigure"):
+    sys.stdout.reconfigure(errors="replace")
+
+from tests.core.config_loader import load_config
+from tests.core.playwright_support import fast_shutdown
+
+# 登录页元素选择器（Elementor 全路径）。密码框带 is-error 类，仅在错误态出现时匹配，
+# 因此 _fill_credentials 会先尝试这些选择器，失败再退回占位符/类型选择器。
+USERNAME_SELECTOR = (
+    "#app > div > form > div:nth-child(2) > div "
+    "> div.elInput.el-input.el-input--medium > input"
+)
+PASSWORD_SELECTOR = (
+    "#app > div > form > div.el-form-item.el-tooltip.is-error.is-required.el-form-item--medium "
+    "> div > div.elInput.el-input.el-input--medium > input"
+)
+
+
+def _fill_credentials(page, account: dict) -> bool:
+    """自动填写账号密码，用户名/密码独立处理，任一失败不影响另一个。"""
+    filled_user = False
+    for user_sel in (USERNAME_SELECTOR, "input[placeholder*='账号']"):
+        try:
+            page.wait_for_selector(user_sel, timeout=8000)
+            page.fill(user_sel, account["phone"])
+            filled_user = True
+            break
+        except Exception:
+            continue
+
+    filled_pwd = False
+    for pwd_sel in (PASSWORD_SELECTOR, "input[type='password']"):
+        try:
+            page.wait_for_selector(pwd_sel, timeout=5000)
+            page.fill(pwd_sel, account["password"])
+            filled_pwd = True
+            break
+        except Exception:
+            continue
+
+    return filled_user and filled_pwd
 
 
 def main():
@@ -59,12 +102,17 @@ def main():
         )
         page = context.new_page()
 
-        print(f"\n🔗 打开登录页: {login_url}")
+        print(f"\n打开登录页: {login_url}")
         page.goto(login_url)
 
+        account = config.get("accounts", {}).get(args.role)
+        if account and _fill_credentials(page, account):
+            print(f"[{args.role}] 账号密码已自动填写")
+        else:
+            print(f"[{args.role}] 自动填写失败/无配置，请在浏览器中手动输入账号密码")
+
         print(f"\n{'='*60}")
-        print(f"👤 角色: {args.role}")
-        print(f"   请在浏览器中手动完成登录（输入账号密码 + 验证码）")
+        print(f"   请手动完成【图形验证码】并点击【登录】")
         print(f"   登录成功后回到此处按 Enter 键保存登录态...")
         print(f"{'='*60}\n")
 
@@ -73,26 +121,27 @@ def main():
         # 检查是否真的登录成功了
         current = page.url
         if "/login" in current or "/#/login" in current:
-            print(f"\n⚠️ 当前仍在登录页: {current}")
+            print(f"\n[警告] 当前仍在登录页: {current}")
             print("   要保存吗？(y/n): ", end="")
             choice = input().strip().lower()
             if choice != "y":
                 print("已取消。")
-                browser.close()
+                fast_shutdown(p)
                 sys.exit(0)
 
-        print(f"\n✅ 当前页面: {current}")
+        print(f"\n当前页面: {current}")
 
         auth_dir = Path(web_config.get("storage_state_dir", "tests/web/auth"))
         auth_dir.mkdir(parents=True, exist_ok=True)
         auth_file = auth_dir / f"{args.role}_{args.browser}.json"
 
         context.storage_state(path=str(auth_file))
-        print(f"💾 登录态已保存到: {auth_file}")
+        print(f"登录态已保存到: {auth_file}")
 
-        browser.close()
+        # 强杀浏览器与驱动，跳过 Playwright 在本机 ~30s 的优雅关闭等待
+        fast_shutdown(p)
 
-    print(f"\n🎉 现在可以跑了: pytest tests/web/admin/ -m p0")
+    print(f"\n现在可以跑了: pytest tests/web/admin/ -m p0")
 
 
 if __name__ == "__main__":

tests/web/admin/test_login.py

@@ -6,15 +6,20 @@
     pytest -m smoke            # 冒烟
 """
 
+import allure
 import pytest
 from playwright.sync_api import Page
 
 pytestmark = [pytest.mark.admin]
 
 
+@allure.epic("运八网络货运平台")
+@allure.feature("管理端")
 class TestAdminSmoke:
     """管理端冒烟 — 验证预登录态。"""
 
+    @allure.story("预登录态访问")
+    @allure.title("验证预登录态可直接访问管理后台")
     @pytest.mark.p0
     @pytest.mark.smoke
     def test_admin_access_with_saved_auth(self, page: Page, admin_config, ensure_login):
@@ -26,6 +31,8 @@ class TestAdminSmoke:
             "预登录态失效！请运行: python tests/web/admin/save_auth.py"
         )
 
+    @allure.story("预登录态访问")
+    @allure.title("验证车队长预登录态有效")
     @pytest.mark.p0
     @pytest.mark.smoke
     def test_team_leader_access(self, page: Page, admin_config, ensure_login):
@@ -35,6 +42,8 @@ class TestAdminSmoke:
         page.wait_for_timeout(2000)
         assert "#/login" not in page.url and "/login" not in page.url
 
+    @allure.story("预登录态访问")
+    @allure.title("验证首页可正常加载")
     @pytest.mark.p0
     @pytest.mark.smoke
     def test_dashboard_loads(self, page: Page, admin_config, ensure_login):
@@ -44,15 +53,21 @@ class TestAdminSmoke:
         assert page.title(), "首页应显示页面标题"
 
 
+@allure.epic("运八网络货运平台")
+@allure.feature("管理端")
 class TestLoginPage:
     """登录页交互验证。"""
 
+    @allure.story("登录页")
+    @allure.title("验证登录页可正常访问")
     @pytest.mark.p1
     def test_login_page_accessible(self, page: Page, admin_config):
         """验证登录页可正常访问。"""
         page.goto(f"{admin_config['base_url']}/#/login")
         assert page.get_by_placeholder("请输入用户名").is_visible()
 
+    @allure.story("登录页")
+    @allure.title("验证登录页元素完整")
     @pytest.mark.p1
     def test_login_page_elements(self, page: Page, admin_config):
         """验证登录页元素完整。"""
@@ -61,6 +76,8 @@ class TestLoginPage:
         assert page.get_by_placeholder("请输入密码").is_visible()
         assert page.get_by_role("button", name="登录").is_visible()
 
+    @allure.story("登录页")
+    @allure.title("验证已登录用户访问登录页被重定向")
     @pytest.mark.p1
     def test_session_redirect(self, page: Page, admin_config, ensure_login):
         """验证已登录用户访问登录页被重定向。"""