feat: 新增推广费营销账户页签与店铺明细弹窗

在店铺收款账户账单中新增推广费(营销账户)页签和第五个指标卡;点击查看明细可打开店铺明细弹窗,固定展示店铺名称、交易时间、备注和支出金额。补充前后端契约与导航测试,当前取数源保持待接入状态。
This commit is contained in:
qiuxiang 2026-10-27 16:42:24 +08:00
parent b3e6f85934
commit 21b4cf58d2
7 changed files with 314 additions and 13 deletions

View File

@ -554,6 +554,7 @@ $navigation = [
['slug' => 'dewu', 'title' => '得物账户'],
['slug' => 'vipshop', 'title' => '唯品会MP账户'],
['slug' => 'vipshop-jx', 'title' => '唯品会JX账户'],
['slug' => 'promotion-marketing', 'title' => '推广费(营销账户)'],
],
],
[

View File

@ -40,6 +40,10 @@ class AccountBills extends Controller
$billType = $bill_type;
if ($billType === 'promotion-marketing') {
return $this->promotionMarketingIndex($request);
}
if (! AccountBillColumns::has($billType)) {
abort(404, '未知的账户类型。');
}
@ -109,6 +113,78 @@ class AccountBills extends Controller
return response()->json($this->withLedgerRemarks($data, $billType));
}
/**
* 推广费(营销账户)页签的固定响应结构。
*
* 各平台取数口径尚未配置,先返回明确的空结果与店铺明细列定义;后续接入时
* 只替换这里的数据来源,不改页签、卡片和弹窗契约。
*/
private function promotionMarketingIndex(Request $request)
{
$page = max(1, (int) $request->get('page', 1));
$limit = min(max((int) $request->get('limit', 10), 1), 100);
return response()->json([
'data' => [],
'total' => 0,
'current_page' => $page,
'last_page' => 1,
'per_page' => $limit,
'summary' => [
'income' => 0,
'expense' => 0,
'balance' => 0,
'count' => 0,
],
'columns' => [
'title' => '推广费(营销账户)',
'groups' => [],
'columns' => self::promotionExpenseDetailColumns(),
],
]);
}
/**
* 推广费(营销账户)的店铺明细。当前先提供统一空结果,待逐平台取数口径
* 确定后由专用 Repository 填充;筛选参数与主账单页保持一致。
*/
public function promotionExpenseDetails(Request $request, string $bill_type)
{
abort_unless($bill_type === 'promotion-marketing', 404);
$this->authorizeStoreReceivingBills();
$request->validate([
'store_name' => ['nullable', 'string', 'max:255'],
'ledger_remark' => ['nullable', 'string', 'max:191'],
'bill_item' => ['nullable', 'string', 'max:255'],
'start' => ['nullable', 'date_format:Y-m-d'],
'end' => ['nullable', 'date_format:Y-m-d', 'after_or_equal:start'],
'keyword' => ['nullable', 'string', 'max:255'],
]);
return response()->json([
'data' => [],
'total' => 0,
'summary' => [
'expense' => 0,
'count' => 0,
],
'columns' => self::promotionExpenseDetailColumns(),
'message' => '推广费数据源尚未配置,接入后将按当前筛选显示店铺明细。',
]);
}
/** @return array<int,array{label:string,field:string,kind:string}> */
private static function promotionExpenseDetailColumns(): array
{
return [
['label' => '店铺名称', 'field' => 'store_name', 'kind' => 'text'],
['label' => '交易时间', 'field' => 'occurred_at', 'kind' => 'date'],
['label' => '备注', 'field' => 'notes', 'kind' => 'text'],
['label' => '支出金额', 'field' => 'expense', 'kind' => 'money'],
];
}
public function export(Request $request, string $bill_type)
{
$this->authorizeStoreReceivingBills();

View File

@ -1,7 +1,80 @@
<template>
<div class="table-workspace">
<div class="tw-stats">
<div v-for="stat in stats" :key="stat.label" class="tw-stat"><div class="tw-label">{{ stat.label }}</div><div class="tw-value" :class="stat.className">{{ stat.value }}</div><div class="tw-note">{{ stat.note }}</div></div>
<div class="tw-stats" :class="{ 'tw-stats--five': isPromotionMarketing }">
<div
v-for="stat in stats"
:key="stat.label"
class="tw-stat"
:class="{ 'tw-stat--promotion': stat.action }"
>
<div class="tw-label">{{ stat.label }}</div>
<div class="tw-value" :class="stat.className">{{ stat.value }}</div>
<div class="tw-note">{{ stat.note }}</div>
<button
v-if="stat.action"
type="button"
class="tw-promotion-link"
aria-label="查看店铺明细"
@click="openPromotionDetails"
>查看明细 →</button>
</div>
</div>
<div
v-if="promotionModalOpen"
ref="promotionModal"
class="tw-modal"
role="dialog"
aria-modal="true"
aria-labelledby="promotion-expense-detail-title"
tabindex="-1"
@click.self="closePromotionDetails"
@keydown.esc="closePromotionDetails"
>
<div class="tw-modal__box tw-promotion-modal">
<div class="tw-modal__head">
<strong id="promotion-expense-detail-title">店铺明细</strong>
<button type="button" class="tw-modal__close" aria-label="关闭店铺明细" @click="closePromotionDetails">✕</button>
</div>
<div class="tw-modal__body">
<p class="tw-modal__note">推广费(营销账户) · 按当前筛选范围</p>
<div v-if="promotionExpenseError" class="tw-promotion-state is-error" role="alert">
店铺明细加载失败,请稍后重试。
<button type="button" class="tw-button" @click="fetchPromotionExpenseDetails()">重新加载</button>
</div>
<div v-else-if="promotionExpenseLoading" class="tw-promotion-state" role="status">加载中…</div>
<div v-else-if="!promotionExpenseRows.length" class="tw-promotion-state" role="status">
{{ promotionExpenseMessage || '当前筛选范围内暂无推广费明细。' }}
</div>
<div v-else class="tw-promotion-table-wrap">
<table class="tw-table tw-promotion-table">
<thead>
<tr>
<th
v-for="column in promotionExpenseColumns"
:key="column.field"
scope="col"
:class="{ 'is-number': column.kind === 'money' }"
>{{ column.label }}</th>
</tr>
</thead>
<tbody>
<tr v-for="(row, index) in promotionExpenseRows" :key="row.id || index">
<td
v-for="column in promotionExpenseColumns"
:key="column.field"
:class="{ 'is-number': column.kind === 'money' }"
:title="column.field === 'notes' ? promotionCellValue(row, column) : null"
>{{ promotionCellValue(row, column) }}</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="tw-modal__foot">
<span class="tw-promotion-total">支出合计 {{ money(promotionExpenseSummary.expense) }} · {{ promotionExpenseSummary.count }} 笔</span>
<button type="button" class="tw-button" @click="closePromotionDetails">关闭</button>
</div>
</div>
</div>
<form class="tw-filter" @submit.prevent="applyFilters">
<label>店铺
@ -49,7 +122,7 @@
<div v-if="loadError" class="tw-alert" role="alert"><span>账单加载失败,请重试</span><button type="button" @click="fetch">重新加载</button></div>
<div class="tw-toolbar">
<div><strong>{{ sourceGroups.length ? '账单明细' : columnsTitle }}</strong><span v-if="!loading" class="tw-count">{{ total }} 条</span></div>
<div class="tw-tools" v-if="sourceColumns.length">
<div class="tw-tools" v-if="sourceColumns.length && !isPromotionMarketing">
<select v-model="exportMode" title="选择导出范围" aria-label="导出范围"><option value="page-visible">当前页({{ rows.length }} 条)· 当前显示列</option><option value="filtered-visible">全部筛选结果({{ total }} 条)· 当前显示列</option><option value="filtered-all">全部筛选结果({{ total }} 条)· 全部字段</option></select>
<button type="button" class="tw-button" :disabled="!canExport || exporting" @click="exportRows"><span class="material-icons-outlined" aria-hidden="true">download</span>{{ exporting ? '提交中…' : (exportMode === 'page-visible' ? '导出当前页' : '导出全部筛选结果') }}</button>
<button type="button" class="tw-button" @click="openExportModal"><span class="material-icons-outlined" aria-hidden="true">assignment</span>导出进度</button>
@ -126,16 +199,23 @@ const SORTABLE = ['occurred_at','income','expense','balance','record_code'];
const JD_BILL_TABS = ['jd-transactions','jingxi'];
// 时间筛选标签与该页签的时间列名保持一致(其余页签沿用「发生时间」)。
// 唯品会两个页签的筛选项按「账单期间」筛(后端也只按 payload.settle_period 过滤)。
const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'账单期间','vipshop-jx':'账单期间'};
const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'账单期间','vipshop-jx':'账单期间','promotion-marketing':'交易时间'};
const PROMOTION_DETAIL_COLUMNS = [
{label:'店铺名称',field:'store_name',kind:'text'},
{label:'交易时间',field:'occurred_at',kind:'date'},
{label:'备注',field:'notes',kind:'text'},
{label:'支出金额',field:'expense',kind:'money'},
];
const dateConfig = {dateFormat:'Y-m-d',locale:Mandarin,disableMobile:true,allowInput:false,onReady:(_,value,picker)=>picker.calendarContainer.classList.add('account-bill-calendar')};
// 默认账期=本月:不填日期时查全表(几百万行)会很慢,默认落到当月既快又符合日常用法。
const currentMonthRange = () => { const now = new Date(); const year = now.getFullYear(); const month = now.getMonth() + 1; const pad = value => String(value).padStart(2, '0'); const lastDay = new Date(year, month, 0).getDate(); return { start: `${year}-${pad(month)}-01`, end: `${year}-${pad(month)}-${pad(lastDay)}` }; };
const emptyFilters = billType => ({store_name:'',ledger_remark:'',bill_item:'',...currentMonthRange(),keyword:'',keyword_match:'contains'});
export default {
name:'AccountBills', components:{ TableColumnSettings, flatPicker, [Select.name]:Select, [Option.name]:Option }, props:{ apiBase:{type:String,required:true}, billType:{type:String,required:true}, progressBase:{type:String,default:''}, userKey:{type:[String,Number],required:true} },
data(){return{loading:false,loadError:false,sync:null,rows:[],sourceColumns:[],configuredColumns:[],columnsTitle:'',sourceGroups:[],summary:{income:0,expense:0,balance:0,count:0},total:0,currentPage:1,lastPage:1,perPage:20,filters:emptyFilters(this.billType),queryFilters:emptyFilters(this.billType),resultFilters:null,filterOptions:{shops:[],bill_items:[],ledger_remarks:[]},filterOptionsLoading:false,filterOptionsError:false,requestSerial:0,sort:{key:'occurred_at',dir:'desc'},exportMode:'filtered-visible',exporting:false,exportModalOpen:false,exportTasks:[],exportHint:'导出在后台生成,成功后点「下载」;期间可以继续查看其它页面。',exportTimer:null};},
data(){return{loading:false,loadError:false,sync:null,rows:[],sourceColumns:[],configuredColumns:[],columnsTitle:'',sourceGroups:[],summary:{income:0,expense:0,balance:0,count:0},total:0,currentPage:1,lastPage:1,perPage:20,filters:emptyFilters(this.billType),queryFilters:emptyFilters(this.billType),resultFilters:null,filterOptions:{shops:[],bill_items:[],ledger_remarks:[]},filterOptionsLoading:false,filterOptionsError:false,requestSerial:0,promotionRequestSerial:0,sort:{key:'occurred_at',dir:'desc'},exportMode:'filtered-visible',exporting:false,exportModalOpen:false,exportTasks:[],exportHint:'导出在后台生成,成功后点「下载」;期间可以继续查看其它页面。',exportTimer:null,promotionModalOpen:false,promotionExpenseLoading:false,promotionExpenseError:false,promotionExpenseRows:[],promotionExpenseSummary:{expense:0,count:0},promotionExpenseMessage:'',promotionExpenseColumns:PROMOTION_DETAIL_COLUMNS};},
computed:{
isDouyin(){return this.billType==='douyin';},
isPromotionMarketing(){return this.billType==='promotion-marketing';},
companyPrefix(){const matched=(this.apiBase||'').match(/^\/\d+/);return matched?matched[0]:'';},
tasksBaseUrl(){return this.companyPrefix+'/ecommerce-finance/account-bills/export-tasks';},
tasksUrl(){return this.tasksBaseUrl+'/data';},
@ -153,16 +233,63 @@ export default {
canExport(){return !this.loading&&!this.loadError&&!this.invalidDateRange&&!this.filtersDirty&&this.total>0&&(this.exportMode==='filtered-all'||this.visibleColumns.length>0);},
visibleColumns(){return this.configuredColumns.filter(column=>column.visible);},
visibleGroups(){return this.visibleColumns.reduce((groups,column)=>{if(!column.group)return groups;const last=groups[groups.length-1];if(last&&last.label===column.group)last.span+=1;else groups.push({label:column.group,span:1});return groups;},[]);},
stats(){const netLabel=JD_BILL_TABS.concat(['vipshop-jx']).indexOf(this.billType)!==-1;return[{label:'收入合计',value:this.moneyWan(this.summary.income),note:`${this.summary.count} 笔交易`,className:'is-income'},{label:'支出合计',value:this.moneyWan(this.summary.expense),note:'按当前筛选',className:'is-expense'},{label:netLabel?'收支净额':(this.billType==='jd-wallet'?'账户余额合计(最新)':'期末余额(最新)'),value:this.moneyWan(this.summary.balance),note:netLabel?'按当前筛选':(this.billType==='jd-wallet'?'筛选结果中每个店铺账户最新一笔':'最新一条记录'),className:''},{label:'交易笔数',value:this.summary.count,note:'当前筛选结果',className:''}];},
stats(){
const netLabel=JD_BILL_TABS.concat(['vipshop-jx']).indexOf(this.billType)!==-1;
const items=[
{label:'收入合计',value:this.moneyWan(this.summary.income),note:`${this.summary.count} 笔交易`,className:'is-income'},
{label:'支出合计',value:this.moneyWan(this.summary.expense),note:'按当前筛选',className:'is-expense'},
{label:netLabel?'收支净额':(this.billType==='jd-wallet'?'账户余额合计(最新)':'期末余额(最新)'),value:this.moneyWan(this.summary.balance),note:netLabel?'按当前筛选':(this.billType==='jd-wallet'?'筛选结果中每个店铺账户最新一笔':'最新一条记录'),className:''},
{label:'交易笔数',value:this.summary.count,note:'当前筛选结果',className:''},
];
if(this.isPromotionMarketing){
items.push({label:'推广费(营销账户)',value:this.moneyWan(this.promotionExpenseSummary.expense),note:`${this.promotionExpenseSummary.count} 笔支出 · 按当前筛选`,className:'is-expense',action:true});
}
return items;
},
rangeStart(){return this.total===0?0:(this.currentPage-1)*this.perPage+1;},rangeEnd(){return Math.min(this.currentPage*this.perPage,this.total);}
},
mounted(){if(this.usesMirrorOptions)this.fetchFilterOptions();this.fetch();},
methods:{
async fetchFilterOptions(){this.filterOptionsLoading=true;this.filterOptionsError=false;try{const response=await window.axios.get(`${this.apiBase}/filter-options`);const body=response.data||{};this.filterOptions={shops:Array.isArray(body.shops)?body.shops:[],bill_items:Array.isArray(body.bill_items)?body.bill_items:[],ledger_remarks:Array.isArray(body.ledger_remarks)?body.ledger_remarks:[]};}catch(error){this.filterOptionsError=true;}finally{this.filterOptionsLoading=false;}},
async fetch(){const requestId=++this.requestSerial;const requestedFilters={...this.queryFilters};this.loading=true;this.loadError=false;try{const response=await window.axios.get(this.apiBase,{params:{...requestedFilters,sort:this.sort.key,dir:this.sort.dir,limit:this.perPage,page:this.currentPage}});if(requestId!==this.requestSerial)return;const body=response.data||{};this.resultFilters=requestedFilters;this.sync=body.sync||null;this.rows=body.data||[];this.total=body.total||0;this.currentPage=body.current_page||1;this.lastPage=body.last_page||1;this.perPage=body.per_page||this.perPage;this.summary=body.summary||{income:0,expense:0,balance:0,count:0};if(body.columns){this.columnsTitle=body.columns.title||'';this.sourceGroups=body.columns.groups||[];this.sourceColumns=this.attachGroups(body.columns.columns||body.columns||[],this.sourceGroups);}}catch(error){if(requestId!==this.requestSerial)return;this.rows=[];this.total=0;this.sync=null;this.summary={income:0,expense:0,balance:0,count:0};this.loadError=true;}finally{if(requestId===this.requestSerial)this.loading=false;}},
async fetch(){const requestId=++this.requestSerial;const requestedFilters={...this.queryFilters};this.loading=true;this.loadError=false;try{const response=await window.axios.get(this.apiBase,{params:{...requestedFilters,sort:this.sort.key,dir:this.sort.dir,limit:this.perPage,page:this.currentPage}});if(requestId!==this.requestSerial)return;const body=response.data||{};this.resultFilters=requestedFilters;this.sync=body.sync||null;this.rows=body.data||[];this.total=body.total||0;this.currentPage=body.current_page||1;this.lastPage=body.last_page||1;this.perPage=body.per_page||this.perPage;this.summary=body.summary||{income:0,expense:0,balance:0,count:0};if(body.columns){this.columnsTitle=body.columns.title||'';this.sourceGroups=body.columns.groups||[];this.sourceColumns=this.attachGroups(body.columns.columns||body.columns||[],this.sourceGroups);}if(this.isPromotionMarketing)this.fetchPromotionExpenseDetails(requestedFilters);}catch(error){if(requestId!==this.requestSerial)return;this.rows=[];this.total=0;this.sync=null;this.summary={income:0,expense:0,balance:0,count:0};this.loadError=true;}finally{if(requestId===this.requestSerial)this.loading=false;}},
attachGroups(columns,groups){let index=0;return columns.map((column,columnIndex)=>{while(groups[index]&&columnIndex>=groups.slice(0,index+1).reduce((sum,group)=>sum+Number(group.span||0),0))index+=1;return{...column,key:column.field||`column-${columnIndex}`,group:groups[index]?groups[index].label:''};});},
applyFilters(){if(this.invalidDateRange)return;this.queryFilters={...this.filters};this.currentPage=1;return this.fetch();},resetFilters(){this.filters=emptyFilters(this.billType);return this.applyFilters();},changePage(page){this.currentPage=page;this.fetch();this.$nextTick(()=>{if(this.$refs.scroll)this.$refs.scroll.scrollTop=0;});},
openDatePicker(refName){const picker=this.$refs[refName];if(picker&&picker.fp)picker.fp.open();},
async fetchPromotionExpenseDetails(filters=null){
const requestId=++this.promotionRequestSerial;
const requestedFilters={...(filters||this.resultFilters||this.queryFilters)};
this.promotionExpenseLoading=true;
this.promotionExpenseError=false;
this.promotionExpenseMessage='';
try{
const response=await window.axios.get(`${this.apiBase}/promotion-expense-details`,{params:requestedFilters,headers:{Accept:'application/json'}});
if(requestId!==this.promotionRequestSerial)return;
const body=response.data||{};
this.promotionExpenseRows=Array.isArray(body.data)?body.data:[];
this.promotionExpenseSummary={
expense:Number((body.summary||{}).expense||0),
count:Number((body.summary||{}).count||0),
};
this.promotionExpenseMessage=body.message||'';
if(Array.isArray(body.columns)&&body.columns.length){
this.promotionExpenseColumns=body.columns;
}
}catch(error){
if(requestId!==this.promotionRequestSerial)return;
this.promotionExpenseRows=[];
this.promotionExpenseSummary={expense:0,count:0};
this.promotionExpenseError=true;
}finally{
if(requestId===this.promotionRequestSerial)this.promotionExpenseLoading=false;
}
},
openPromotionDetails(){
this.promotionModalOpen=true;
this.fetchPromotionExpenseDetails();
this.$nextTick(()=>{if(this.$refs.promotionModal)this.$refs.promotionModal.focus();});
},
closePromotionDetails(){this.promotionModalOpen=false;},
promotionCellValue(row,column){return this.displayValue(row,column);},
// 选日期不自动查询:日期是一次选两个(开始/结束),中途触发会先按半截条件查全表,很慢。改完点「查询」再生效。
changeDate(field,value){const date=value||'';if(this.filters[field]===date)return;this.filters[field]=date;},
maybeSort(column){if(!this.sortableField(column.field))return;this.sort.dir=this.sort.key===column.field&&this.sort.dir==='desc'?'asc':'desc';this.sort.key=column.field;this.applyFilters();},sortableField(field){return SORTABLE.indexOf(field)!==-1;},sortMark(field){return this.sort.key===field?(this.sort.dir==='asc'?'↑':'↓'):'↕';},
@ -332,3 +459,22 @@ export default {
.account-bill-filter-options{max-width:calc(100vw - 32px)}
.account-bill-filter-options .el-select-dropdown__item{max-width:100%;text-overflow:ellipsis;overflow:hidden}
</style>
<style scoped>
.tw-stats--five{grid-template-columns:repeat(5,minmax(0,1fr))}
.tw-stat--promotion{display:flex;min-height:5.25rem;flex-direction:column}
.tw-promotion-link{margin-top:auto;align-self:flex-end;padding:0;border:0;background:transparent;color:#856632;font:500 .75rem/1.5 inherit;text-decoration:underline;text-underline-offset:2px;cursor:pointer}
.tw-promotion-link:hover{color:#6a5129}
.tw-promotion-link:focus-visible{outline:none;box-shadow:0 0 0 3px rgba(133,102,50,.2);border-radius:.25rem}
.tw-promotion-modal{width:min(980px,100%)}
.tw-promotion-state{display:flex;min-height:8rem;align-items:center;justify-content:center;gap:.75rem;border:1px dashed #d8d2c7;border-radius:.5rem;background:#fbfaf7;color:#595959;text-align:center}
.tw-promotion-state.is-error{border-color:#b80000;background:#fff5f5;color:#b80000}
.tw-promotion-table-wrap{max-height:min(58vh,34rem);overflow:auto;border:1px solid #d8d2c7;border-radius:.5rem}
.tw-promotion-table{min-width:100%}
.tw-promotion-table th{top:0}
.tw-promotion-table td:nth-child(3){max-width:26rem;white-space:normal}
.tw-promotion-total{margin-right:auto;color:#595959;font-size:.75rem}
@container(max-width:1100px){.tw-stats--five{grid-template-columns:repeat(3,minmax(0,1fr))}}
@media(max-width:900px){.tw-stats--five{grid-template-columns:repeat(2,minmax(0,1fr))}.tw-stat--promotion{grid-column:1/-1}}
@media(max-width:520px){.tw-stats--five{grid-template-columns:1fr}.tw-stat--promotion{grid-column:auto}.tw-modal__foot{align-items:stretch;flex-direction:column}.tw-promotion-total{margin-right:0;text-align:left}}
</style>

View File

@ -5,7 +5,7 @@
*
* 店铺收款账户账单(store-receiving-bills)下各 tab:
* - taobao-alipay → 独立实现 TaobaoAlipayBills(经营分析副本共享镜像)
* - taobao-wechat / pinduoduo / jd-wallet / jd-transactions / jingxi / dewu / vipshop / vipshop-jx
* - taobao-wechat / pinduoduo / jd-wallet / jd-transactions / jingxi / dewu / vipshop / vipshop-jx / promotion-marketing
* → 通用实现 AccountBills(表 ec_account_bills,按 bill_type 区分)
* - douyin → AccountBills 展示共享原始账单镜像中的头条放心购渠道
*/
@ -16,8 +16,8 @@ import Vue from 'vue';
import TaobaoAlipayBills from './../../components/business/TaobaoAlipayBills.vue';
import AccountBills from './../../components/business/AccountBills.vue';
const GENERIC_TABS = ['taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx'];
const STORE_RECEIVING_TABS = ['taobao-alipay', 'taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx'];
const GENERIC_TABS = ['taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx', 'promotion-marketing'];
const STORE_RECEIVING_TABS = ['taobao-alipay', 'taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx', 'promotion-marketing'];
function pageContext(pathname = window.location.pathname) {
const parts = (pathname || '').split('/').filter(Boolean);

View File

@ -59,6 +59,8 @@ Route::get('ecommerce-finance/account-bills/type/taobao-wechat/filter-options',
->name('ecommerce-finance.taobao-wechat-account-bills.filter-options');
Route::get('ecommerce-finance/account-bills/type/taobao-wechat/export', [TaobaoWechatAccountBills::class, 'export'])
->name('ecommerce-finance.taobao-wechat-account-bills.export');
Route::get('ecommerce-finance/account-bills/type/{bill_type}/promotion-expense-details', [AccountBills::class, 'promotionExpenseDetails'])
->name('ecommerce-finance.account-bills.promotion-expense-details');
Route::get('ecommerce-finance/account-bills/type/{bill_type}', [AccountBills::class, 'index'])
->name('ecommerce-finance.account-bills.index');
Route::get('ecommerce-finance/account-bills/type/{bill_type}/filter-options', [AccountBills::class, 'filterOptions'])

View File

@ -0,0 +1,61 @@
<?php
namespace Tests\Feature\Business;
use Tests\Feature\FeatureTestCase;
class PromotionMarketingAccountBillsTest extends FeatureTestCase
{
public function test_promotion_marketing_tab_is_next_to_vipshop_jx(): void
{
$pages = collect(config('business_navigation'))
->firstWhere('slug', 'billing-transactions')['pages'];
$tabs = collect($pages)->firstWhere('slug', 'store-receiving-bills')['tabs'];
$slugs = array_column($tabs, 'slug');
$vipshopJxIndex = array_search('vipshop-jx', $slugs, true);
$this->assertNotFalse($vipshopJxIndex);
$this->assertSame('promotion-marketing', $slugs[$vipshopJxIndex + 1] ?? null);
$this->assertSame('推广费(营销账户)', $tabs[$vipshopJxIndex + 1]['title'] ?? null);
$this->loginAs()
->get(route('business.pages.show', [
'section' => 'billing-transactions',
'page' => 'store-receiving-bills',
'tab' => 'promotion-marketing',
]))
->assertOk()
->assertSeeText('推广费(营销账户)');
}
public function test_promotion_marketing_placeholder_keeps_the_detail_contract_stable(): void
{
$this->loginAs()
->getJson(route('ecommerce-finance.account-bills.index', [
'bill_type' => 'promotion-marketing',
]))
->assertOk()
->assertJsonPath('total', 0)
->assertJsonPath('columns.title', '推广费(营销账户)')
->assertJsonPath('columns.columns.0.label', '店铺名称')
->assertJsonPath('columns.columns.1.label', '交易时间')
->assertJsonPath('columns.columns.2.label', '备注')
->assertJsonPath('columns.columns.3.label', '支出金额');
$this->loginAs()
->getJson(route('ecommerce-finance.account-bills.promotion-expense-details', [
'bill_type' => 'promotion-marketing',
'start' => '2026-10-01',
'end' => '2026-10-31',
]))
->assertOk()
->assertJsonPath('total', 0)
->assertJsonPath('summary.expense', 0)
->assertJsonPath('summary.count', 0)
->assertJsonPath('columns.0.field', 'store_name')
->assertJsonPath('columns.1.field', 'occurred_at')
->assertJsonPath('columns.2.field', 'notes')
->assertJsonPath('columns.3.field', 'expense')
->assertJsonPath('message', '推广费数据源尚未配置,接入后将按当前筛选显示店铺明细。');
}
}

View File

@ -30,11 +30,11 @@ class AccountBillsTableTest extends TestCase
$source = file_get_contents(__DIR__ . '/../../../resources/assets/js/views/business/pages.js');
$this->assertStringContainsString(
"const GENERIC_TABS = ['taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx'];",
"const GENERIC_TABS = ['taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx', 'promotion-marketing'];",
$source,
);
$this->assertStringContainsString(
"const STORE_RECEIVING_TABS = ['taobao-alipay', 'taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx'];",
"const STORE_RECEIVING_TABS = ['taobao-alipay', 'taobao-wechat', 'pinduoduo', 'jd-wallet', 'jd-transactions', 'jingxi', 'douyin', 'dewu', 'vipshop', 'vipshop-jx', 'promotion-marketing'];",
$source,
);
}
@ -46,9 +46,24 @@ 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);
// 唯品会两个页签的筛选标签是「账单期间」(后端也只按 payload.settle_period 过滤)。
$this->assertStringContainsString("const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'账单期间','vipshop-jx':'账单期间'};", $source);
$this->assertStringContainsString("const DATE_FILTER_LABELS = {'jd-transactions':'费用结算时间','jingxi':'费用结算时间','jd-wallet':'费用结算时间','douyin':'结算时间','vipshop':'账单期间','vipshop-jx':'账单期间','promotion-marketing':'交易时间'};", $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);
}
public function test_promotion_marketing_card_opens_the_store_detail_modal(): void
{
$source = file_get_contents(__DIR__ . '/../../../resources/assets/js/components/business/AccountBills.vue');
$this->assertStringContainsString('推广费(营销账户)', $source);
$this->assertStringContainsString("label:'推广费(营销账户)'", $source);
$this->assertStringContainsString('查看明细 →', $source);
$this->assertStringContainsString('aria-labelledby="promotion-expense-detail-title"', $source);
$this->assertStringContainsString('<strong id="promotion-expense-detail-title">店铺明细</strong>', $source);
$this->assertStringContainsString("label:'店铺名称',field:'store_name'", $source);
$this->assertStringContainsString("label:'交易时间',field:'occurred_at'", $source);
$this->assertStringContainsString("label:'备注',field:'notes'", $source);
$this->assertStringContainsString("label:'支出金额',field:'expense'", $source);
}
}