refactor: 重构代码减少重复并添加分页
后端 (records.js): - 提取通用分页查询函数 queryPagedRecords - 5个列表接口 (orders/other-income/red-envelope/milk-tea/dispatches) 复用同一函数 后端 (stats.js): - 为 monthly-records, boss-records, partner-records, daily-detail 添加分页支持 - 新增 page, limit, totalCount 返回字段 前端 (order-list.js): - 提取通用列表配置 listConfig - 统一渲染函数 renderOrderItem/renderOtherIncomeItem 等 - 大幅减少代码重复 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 4.6
parent
a03e92d437
commit
2ebac98f07
+97
-263
@@ -1,20 +1,38 @@
|
||||
let orderPage = 1;
|
||||
let orderHasMore = true;
|
||||
let orderLoading = false;
|
||||
// 全局状态变量(供 app.js 引用)
|
||||
var orderPage = 1, orderHasMore = true, orderLoading = false;
|
||||
var otherIncomePage = 1, otherIncomeHasMore = true, otherIncomeLoading = false;
|
||||
var dispatchPage = 1, dispatchHasMore = true, dispatchLoading = false;
|
||||
var redEnvelopePage = 1, redEnvelopeHasMore = true, redEnvelopeLoading = false;
|
||||
var milkTeaPage = 1, milkTeaHasMore = true, milkTeaLoading = false;
|
||||
|
||||
// 通用分页状态管理
|
||||
const listConfig = {
|
||||
orderList: { getPage: () => orderPage, setPage: (v) => orderPage = v, getHasMore: () => orderHasMore, setHasMore: (v) => orderHasMore = v, getLoading: () => orderLoading, setLoading: (v) => orderLoading = v, emptyMsg: '暂无接单记录', endpoint: '/api/records/orders', renderItem: renderOrderItem },
|
||||
otherIncomeList: { getPage: () => otherIncomePage, setPage: (v) => otherIncomePage = v, getHasMore: () => otherIncomeHasMore, setHasMore: (v) => otherIncomeHasMore = v, getLoading: () => otherIncomeLoading, setLoading: (v) => otherIncomeLoading = v, emptyMsg: '暂无红包及其他收入记录', endpoint: '/api/records/other-income', renderItem: renderOtherIncomeItem },
|
||||
dispatchList: { getPage: () => dispatchPage, setPage: (v) => dispatchPage = v, getHasMore: () => dispatchHasMore, setHasMore: (v) => dispatchHasMore = v, getLoading: () => dispatchLoading, setLoading: (v) => dispatchLoading = v, emptyMsg: '暂无派单记录', endpoint: '/api/records/dispatches', renderItem: renderDispatchItem },
|
||||
redEnvelopeList: { getPage: () => redEnvelopePage, setPage: (v) => redEnvelopePage = v, getHasMore: () => redEnvelopeHasMore, setHasMore: (v) => redEnvelopeHasMore = v, getLoading: () => redEnvelopeLoading, setLoading: (v) => redEnvelopeLoading = v, emptyMsg: '暂无红包收入记录', endpoint: '/api/records/red-envelope', renderItem: renderRedEnvelopeItem },
|
||||
milkTeaList: { getPage: () => milkTeaPage, setPage: (v) => milkTeaPage = v, getHasMore: () => milkTeaHasMore, setHasMore: (v) => milkTeaHasMore = v, getLoading: () => milkTeaLoading, setLoading: (v) => milkTeaLoading = v, emptyMsg: '暂无奶茶收入记录', endpoint: '/api/records/milk-tea', renderItem: renderMilkTeaItem }
|
||||
};
|
||||
|
||||
// 通用列表加载函数
|
||||
async function loadList(listId, append) {
|
||||
const config = listConfig[listId];
|
||||
if (!config) return;
|
||||
|
||||
if (config.getLoading() || (!append && !config.getHasMore())) return;
|
||||
config.setLoading(true);
|
||||
document.getElementById(listId.replace('List', 'Loading')).style.display = 'block';
|
||||
|
||||
async function loadOrders(append) {
|
||||
if (orderLoading || (!append && !orderHasMore)) return;
|
||||
orderLoading = true;
|
||||
document.getElementById('orderLoading').style.display = 'block';
|
||||
try {
|
||||
const res = await fetch(API + '/api/records/orders?page=' + orderPage + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
const res = await fetch(API + config.endpoint + '?page=' + config.getPage() + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
const container = document.getElementById('orderList');
|
||||
const container = document.getElementById(listId);
|
||||
if (!append) container.innerHTML = '';
|
||||
|
||||
if (data.records.length === 0) {
|
||||
if (orderPage === 1) container.innerHTML = '<div class="ranking-empty">暂无接单记录</div>';
|
||||
orderHasMore = false;
|
||||
if (config.getPage() === 1) container.innerHTML = '<div class="ranking-empty">' + config.emptyMsg + '</div>';
|
||||
config.setHasMore(false);
|
||||
} else {
|
||||
const grouped = {};
|
||||
data.records.forEach(r => {
|
||||
@@ -22,272 +40,88 @@ async function loadOrders(append) {
|
||||
if (!grouped[date]) grouped[date] = [];
|
||||
grouped[date].push(r);
|
||||
});
|
||||
|
||||
let html = '';
|
||||
for (const [date, records] of Object.entries(grouped)) {
|
||||
html += `<div class="order-date-group" data-date="${date}">
|
||||
<div class="order-date-label">${date}</div>`;
|
||||
html += '<div class="order-date-group" data-date="' + date + '"><div class="order-date-label">' + date + '</div>';
|
||||
records.forEach(r => {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
html += `<div class="order-item" onclick='openEditModal(${JSON.stringify(r).replace(/'/g, "'")})'>
|
||||
<div class="order-item-top">
|
||||
<span class="order-item-boss">${r.boss || '-'}</span>
|
||||
<span class="order-item-amount">${(r.amount || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="order-item-bottom">
|
||||
<span>${r.quantity || 0}单 × ${(r.unit_price || 0).toFixed(2)}</span>
|
||||
<span>${time}${r.partner ? ' · ' + r.partner : ''}</span>
|
||||
</div>
|
||||
</div>`;
|
||||
html += config.renderItem(r);
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
orderHasMore = data.records.length >= 20;
|
||||
orderPage++;
|
||||
config.setHasMore(data.records.length >= 20);
|
||||
config.setPage(config.getPage() + 1);
|
||||
}
|
||||
} catch (e) { console.error(e); }
|
||||
orderLoading = false;
|
||||
document.getElementById('orderLoading').style.display = 'none';
|
||||
|
||||
config.setLoading(false);
|
||||
document.getElementById(listId.replace('List', 'Loading')).style.display = 'none';
|
||||
}
|
||||
|
||||
// 通用渲染函数
|
||||
function renderOrderItem(r) {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
return '<div class="order-item" onclick=\'openEditModal(' + JSON.stringify(r).replace(/'/g, "'") + ')\'>' +
|
||||
'<div class="order-item-top"><span class="order-item-boss">' + (r.boss || '-') + '</span><span class="order-item-amount">' + (r.amount || 0).toFixed(2) + '</span></div>' +
|
||||
'<div class="order-item-bottom"><span>' + (r.quantity || 0) + '单 × ' + (r.unit_price || 0).toFixed(2) + '</span><span>' + time + (r.partner ? ' · ' + r.partner : '') + '</span></div></div>';
|
||||
}
|
||||
|
||||
function renderOtherIncomeItem(r) {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
const displayCategory = r.category === '红包收入' ? '红包' : (r.category || '-');
|
||||
return '<div class="order-item" onclick=\'openEditModal(' + JSON.stringify(r).replace(/'/g, "'") + ')\'>' +
|
||||
'<div class="order-item-top"><span class="order-item-boss">' + displayCategory + (r.boss ? ' · ' + r.boss : '') + '</span><span class="order-item-amount">' + (r.amount || 0).toFixed(2) + '</span></div>' +
|
||||
'<div class="order-item-bottom"><span>' + (r.source || '') + '</span><span>' + time + '</span></div></div>';
|
||||
}
|
||||
|
||||
function renderDispatchItem(r) {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
return '<div class="order-item" onclick=\'openEditModal(' + JSON.stringify(r).replace(/'/g, "'") + ')\'>' +
|
||||
'<div class="order-item-top"><span class="order-item-boss">' + (r.boss || '-') + '</span><span class="order-item-amount">' + (r.amount || 0).toFixed(2) + '</span></div>' +
|
||||
'<div class="order-item-bottom"><span>' + (r.quantity || 0) + '单 × ' + ((r.rebate || r.amount / r.quantity) || 0).toFixed(2) + '(单价' + (r.unit_price || 0).toFixed(2) + ')</span><span>' + time + (r.partner ? ' · ' + r.partner : '') + '</span></div></div>';
|
||||
}
|
||||
|
||||
function renderRedEnvelopeItem(r) {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
return '<div class="order-item" onclick=\'openEditModal(' + JSON.stringify(r).replace(/'/g, "'") + ')\'>' +
|
||||
'<div class="order-item-top"><span class="order-item-boss">红包</span><span class="order-item-amount">' + (r.amount || 0).toFixed(2) + '</span></div>' +
|
||||
'<div class="order-item-bottom"><span>' + (r.source || '') + '</span><span>' + time + '</span></div></div>';
|
||||
}
|
||||
|
||||
function renderMilkTeaItem(r) {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
return '<div class="order-item" onclick=\'openEditModal(' + JSON.stringify(r).replace(/'/g, "'") + ')\'>' +
|
||||
'<div class="order-item-top"><span class="order-item-boss">奶茶</span><span class="order-item-amount">' + (r.amount || 0).toFixed(2) + '</span></div>' +
|
||||
'<div class="order-item-bottom"><span>' + (r.source || '') + '</span><span>' + time + '</span></div></div>';
|
||||
}
|
||||
|
||||
// 滚动加载
|
||||
window.addEventListener('scroll', () => {
|
||||
if (document.getElementById('orderListPage').classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
if (orderHasMore && !orderLoading) loadOrders(true);
|
||||
}
|
||||
}
|
||||
if (document.getElementById('dispatchListPage').classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
if (dispatchHasMore && !dispatchLoading) loadDispatches(true);
|
||||
}
|
||||
}
|
||||
if (document.getElementById('otherIncomeListPage').classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
if (otherIncomeHasMore && !otherIncomeLoading) loadOtherIncome(true);
|
||||
}
|
||||
}
|
||||
if (document.getElementById('redEnvelopeListPage').classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
if (redEnvelopeHasMore && !redEnvelopeLoading) loadRedEnvelope(true);
|
||||
}
|
||||
}
|
||||
if (document.getElementById('milkTeaListPage').classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
if (milkTeaHasMore && !milkTeaLoading) loadMilkTea(true);
|
||||
const pageListMap = [
|
||||
{ page: 'orderListPage', list: 'orderList' },
|
||||
{ page: 'dispatchListPage', list: 'dispatchList' },
|
||||
{ page: 'otherIncomeListPage', list: 'otherIncomeList' },
|
||||
{ page: 'redEnvelopeListPage', list: 'redEnvelopeList' },
|
||||
{ page: 'milkTeaListPage', list: 'milkTeaList' }
|
||||
];
|
||||
|
||||
for (const m of pageListMap) {
|
||||
if (document.getElementById(m.page).classList.contains('active')) {
|
||||
if (window.innerHeight + window.scrollY >= document.body.offsetHeight - 100) {
|
||||
const config = listConfig[m.list];
|
||||
if (config && config.getHasMore() && !config.getLoading()) {
|
||||
loadList(m.list, true);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 红包及其他收入列表
|
||||
let otherIncomePage = 1;
|
||||
let otherIncomeHasMore = true;
|
||||
let otherIncomeLoading = false;
|
||||
|
||||
async function loadOtherIncome(append) {
|
||||
if (otherIncomeLoading || (!append && !otherIncomeHasMore)) return;
|
||||
otherIncomeLoading = true;
|
||||
document.getElementById('otherIncomeLoading').style.display = 'block';
|
||||
try {
|
||||
const res = await fetch(API + '/api/records/other-income?page=' + otherIncomePage + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
const container = document.getElementById('otherIncomeList');
|
||||
if (!append) container.innerHTML = '';
|
||||
if (data.records.length === 0) {
|
||||
if (otherIncomePage === 1) container.innerHTML = '<div class="ranking-empty">暂无红包及其他收入记录</div>';
|
||||
otherIncomeHasMore = false;
|
||||
} else {
|
||||
const grouped = {};
|
||||
data.records.forEach(r => {
|
||||
const date = formatLocalDate(r.created_at);
|
||||
if (!grouped[date]) grouped[date] = [];
|
||||
grouped[date].push(r);
|
||||
});
|
||||
let html = '';
|
||||
for (const [date, records] of Object.entries(grouped)) {
|
||||
html += `<div class="order-date-group" data-date="${date}">
|
||||
<div class="order-date-label">${date}</div>`;
|
||||
records.forEach(r => {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
const displayCategory = r.category === '红包收入' ? '红包' : (r.category || '-');
|
||||
html += `<div class="order-item" onclick='openEditModal(${JSON.stringify(r).replace(/'/g, "'")})'>
|
||||
<div class="order-item-top">
|
||||
<span class="order-item-boss">${displayCategory}${r.boss ? ' · ' + r.boss : ''}</span>
|
||||
<span class="order-item-amount">${(r.amount || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="order-item-bottom">
|
||||
<span>${r.source || ''}</span>
|
||||
<span>${time}</span>
|
||||
</div>
|
||||
</div>`;
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
otherIncomeHasMore = data.records.length >= 20;
|
||||
otherIncomePage++;
|
||||
}
|
||||
} catch (e) { console.error(e); }
|
||||
otherIncomeLoading = false;
|
||||
document.getElementById('otherIncomeLoading').style.display = 'none';
|
||||
}
|
||||
|
||||
// 派单列表
|
||||
let dispatchPage = 1;
|
||||
let dispatchHasMore = true;
|
||||
let dispatchLoading = false;
|
||||
|
||||
async function loadDispatches(append) {
|
||||
if (dispatchLoading || (!append && !dispatchHasMore)) return;
|
||||
dispatchLoading = true;
|
||||
document.getElementById('dispatchLoading').style.display = 'block';
|
||||
try {
|
||||
const res = await fetch(API + '/api/records/dispatches?page=' + dispatchPage + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
const container = document.getElementById('dispatchList');
|
||||
if (!append) container.innerHTML = '';
|
||||
if (data.records.length === 0) {
|
||||
if (dispatchPage === 1) container.innerHTML = '<div class="ranking-empty">暂无派单记录</div>';
|
||||
dispatchHasMore = false;
|
||||
} else {
|
||||
const grouped = {};
|
||||
data.records.forEach(r => {
|
||||
const date = formatLocalDate(r.created_at);
|
||||
if (!grouped[date]) grouped[date] = [];
|
||||
grouped[date].push(r);
|
||||
});
|
||||
let html = '';
|
||||
for (const [date, records] of Object.entries(grouped)) {
|
||||
html += `<div class="order-date-group" data-date="${date}">
|
||||
<div class="order-date-label">${date}</div>`;
|
||||
records.forEach(r => {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
html += `<div class="order-item" onclick='openEditModal(${JSON.stringify(r).replace(/'/g, "'")})'>
|
||||
<div class="order-item-top">
|
||||
<span class="order-item-boss">${r.boss || '-'}</span>
|
||||
<span class="order-item-amount">${(r.amount || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="order-item-bottom">
|
||||
<span>${r.quantity || 0}单 × ${(r.rebate || r.amount / r.quantity).toFixed(2)}(单价${(r.unit_price || 0).toFixed(2)})</span>
|
||||
<span>${time}${r.partner ? ' · ' + r.partner : ''}</span>
|
||||
</div>
|
||||
</div>`;
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
dispatchHasMore = data.records.length >= 20;
|
||||
dispatchPage++;
|
||||
}
|
||||
} catch (e) { console.error(e); }
|
||||
dispatchLoading = false;
|
||||
document.getElementById('dispatchLoading').style.display = 'none';
|
||||
}
|
||||
|
||||
// 红包收入列表
|
||||
let redEnvelopePage = 1;
|
||||
let redEnvelopeHasMore = true;
|
||||
let redEnvelopeLoading = false;
|
||||
|
||||
async function loadRedEnvelope(append) {
|
||||
if (redEnvelopeLoading || (!append && !redEnvelopeHasMore)) return;
|
||||
redEnvelopeLoading = true;
|
||||
document.getElementById('redEnvelopeLoading').style.display = 'block';
|
||||
try {
|
||||
const res = await fetch(API + '/api/records/red-envelope?page=' + redEnvelopePage + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
const container = document.getElementById('redEnvelopeList');
|
||||
if (!append) container.innerHTML = '';
|
||||
if (data.records.length === 0) {
|
||||
if (redEnvelopePage === 1) container.innerHTML = '<div class="ranking-empty">暂无红包收入记录</div>';
|
||||
redEnvelopeHasMore = false;
|
||||
} else {
|
||||
const grouped = {};
|
||||
data.records.forEach(r => {
|
||||
const date = formatLocalDate(r.created_at);
|
||||
if (!grouped[date]) grouped[date] = [];
|
||||
grouped[date].push(r);
|
||||
});
|
||||
let html = '';
|
||||
for (const [date, records] of Object.entries(grouped)) {
|
||||
html += `<div class="order-date-group" data-date="${date}">
|
||||
<div class="order-date-label">${date}</div>`;
|
||||
records.forEach(r => {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
html += `<div class="order-item" onclick='openEditModal(${JSON.stringify(r).replace(/'/g, "'")})'>
|
||||
<div class="order-item-top">
|
||||
<span class="order-item-boss">红包</span>
|
||||
<span class="order-item-amount">${(r.amount || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="order-item-bottom">
|
||||
<span>${r.source || ''}</span>
|
||||
<span>${time}</span>
|
||||
</div>
|
||||
</div>`;
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
redEnvelopeHasMore = data.records.length >= 20;
|
||||
redEnvelopePage++;
|
||||
}
|
||||
} catch (e) { console.error(e); }
|
||||
redEnvelopeLoading = false;
|
||||
document.getElementById('redEnvelopeLoading').style.display = 'none';
|
||||
}
|
||||
|
||||
// 奶茶收入列表
|
||||
let milkTeaPage = 1;
|
||||
let milkTeaHasMore = true;
|
||||
let milkTeaLoading = false;
|
||||
|
||||
async function loadMilkTea(append) {
|
||||
if (milkTeaLoading || (!append && !milkTeaHasMore)) return;
|
||||
milkTeaLoading = true;
|
||||
document.getElementById('milkTeaLoading').style.display = 'block';
|
||||
try {
|
||||
const res = await fetch(API + '/api/records/milk-tea?page=' + milkTeaPage + '&limit=20&year=' + currentYear + '&month=' + currentMonth, { headers: headers() });
|
||||
if (!res.ok) return;
|
||||
const data = await res.json();
|
||||
const container = document.getElementById('milkTeaList');
|
||||
if (!append) container.innerHTML = '';
|
||||
if (data.records.length === 0) {
|
||||
if (milkTeaPage === 1) container.innerHTML = '<div class="ranking-empty">暂无奶茶收入记录</div>';
|
||||
milkTeaHasMore = false;
|
||||
} else {
|
||||
const grouped = {};
|
||||
data.records.forEach(r => {
|
||||
const date = formatLocalDate(r.created_at);
|
||||
if (!grouped[date]) grouped[date] = [];
|
||||
grouped[date].push(r);
|
||||
});
|
||||
let html = '';
|
||||
for (const [date, records] of Object.entries(grouped)) {
|
||||
html += `<div class="order-date-group" data-date="${date}">
|
||||
<div class="order-date-label">${date}</div>`;
|
||||
records.forEach(r => {
|
||||
const time = formatLocalTime(r.created_at);
|
||||
html += `<div class="order-item" onclick='openEditModal(${JSON.stringify(r).replace(/'/g, "'")})'>
|
||||
<div class="order-item-top">
|
||||
<span class="order-item-boss">奶茶</span>
|
||||
<span class="order-item-amount">${(r.amount || 0).toFixed(2)}</span>
|
||||
</div>
|
||||
<div class="order-item-bottom">
|
||||
<span>${r.source || ''}</span>
|
||||
<span>${time}</span>
|
||||
</div>
|
||||
</div>`;
|
||||
});
|
||||
html += '</div>';
|
||||
}
|
||||
container.insertAdjacentHTML('beforeend', html);
|
||||
milkTeaHasMore = data.records.length >= 20;
|
||||
milkTeaPage++;
|
||||
}
|
||||
} catch (e) { console.error(e); }
|
||||
milkTeaLoading = false;
|
||||
document.getElementById('milkTeaLoading').style.display = 'none';
|
||||
}
|
||||
// 兼容旧接口
|
||||
async function loadOrders(append) { return loadList('orderList', append); }
|
||||
async function loadOtherIncome(append) { return loadList('otherIncomeList', append); }
|
||||
async function loadDispatches(append) { return loadList('dispatchList', append); }
|
||||
async function loadRedEnvelope(append) { return loadList('redEnvelopeList', append); }
|
||||
async function loadMilkTea(append) { return loadList('milkTeaList', append); }
|
||||
|
||||
Reference in New Issue
Block a user