From 21cb3dcbcfd982cab41126c70fa338e6afaaa67d Mon Sep 17 00:00:00 2001 From: qiuxiang <394405259@qq.com> Date: Tue, 29 Sep 2026 11:03:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AF=E5=93=81=E4=BC=9AMP=E8=B4=A6=E6=88=B7?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E6=A0=87=E7=AD=BE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BB=93=E7=AE=97=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 唯品会MP账户的时间筛选标签由「发生时间」改为「结算时间」，与该页签的订单签收或退款时间口径一致；标签仍集中在 DATE_FILTER_LABELS 映射（抖音、唯品会MP=结算时间；京东账单/京喜账单/京东网银钱包=费用结算时间；其余默认发生时间）。 --- resources/assets/js/components/business/AccountBills.vue | 2 +- tests/Unit/View/AccountBillsTableTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/business/AccountBills.vue b/resources/assets/js/components/business/AccountBills.vue index dcf89d0b..9a0089ab 100644 --- a/resources/assets/js/components/business/AccountBills.vue +++ b/resources/assets/js/components/business/AccountBills.vue @@ -77,7 +77,7 @@ const SORTABLE = ['occurred_at','income','expense','balance','record_code']; // 京东账单与京喜账单共用同一份列定义与同一套交互，只在数据口径上拆分。 const JD_BILL_TABS = ['jd-transactions','jingxi']; // 时间筛选标签与该页签的时间列名保持一致（其余页签沿用「发生时间」）。 -const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间'}; +const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'结算时间'}; const dateConfig = {dateFormat:'Y-m-d',locale:Mandarin,disableMobile:true,allowInput:false,onReady:(_,value,picker)=>picker.calendarContainer.classList.add('account-bill-calendar')}; const emptyFilters = billType => ({store_name:'',bill_item:'',start:'',end:'',keyword:'',keyword_match:billType==='douyin'?'exact-record':'contains'}); export default { diff --git a/tests/Unit/View/AccountBillsTableTest.php b/tests/Unit/View/AccountBillsTableTest.php index b696372f..c5cdde2b 100644 --- a/tests/Unit/View/AccountBillsTableTest.php +++ b/tests/Unit/View/AccountBillsTableTest.php @@ -45,7 +45,7 @@ class AccountBillsTableTest extends TestCase $this->assertStringContainsString("const JD_BILL_TABS = ['jd-transactions','jingxi'];", $source); $this->assertStringContainsString("isJdBillTab(){return JD_BILL_TABS.indexOf(this.billType)!==-1;}", $source); - $this->assertStringContainsString("const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间'};", $source); + $this->assertStringContainsString("const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'结算时间'};", $source); $this->assertStringContainsString('{{ dateFilterLabel }}', $source); $this->assertStringContainsString('v-if="isJdBillTab && sync"', $source); $this->assertStringContainsString("netLabel=JD_BILL_TABS.concat(['vipshop-jx']).indexOf(this.billType)!==-1", $source);