新增账目管理测试用例，客户分组PO封装

赵旭婷
1 parent 0247a9d4
Showing 5 changed files with 650 additions and 117 deletions
pages/accountPage.ts
pages/customerGroupPage.ts
scripts/save-auth.ts
tests/account.spec.ts
tests/customerGroup.spec.ts
+import { Page, Locator, expect } from '@playwright/test';
+import { BasePage } from './basePage';
+
+/**
+ * 账目管理页面选择器
+ */
+const selectors = {
+  // 导航
+  moreMenu: 'text=更多 >',
+  accountMenu: 'text=账目管理',
+  
+  // 操作按钮
+  addButton: 'text=新增',
+  saveButton: 'text=保存',
+  
+  // 表单字段
+  accountNameInput: 'uni-input:has-text("科目名称") input',
+  remarkTextarea: 'uni-scroll-view textarea',
+  
+  // 收支类型单选
+  incomeRadio: '.nut-radio-group > uni-view:nth-child(1) > .nut-icon',
+  expenseRadio: '.nut-radio-group > uni-view:nth-child(2) > .nut-icon',
+};
+
+/**
+ * 账目管理页面类
+ * 处理账目管理相关操作
+ */
+export class AccountPage extends BasePage {
+  // 导航定位器
+  readonly moreMenu: Locator;
+  readonly accountMenu: Locator;
+  
+  // 操作按钮
+  readonly addButton: Locator;
+  readonly saveButton: Locator;
+  readonly editButton: Locator;
+  
+  // 表单字段
+  readonly accountNameInput: Locator;
+  readonly remarkTextarea: Locator;
+  
+  // 收支类型
+  readonly incomeRadio: Locator;
+  readonly expenseRadio: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    
+    this.moreMenu = page.getByText('更多 >');
+    this.accountMenu = page.getByText('账目管理').first();
+    this.addButton = page.getByText('新增', { exact: true });
+    this.saveButton = page.locator('uni-button.execute-btn').filter({ hasText: '保存' });
+    this.editButton = page.locator('uni-button').filter({ hasText: '修改' });
+    this.accountNameInput = page.locator('uni-input').filter({ hasText: '科目名称' }).getByRole('textbox');
+    this.remarkTextarea = page.locator('uni-scroll-view textarea');
+    this.incomeRadio = page.locator('.nut-radio-group > uni-view:nth-child(1) > .nut-icon');
+    this.expenseRadio = page.locator('.nut-radio-group > uni-view:nth-child(2) > .nut-icon');
+  }
+
+  /**
+   * 进入账目管理页面
+   */
+  async openAccountManagement(): Promise<void> {
+    await this.navigate('/');
+    await this.moreMenu.click();
+    await this.page.waitForTimeout(500);
+    await this.accountMenu.click();
+    await this.page.waitForLoadState('networkidle', { timeout: 30000 });
+  }
+
+  /**
+   * 点击新增按钮
+   */
+  async clickAddButton(): Promise<void> {
+    await this.addButton.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 填写账目名称
+   * @param name 账目名称
+   */
+  async fillAccountName(name: string): Promise<void> {
+    await this.accountNameInput.click();
+    await this.accountNameInput.fill(name);
+  }
+
+  /**
+   * 选择收支类型
+   * @param type '收入' 或 '支出'
+   */
+  async selectIncomeType(type: '收入' | '支出'): Promise<void> {
+    if (type === '支出') {
+      await this.expenseRadio.click();
+    }
+    // 收入是默认选项，无需选择
+  }
+
+  /**
+   * 填写备注
+   * @param remark 备注内容
+   */
+  async fillRemark(remark: string): Promise<void> {
+    await this.remarkTextarea.click();
+    await this.remarkTextarea.fill(remark);
+  }
+
+  /**
+   * 保存账目
+   */
+  async saveAccount(): Promise<void> {
+    await this.saveButton.click();
+    await this.page.waitForTimeout(1000);
+  }
+
+  /**
+   * 搜索账目
+   * @param name 账目名称
+   */
+  async searchAccount(name: string): Promise<void> {
+    await this.page.locator('uni-input').filter({ hasText: '账目名称' }).getByRole('textbox').click();
+    await this.page.locator('uni-input').filter({ hasText: '账目名称' }).getByRole('textbox').fill(name);
+    await this.page.waitForTimeout(1000);
+  }
+
+  /**
+   * 验证账目是否存在
+   * @param name 账目名称
+   * @returns 是否存在
+   */
+  async verifyAccountExists(name: string): Promise<boolean> {
+    const isVisible = await this.page.getByText(name, { exact: true }).isVisible().catch(() => false);
+    return isVisible;
+  }
+
+  /**
+   * 删除账目
+   * @param name 账目名称
+   */
+  async deleteAccount(name: string): Promise<void> {
+    // 搜索账目
+    await this.searchAccount(name);
+    await this.page.waitForTimeout(500);
+    // 点击删除按钮
+    await this.page.getByText('删除').click();
+    await this.page.waitForTimeout(500);
+    // 确认删除
+    await this.page.getByText('确定').click();
+    await this.page.waitForTimeout(1000);
+  }
+
+  /**
+   * 验证账目删除成功
+   * @param name 账目名称
+   * @returns 是否删除成功
+   */
+  async verifyAccountDeleted(name: string): Promise<boolean> {
+    await this.searchAccount(name);
+    await this.page.waitForTimeout(500);
+    const isVisible = await this.page.getByText(name, { exact: true }).isVisible().catch(() => false);
+    return !isVisible;
+  }
+
+  /**
+   * 点击修改按钮
+   */
+  async clickEditButton(): Promise<void> {
+    await this.editButton.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 修改账目完整流程
+   * @param originalName 原账目名称
+   * @param newName 新账目名称
+   * @param incomeType 收支类型（收入/支出）
+   * @param remark 备注
+   */
+  async updateAccount(originalName: string, newName: string, incomeType?: '收入' | '支出', remark?: string): Promise<void> {
+    // 搜索原账目
+    await this.searchAccount(originalName);
+    await this.page.waitForTimeout(500);
+    // 点击修改按钮
+    await this.clickEditButton();
+    // 修改账目名称
+    await this.accountNameInput.click();
+    await this.accountNameInput.fill(newName);
+    // 修改收支类型
+    if (incomeType === '支出') {
+      await this.expenseRadio.click();
+    }
+    // 修改备注
+    if (remark) {
+      await this.remarkTextarea.click();
+      await this.remarkTextarea.fill(remark);
+    }
+    // 保存
+    await this.saveAccount();
+  }
+
+  /**
+   * 清除搜索框
+   */
+  async clearSearchBox(): Promise<void> {
+    await this.page.locator('.nut-icon.nutui-iconfont.nut-icon-circle-close').click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 新增账目完整流程
+   * @param accountName 账目名称
+   * @param incomeType 收支类型（默认'收入'）
+   * @param remark 备注
+   */
+  async createAccount(accountName: string, incomeType: '收入' | '支出' = '收入', remark?: string): Promise<void> {
+    await this.openAccountManagement();
+    await this.clickAddButton();
+    await this.fillAccountName(accountName);
+    await this.selectIncomeType(incomeType);
+    if (remark) {
+      await this.fillRemark(remark);
+    }
+    await this.saveAccount();
+  }
+
+  /**
+   * 验证账目创建成功
+   * @param accountName 账目名称
+   * @returns 是否创建成功
+   */
+  async verifyAccountCreated(accountName: string): Promise<boolean> {
+    await this.searchAccount(accountName);
+    return await this.verifyAccountExists(accountName);
+  }
+}
+import { Page, Locator, expect } from '@playwright/test';
+import { BasePage } from './basePage';
+
+/**
+ * 客户分组页面选择器
+ */
+const selectors = {
+  // 导航
+  moreMenu: 'text=更多 >',
+  customerGroupMenu: 'text=客户分组',
+  
+  // 操作按钮
+  newButton: 'text=新建',
+  confirmButton: 'text=确定',
+  saveButton: 'text=保存',
+  deleteButton: 'text=删除',
+  editButton: 'text=编辑',
+  
+  // 表单字段
+  groupNameInput: 'text=分组名称*',
+  sortInput: 'textbox',
+  
+  // 搜索
+  searchInput: 'textbox',
+  clearSearchButton: '.nut-searchbar__search-icon',
+};
+
+/**
+ * 客户分组页面类
+ * 处理客户分组相关操作
+ */
+export class CustomerGroupPage extends BasePage {
+  // 导航定位器
+  readonly moreMenu: Locator;
+  readonly customerGroupMenu: Locator;
+  
+  // 操作按钮
+  readonly newButton: Locator;
+  readonly confirmButton: Locator;
+  readonly saveButton: Locator;
+  readonly deleteButton: Locator;
+  readonly editButton: Locator;
+  
+  // 表单字段
+  readonly groupNameInput: Locator;
+  readonly sortInput: Locator;
+  
+  // 搜索
+  readonly searchInput: Locator;
+  readonly clearSearchButton: Locator;
+
+  constructor(page: Page) {
+    super(page);
+    
+    this.moreMenu = page.getByText('更多 >');
+    this.customerGroupMenu = page.getByText('客户分组').first();
+    this.newButton = page.getByText('新建');
+    this.confirmButton = page.getByText('确定');
+    this.saveButton = page.getByText('保存');
+    this.deleteButton = page.getByText('删除');
+    this.editButton = page.getByText('编辑');
+    this.groupNameInput = page.locator('uni-view').filter({ hasText: /^分组名称\*$/ }).first();
+    this.sortInput = page.getByRole('textbox').nth(2);
+    this.searchInput = page.getByRole('textbox');
+    this.clearSearchButton = page.locator('.nut-searchbar__search-icon');
+  }
+
+  /**
+   * 进入客户分组页面
+   */
+  async openCustomerGroupManagement(): Promise<void> {
+    await this.navigate('/');
+    await this.moreMenu.click();
+    await this.page.waitForTimeout(500);
+    await this.customerGroupMenu.click();
+    await this.page.waitForLoadState('networkidle', { timeout: 30000 });
+  }
+
+  /**
+   * 点击新建按钮
+   */
+  async clickNewButton(): Promise<void> {
+    await this.newButton.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 填写分组名称
+   * @param name 分组名称
+   */
+  async fillGroupName(name: string): Promise<void> {
+    await this.page.getByRole('textbox').nth(1).click();
+    await this.page.getByRole('textbox').nth(1).fill(name);
+  }
+
+  /**
+   * 填写排序号
+   * @param sort 排序号
+   */
+  async fillSortNumber(sort: string): Promise<void> {
+    await this.page.getByRole('textbox').nth(2).click();
+    await this.page.getByRole('textbox').nth(2).fill(sort);
+  }
+
+  /**
+   * 点击确定按钮
+   */
+  async clickConfirm(): Promise<void> {
+    await this.confirmButton.click();
+    await this.page.waitForTimeout(1000);
+  }
+
+  /**
+   * 搜索分组
+   * @param name 分组名称
+   */
+  async searchGroup(name: string): Promise<void> {
+    await this.searchInput.click();
+    await this.searchInput.fill(name);
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 点击清除搜索按钮
+   */
+  async clearSearch(): Promise<void> {
+    await this.clearSearchButton.click();
+    await this.page.waitForTimeout(2000);
+  }
+
+  /**
+   * 点击编辑按钮
+   */
+  async clickEdit(): Promise<void> {
+    await this.editButton.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 点击删除按钮
+   */
+  async clickDelete(): Promise<void> {
+    await this.deleteButton.click();
+    await this.page.waitForTimeout(500);
+  }
+
+  /**
+   * 验证分组是否存在（验证前先搜索）
+   * @param name 分组名称
+   * @returns 是否存在
+   */
+  async verifyGroupExists(name: string): Promise<boolean> {
+    await this.searchGroup(name);
+    await this.page.waitForTimeout(500);
+    const count = await this.page.locator('uni-view').filter({ hasText: new RegExp(`^${name}$`) }).count();
+    return count > 0;
+  }
+
+  /**
+   * 验证分组是否不存在
+   * @param name 分组名称
+   * @returns 是否不存在
+   */
+  async verifyGroupNotExists(name: string): Promise<boolean> {
+    const count = await this.page.locator('uni-view').filter({ hasText: new RegExp(`^${name}$`) }).count();
+    return count === 0;
+  }
+
+  /**
+   * 新增客户分组完整流程
+   * @param groupName 分组名称
+   * @param sortNumber 排序号（可选）
+   */
+  async createGroup(groupName: string, sortNumber?: string): Promise<void> {
+    await this.openCustomerGroupManagement();
+    await this.clickNewButton();
+    await this.fillGroupName(groupName);
+    if (sortNumber) {
+      await this.fillSortNumber(sortNumber);
+    }
+    await this.clickConfirm();
+  }
+
+  /**
+   * 修改客户分组完整流程
+   * @param originalName 原分组名称
+   * @param newName 新分组名称
+   * @param newSortNumber 新排序号（可选）
+   */
+  async updateGroup(originalName: string, newName: string, newSortNumber?: string): Promise<void> {
+    await this.searchGroup(originalName);
+    await this.page.locator('uni-view').filter({ hasText: new RegExp(`^${originalName}$`) }).first().click();
+    await this.page.waitForTimeout(500);
+    await this.clickEdit();
+    // 清空分组名称并填写新名称
+    await this.page.getByRole('textbox').nth(1).click();
+    await this.page.locator('.nut-input__clear-icon').first().click();
+    await this.page.getByRole('textbox').nth(1).click();
+    await this.page.getByRole('textbox').nth(1).fill(newName);
+    if (newSortNumber) {
+      await this.page.getByRole('textbox').nth(2).click();
+      await this.page.getByRole('textbox').nth(2).fill(newSortNumber);
+    }
+    await this.clickConfirm();
+  }
+
+  /**
+   * 删除客户分组完整流程
+   * @param groupName 分组名称
+   */
+  async deleteGroup(groupName: string): Promise<void> {
+    await this.searchGroup(groupName);
+    await this.page.locator('uni-view').filter({ hasText: new RegExp(`^${groupName}$`) }).first().click();
+    await this.page.waitForTimeout(500);
+    await this.clickDelete();
+    await this.page.getByText('确定', { exact: true }).click();
+    await this.page.waitForTimeout(1000);
+    await this.clearSearch();
+  }
+}
@@ -7,7 +7,7 @@ dotenv.config({ path: path.resolve(__dirname, &#39;../.env&#39;) });
 const TEST_PHONE = process.env.phone;
 const TEST_USER_NAME = process.env.TEST_USER_NAME;
-const BASE_URL = process.env.BASE_URL || 'https://erp-pad.test.gszdtop.com';
+const BASE_URL = process.env.BASE_URL ;
 if (!TEST_PHONE || !TEST_USER_NAME) {
   throw new Error('phone 和 TEST_USER_NAME 环境变量未设置');
+import { test, expect } from '@playwright/test';
+import * as allure from 'allure-js-commons';
+import { AccountPage } from '../pages/accountPage';
+
+/**
+ * 账目管理测试
+ */
+test.describe('账目管理', () => {
+  // 使用已保存的认证状态
+  test.use({ storageState: 'auth.json' });
+
+  // 强制测试串行执行
+  test.describe.configure({ mode: 'serial' });
+
+  /**
+   * 生成随机账目名称（三个字+"费"，带时间戳后缀防止重复）
+   */
+  function generateAccountName(): string {
+    const prefixes = ['管理', '维护', '看管', '保管', '仓储', '代理', '服务', '咨询', '技术', '运营'];
+    const prefix = prefixes[Math.floor(Math.random() * prefixes.length)];
+    const timestamp = Date.now().toString().slice(-4);
+    return `${prefix}费${timestamp}`;
+  }
+
+  /**
+   * 生成随机收支类型
+   */
+  function generateIncomeType(): '收入' | '支出' {
+    return Math.random() > 0.5 ? '收入' : '支出';
+  }
+
+  /**
+   * 生成包含"自动化"的备注
+   */
+  function generateRemark(): string {
+    const timestamp = Date.now().toString().slice(-6);
+    return `自动化测试备注${timestamp}`;
+  }
+
+  test('新增账目', async ({ page }, testInfo) => {
+    const accountPage = new AccountPage(page);
+    
+    // 添加allure元素
+    await allure.epic('账目管理');
+    await allure.feature('账目信息');
+    await allure.story('新增账目');
+
+    // 生成随机账目数据
+    const accountName = generateAccountName();
+    const incomeType = generateIncomeType();
+    const remark = generateRemark();
+    
+    console.log('账目名称:', accountName);
+    console.log('收支类型:', incomeType);
+    console.log('备注:', remark);
+
+    // 步骤1：进入账目管理页面
+    await allure.step('进入账目管理页面', async () => {
+      await accountPage.openAccountManagement();
+    });
+
+    // 步骤2：点击新增按钮
+    await allure.step('点击新增按钮', async () => {
+      await accountPage.clickAddButton();
+    });
+
+    // 步骤3：填写账目表单
+    await allure.step('填写账目表单', async () => {
+      await accountPage.fillAccountName(accountName);
+      await accountPage.selectIncomeType(incomeType);
+      await accountPage.fillRemark(remark);
+    });
+
+    // 步骤4：保存账目
+    await allure.step('保存账目', async () => {
+      await accountPage.saveAccount();
+    });
+
+    // 步骤5：验证账目创建成功
+    await allure.step('验证账目创建成功', async () => {
+      await accountPage.searchAccount(accountName);
+      const isCreated = await accountPage.verifyAccountExists(accountName);
+      expect(isCreated).toBeTruthy();
+    });
+  });
+
+  test('删除账目', async ({ page }, testInfo) => {
+    const accountPage = new AccountPage(page);
+    
+    // 添加allure元素
+    await allure.epic('账目管理');
+    await allure.feature('账目信息');
+    await allure.story('删除账目');
+
+    // 生成随机账目数据
+    const accountName = generateAccountName();
+    console.log('待删除账目名称:', accountName);
+
+    // 步骤1：新增账目
+    await allure.step('新增账目', async () => {
+      await accountPage.openAccountManagement();
+      await accountPage.clickAddButton();
+      await accountPage.fillAccountName(accountName);
+      await accountPage.saveAccount();
+    });
+
+    // 步骤2：删除账目
+    await allure.step('删除账目', async () => {
+      await accountPage.deleteAccount(accountName);
+    });
+
+    // 步骤3：验证账目删除成功
+    await allure.step('验证账目删除成功', async () => {
+      const isDeleted = await accountPage.verifyAccountDeleted(accountName);
+      expect(isDeleted).toBeTruthy();
+    });
+  });
+
+  test('修改账目', async ({ page }, testInfo) => {
+    const accountPage = new AccountPage(page);
+    
+    // 添加allure元素
+    await allure.epic('账目管理');
+    await allure.feature('账目信息');
+    await allure.story('修改账目');
+
+    // 生成随机账目数据
+    const originalName = generateAccountName();
+    const newName = generateAccountName();
+    const incomeType = generateIncomeType();
+    const remark = generateRemark();
+    
+    console.log('原账目名称:', originalName);
+    console.log('新账目名称:', newName);
+    console.log('收支类型:', incomeType);
+    console.log('备注:', remark);
+
+    // 步骤1：新增账目
+    await allure.step('新增账目', async () => {
+      await accountPage.openAccountManagement();
+      await accountPage.clickAddButton();
+      await accountPage.fillAccountName(originalName);
+      await accountPage.saveAccount();
+    });
+
+    // 步骤2：修改账目
+    await allure.step('修改账目', async () => {
+      await accountPage.updateAccount(originalName, newName, incomeType, remark);
+    });
+
+    // 步骤3：验证账目修改成功
+    await allure.step('验证账目修改成功', async () => {
+      // 清除搜索框
+      await accountPage.clearSearchBox();
+      // 搜索修改后的账目名称
+      await accountPage.searchAccount(newName);
+      const isExists = await accountPage.verifyAccountExists(newName);
+      expect(isExists).toBeTruthy();
+    });
+  });
+});
 import { test, expect } from '@playwright/test';
 import * as allure from 'allure-js-commons';
+import { CustomerGroupPage } from '../pages/customerGroupPage';
 /**
  * 客户分组测试
@@ -32,6 +33,8 @@ test.describe(&#39;客户分组&#39;, () =&gt; {
   }
   test('新增客户分组', async ({ page }, testInfo) => {
+    const customerGroupPage = new CustomerGroupPage(page);
+    
     // 添加allure元素
     await allure.epic('客户管理');
     await allure.feature('客户分组');
@@ -43,47 +46,34 @@ test.describe(&#39;客户分组&#39;, () =&gt; {
     // 步骤1：进入客户分组页面
     await allure.step('进入客户分组页面', async () => {
-      await page.goto('/');
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
-      await page.getByText('更多 >').click();
-      await page.waitForTimeout(500);
-      await page.getByText('客户分组').first().click();
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
+      await customerGroupPage.openCustomerGroupManagement();
     });
     // 步骤2：点击新建按钮
     await allure.step('点击新建按钮', async () => {
-      await page.getByText('新建').click();
-      await page.waitForTimeout(500);
+      await customerGroupPage.clickNewButton();
     });
     // 步骤3：填写分组信息
     await allure.step('填写分组信息', async () => {
-      // 填写分组名称
-      await page.getByRole('textbox').nth(1).click();
-      await page.getByRole('textbox').nth(1).fill(groupName);
-      
-      // 填写备注/排序
-      await page.getByRole('textbox').nth(2).click();
-      await page.getByRole('textbox').nth(2).fill('自动化测试分组');
+      await customerGroupPage.fillGroupName(groupName);
     });
     // 步骤4：保存分组
     await allure.step('保存分组', async () => {
-      await page.getByText('确定').click();
-      await page.waitForTimeout(1000);
+      await customerGroupPage.clickConfirm();
     });
-    // 步骤5：验证分组创建成功 - 使用正则匹配检查页面是否出现新增的内容
+    // 步骤5：验证分组创建成功
     await allure.step('验证分组创建成功', async () => {
-      await page.waitForTimeout(1000); // 等待页面刷新
-      // 使用正则匹配分组名称
-      const isGroupVisible = await page.locator('uni-view').filter({ hasText: new RegExp(`^${groupName}$`) }).first().isVisible({ timeout: 5000 }).catch(() => false);
-      expect(isGroupVisible).toBeTruthy();
+      const isExists = await customerGroupPage.verifyGroupExists(groupName);
+      expect(isExists).toBeTruthy();
     });
   });
   test('修改客户分组', async ({ page }, testInfo) => {
+    const customerGroupPage = new CustomerGroupPage(page);
+    
     // 添加allure元素
     await allure.epic('客户管理');
     await allure.feature('客户分组');
@@ -92,71 +82,30 @@ test.describe(&#39;客户分组&#39;, () =&gt; {
     // 先生成一个分组用于修改
     const originalGroupName = generateGroupName();
     const newGroupName = generateGroupName();
+    const newSortNumber = generateSortNumber();
     console.log('原分组名称:', originalGroupName);
     console.log('新分组名称:', newGroupName);
-    // 步骤1：进入客户分组页面并创建分组
-    await allure.step('进入客户分组页面并创建分组', async () => {
-      await page.goto('/');
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
-      await page.getByText('更多 >').click();
-      await page.waitForTimeout(500);
-      await page.getByText('客户分组').first().click();
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
-      
-      // 创建分组
-      await page.getByText('新建').click();
-      await page.waitForTimeout(500);
-      // 点击分组名称输入框
-      await page.locator('uni-view').filter({ hasText: /^分组名称\*$/ }).first().click();
-      await page.getByRole('textbox').nth(1).fill(originalGroupName);
-      await page.getByText('确定').click();
-      await page.waitForTimeout(1000);
+    // 步骤1：先创建分组
+    await allure.step('创建待修改的分组', async () => {
+      await customerGroupPage.createGroup(originalGroupName);
     });
-    // 步骤2：搜索并修改分组
-    await allure.step('搜索并修改分组', async () => {
-      // 在搜索框中输入原分组名称
-      await page.getByRole('textbox').click();
-      await page.getByRole('textbox').fill(originalGroupName);
-      
-      // 点击搜索结果中的分组
-      await page.locator('uni-view').filter({ hasText: new RegExp(`^${originalGroupName}$`) }).first().click();
-      await page.waitForTimeout(500);
-      
-      // 点击编辑按钮
-      await page.getByText('编辑').click();
-      await page.waitForTimeout(500);
-      
-      // 清空分组名称并填写新名称
-      await page.getByRole('textbox').nth(1).click();
-      await page.locator('.nut-input__clear-icon').first().click();
-      await page.getByRole('textbox').nth(1).click();
-      await page.getByRole('textbox').nth(1).fill(newGroupName);
-      
-      // 直接填写新排序号（新增时未填写，无需清除）
-      const newSortNumber = generateSortNumber();
-      await page.getByRole('textbox').nth(2).click();
-      await page.getByRole('textbox').nth(2).fill(newSortNumber);
-      
-      await page.getByText('确定').click();
-      await page.waitForTimeout(1000);
+    // 步骤2：修改分组
+    await allure.step('修改分组', async () => {
+      await customerGroupPage.updateGroup(originalGroupName, newGroupName, newSortNumber);
     });
-    // 步骤3：验证分组修改成功 - 使用搜索验证修改后的内容
+    // 步骤3：验证分组修改成功
     await allure.step('验证分组修改成功', async () => {
-      // 在搜索框中输入新分组名称进行验证
-      await page.waitForTimeout(500);
-      await page.getByRole('textbox').click();
-      await page.getByRole('textbox').fill(newGroupName);
-      await page.waitForTimeout(500);
-      
-      const isNewGroupVisible = await page.locator('uni-view').filter({ hasText: new RegExp(`^${newGroupName}$`) }).first().isVisible({ timeout: 5000 }).catch(() => false);
-      expect(isNewGroupVisible).toBeTruthy();
+      const isExists = await customerGroupPage.verifyGroupExists(newGroupName);
+      expect(isExists).toBeTruthy();
     });
   });
   test('删除客户分组', async ({ page }, testInfo) => {
+    const customerGroupPage = new CustomerGroupPage(page);
+    
     // 添加allure元素
     await allure.epic('客户管理');
     await allure.feature('客户分组');
@@ -166,53 +115,20 @@ test.describe(&#39;客户分组&#39;, () =&gt; {
     const groupName = generateGroupName();
     console.log('待删除分组名称:', groupName);
-    // 步骤1：进入客户分组页面并创建分组
-    await allure.step('进入客户分组页面并创建分组', async () => {
-      await page.goto('/');
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
-      await page.getByText('更多 >').click();
-      await page.waitForTimeout(500);
-      await page.getByText('客户分组').first().click();
-      await page.waitForLoadState('networkidle', { timeout: 30000 });
-      
-      // 创建分组
-      await page.getByText('新建').click();
-      await page.waitForTimeout(500);
-      await page.getByRole('textbox').nth(1).click();
-      await page.getByRole('textbox').nth(1).fill(groupName);
-      await page.getByText('确定').click();
-      await page.waitForTimeout(1000);
+    // 步骤1：先创建分组
+    await allure.step('创建待删除的分组', async () => {
+      await customerGroupPage.createGroup(groupName);
     });
-    // 步骤2：搜索并删除分组
-    await allure.step('搜索并删除分组', async () => {
-      // 在搜索框中输入分组名称
-      await page.getByRole('textbox').click();
-      await page.getByRole('textbox').fill(groupName);
-      
-      // 搜索后自动选中，直接点击删除按钮
-      await page.getByText('删除').click();
-      await page.waitForTimeout(500);
-      
-      // 确认删除
-      await page.getByText('确定', { exact: true }).click();
-      // await page.waitForTimeout(1000);
-      
-      // 点击清除按钮
-      await page.locator('.nut-searchbar__search-icon').click();
-      // 清除后等待页面刷新
-      await page.waitForTimeout(1000);
+    // 步骤2：删除分组
+    await allure.step('删除分组', async () => {
+      await customerGroupPage.deleteGroup(groupName);
     });
     // 步骤3：验证分组删除成功
     await allure.step('验证分组删除成功', async () => {
-      // 搜索已删除的分组名称
-      await page.getByRole('textbox').fill(groupName);
-      await page.waitForTimeout(1000);
-      
-      // 验证搜索结果中是否还能找到该分组（找不到才是删除成功）
-      const count = await page.locator('uni-view').filter({ hasText: new RegExp(`^${groupName}$`) }).count();
-      expect(count).toBe(0);
+      const isNotExists = await customerGroupPage.verifyGroupNotExists(groupName);
+      expect(isNotExists).toBeTruthy();
     });
   });
 });