Browse Source

优化供应商入驻时间显示逻辑,删除调试信息

Boss
Default User 4 weeks ago
parent
commit
8f7c674222
  1. 9
      Reject.js
  2. 35
      SupplierReview.html

9
Reject.js

@ -1885,16 +1885,19 @@ app.get('/api/suppliers', async (req, res) => {
const offset = (page - 1) * pageSize; const offset = (page - 1) * pageSize;
params.push(parseInt(pageSize), offset); params.push(parseInt(pageSize), offset);
// 查询供应商列表,按创建时间倒序排序,确保最新创建的在前面 // 查询供应商列表,优先按入驻时间倒序排序,没有入驻时间则使用创建时间
const [suppliers] = await connection.query( const [suppliers] = await connection.query(
`SELECT userId, phoneNumber, province, city, district, detailedaddress, company, collaborationid, cooperation, businesslicenseurl, proofurl, brandurl, partnerstatus, reasonforfailure, reject_reason, terminate_reason, audit_time, created_at, liaison, seller_followup `SELECT userId, phoneNumber, province, city, district, detailedaddress, company, collaborationid, cooperation, businesslicenseurl, proofurl, brandurl, partnerstatus, reasonforfailure, reject_reason, terminate_reason, audit_time, created_at, newtime, liaison, seller_followup
FROM users${whereClause} FROM users${whereClause}
ORDER BY created_at DESC LIMIT ? OFFSET ?`, ORDER BY COALESCE(newtime, created_at) DESC LIMIT ? OFFSET ?`,
params params
); );
connection.release(); connection.release();
// 调试:打印前几个供应商数据,检查newtime字段
console.log('返回的供应商数据示例:', suppliers.slice(0, 3));
sendResponse(res, true, { sendResponse(res, true, {
list: suppliers, list: suppliers,
total, total,

35
SupplierReview.html

@ -2245,6 +2245,12 @@
let data; let data;
try { try {
data = await response.json(); data = await response.json();
// 调试:打印返回的数据结构
console.log('后端返回的数据结构:', data);
// 调试:打印前几个供应商数据
if (data.list && data.list.length > 0) {
console.log('前端接收到的供应商数据示例:', data.list.slice(0, 3));
}
} catch (parseError) { } catch (parseError) {
throw new Error('返回数据格式错误'); throw new Error('返回数据格式错误');
} }
@ -2288,14 +2294,17 @@
// 更新统计卡片数据 // 更新统计卡片数据
updateStatistics(suppliersList); updateStatistics(suppliersList);
// 对供应商列表进行排序,按照创建时间倒序排列(最新的在前) // 对供应商列表进行排序,优先按照入驻时间倒序排列,没有入驻时间则使用创建时间(最新的在前)
suppliersList.sort((a, b) => { suppliersList.sort((a, b) => {
// 获取创建时间,支持多种可能的字段名称 // 获取入驻时间,直接使用后端返回的newtime字段
const aCreatedAt = a.created_at || a.create_time || a.createdAt || new Date().toISOString(); const aNewTime = a.newtime || a.created_at || a.create_time || a.createdAt || new Date().toISOString();
const bCreatedAt = b.created_at || b.create_time || b.createdAt || new Date().toISOString(); const bNewTime = b.newtime || b.created_at || b.create_time || b.createdAt || new Date().toISOString();
console.log('排序调试 - 供应商A:', { id: a.userId || a.id, newtime: a.newtime, createdAt: a.created_at, sortTime: aNewTime });
console.log('排序调试 - 供应商B:', { id: b.userId || b.id, newtime: b.newtime, createdAt: b.created_at, sortTime: bNewTime });
// 转换为时间戳并比较,降序排列 // 转换为时间戳并比较,降序排列
return new Date(bCreatedAt).getTime() - new Date(aCreatedAt).getTime(); return new Date(bNewTime).getTime() - new Date(aNewTime).getTime();
}); });
// 渲染数据 // 渲染数据
@ -2368,6 +2377,8 @@
// 状态 // 状态
const status = supplier.partnerstatus || supplier.status || 'underreview'; const status = supplier.partnerstatus || supplier.status || 'underreview';
const createdAt = supplier.created_at || supplier.create_time || new Date().toISOString(); const createdAt = supplier.created_at || supplier.create_time || new Date().toISOString();
// 优先使用newtime字段,如果存在的话
const newTime = supplier.newtime ? supplier.newtime : createdAt;
const rejectReason = supplier.rejectReason || supplier.reject_reason || supplier.reason || ''; const rejectReason = supplier.rejectReason || supplier.reject_reason || supplier.reason || '';
const auditTime = supplier.audit_time || createdAt; const auditTime = supplier.audit_time || createdAt;
@ -2425,8 +2436,8 @@
<div class="info-value">${liaison}</div> <div class="info-value">${liaison}</div>
</div> </div>
<div class="info-item"> <div class="info-item">
<div class="info-label">创建时间</div> <div class="info-label">入驻时间</div>
<div class="info-value">${formatTime(createdAt)}</div> <div class="info-value">${formatTime(newTime)}</div>
<br> <br>
<div class="info-label">ID</div> <div class="info-label">ID</div>
<div class="info-value">${id}</div> <div class="info-value">${id}</div>
@ -2474,16 +2485,6 @@
<div class="audit-time"> <div class="audit-time">
审核时间:${formatTime(auditTime)} 审核时间:${formatTime(auditTime)}
</div> </div>
` : canCooperate ? `
<button class="btn btn-default" data-id="${id}">
跟进
</button>
<button class="btn btn-primary" data-id="${id}">
开始合作
</button>
<div class="audit-time">
审核时间:${formatTime(auditTime)}
</div>
` : ` ` : `
<button class="btn btn-default" data-id="${id}"> <button class="btn btn-default" data-id="${id}">
跟进 跟进

Loading…
Cancel
Save