Merge branch 'release/test' of http://git.buggoglobal.com/html/admin-web into dev

src/modules/unified-orders/components/InboundFeeDetailManager.test.ts

@@ -64,6 +64,8 @@ describe('InboundFeeDetailManager', () => {
     const second = wrapper.findAll('.el-table__row')[1]!.text()
     const secondButtons = wrapper.findAll('.el-table__row')[1]!.findAll('button').map((button) => button.text())
     expect(first).toContain('编辑'); expect(first).toContain('审核'); expect(first).toContain('驳回')
+    expect(first).toContain('草稿')
+    expect(second).toContain('已发布')
     expect(second).toContain('调整'); expect(second).toContain('作废'); expect(secondButtons).not.toContain('审核')
     expect(wrapper.find('th').text()).toContain('操作')
     expect(source).not.toMatch(/<el-button[^>]+link[^>]+(?:编辑|审核|驳回|调整|作废)/)
@@ -244,7 +246,11 @@ describe('InboundFeeDetailManager', () => {
   })
 
   it('refreshes fee rows and the order detail after every successful write', () => {
+<<<<<<< HEAD
     expect(source).toMatch(/async function finishAction\(message: string\) \{\r?\n  await load\(\); emit\('changed'\)/)
+=======
+    expect(source).toMatch(/async function finishAction\(message: string\)\s*\{\s*await load\(\); emit\('changed'\)/)
+>>>>>>> a67f6300f8a7a5225657bc9c9be8ee716f97ccf6
     expect(source).toMatch(/createInboundFeeDetail[\s\S]*updateInboundFeeDetail[\s\S]*adjustInboundFeeDetail[\s\S]*await finishAction\(/)
     expect(source).toMatch(/deleteInboundFeeDetail[\s\S]*await finishAction\('费用明细已删除'\)/)
     expect(source).toMatch(/reviewInboundFeeDetail[\s\S]*await finishAction\('费用审核通过'\)/)