XingQue/xingque
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

本地备份：主包优化前完整版本，可随时回退

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
XingQue
2026-06-27 05:41:55 +08:00
parent a751708d6e
commit 7f4f279b3f
124 changed files with 15837 additions and 21958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

434
pages/merchant-orders/merchant-orders.js
View File

@@ -3,17 +3,36 @@ const app = getApp();
import { createPage, request } from '../../utils/base-page.js';
import { reconnectForRole } from '../../utils/role-tab-bar.js';
import { getOrderStatusText } from '../../utils/api-helper.js';
import { STAFF_API, isStaffMode, refreshStaffContext, syncStaffUi } from '../../utils/staff-api.js';
import { ensurePhoneAuth } from '../../utils/phone-auth.js';
import { normalizeOrderTags } from '../../utils/order-tags.js';
import { ICON_KEYS, resolveMiniappIcon, MERCHANT_GOLD_BANNER_FALLBACK } from '../../utils/miniapp-icons.js';
import { fetchMerchantOrderStats } from '../../utils/merchant-order-stats.js';
const EMPTY_TAB = { list: [], page: 1, hasMore: true, isLoading: false };
function buildEmptyStatusData() {
return {
all: { ...EMPTY_TAB },
jinxingzhong: { ...EMPTY_TAB },
tuikuanzhong: { ...EMPTY_TAB },
yituikuan: { ...EMPTY_TAB },
tuikuanshibai: { ...EMPTY_TAB },
yiwancheng: { ...EMPTY_TAB },
jiesuanzhong: { ...EMPTY_TAB },
};
}
Page(createPage({
data: {
// 商品类型（和打手端用同一个接口）
shangpinleixing: [],
xuanzhongLeixingId: null,
// 搜索关键字（模糊搜索）
searchKeyword: '',
// 状态列表（含全部）
timeStart: '',
timeEnd: '',
statusList: [
{ name: '全部', key: 'all', zhuangtaiList: [1, 2, 3, 4, 5, 6, 7, 8], color: '#333333' },
{ name: '进行中', key: 'jinxingzhong', zhuangtaiList: [2], color: '#2196F3' },
@@ -21,75 +40,210 @@ Page(createPage({
{ name: '已退款', key: 'yituikuan', zhuangtaiList: [5], color: '#9E9E9E' },
{ name: '退款失败', key: 'tuikuanshibai', zhuangtaiList: [6], color: '#F44336' },
{ name: '已完成', key: 'yiwancheng', zhuangtaiList: [3], color: '#4CAF50' },
{ name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' }
{ name: '结算中', key: 'jiesuanzhong', zhuangtaiList: [8], color: '#FF5722' },
],
currentStatusKey: 'all',
// 每个状态独立的数据集
sjDingdanShuju: {
all: { list: [], page: 1, hasMore: true, isLoading: false },
jinxingzhong: { list: [], page: 1, hasMore: true, isLoading: false },
tuikuanzhong: { list: [], page: 1, hasMore: true, isLoading: false },
yituikuan: { list: [], page: 1, hasMore: true, isLoading: false },
tuikuanshibai: { list: [], page: 1, hasMore: true, isLoading: false },
yiwancheng: { list: [], page: 1, hasMore: true, isLoading: false },
jiesuanzhong: { list: [], page: 1, hasMore: true, isLoading: false }
},
sjDingdanShuju: buildEmptyStatusData(),
currentList: [],
hasMore: true,
isLoading: false,
isLoadingMore: false,
scrollViewRefreshing: false,
listScrollTop: 0,
defaultImg: '/images/default-order.png',
ossImageUrl: app.globalData.ossImageUrl || '',
// 待结算数量
pendingCount: 0,
goldBannerUrl: '',
staffList: [],
selectedStaffMemberId: '',
selectedStaffLabel: '全部客服',
canViewFinance: true,
orderStats: {
pending_count: 0,
pending_amount: '0.00',
completed_count: 0,
completed_amount: '0.00',
refund_count: 0,
refund_amount: '0.00',
dispatch_count: 0,
dispatch_amount: '0.00',
},
},
onLoad() {
wx.setNavigationBarTitle({ title: '我的派单' });
onLoad(options) {
this._listInitialized = false;
this._savedScrollTop = 0;
this._skipShowRefresh = false;
this.setData({
goldBannerUrl: resolveMiniappIcon(app, ICON_KEYS.MERCHANT_GOLD_BANNER, MERCHANT_GOLD_BANNER_FALLBACK),
});
wx.setNavigationBarTitle({ title: isStaffMode() ? '客服派单' : '我的派单' });
syncStaffUi(this);
if (isStaffMode()) {
refreshStaffContext(request).then(() => syncStaffUi(this));
}
this.loadShangpinLeixing();
this.registerNotificationComponent();
if (options && options.staff_member_id) {
this.setData({
selectedStaffMemberId: String(options.staff_member_id),
selectedStaffLabel: options.staff_label || '指定客服',
});
}
if (!isStaffMode()) {
this.loadStaffList();
}
},
onShow() {
async onShow() {
const phoneOk = await ensurePhoneAuth({ redirect: true, role: 'shangjia' });
if (!phoneOk) return;
this.registerNotificationComponent();
this.loadPendingCount();
this.loadOrderStats();
if (wx.getStorageSync('uid')) {
reconnectForRole('shangjia');
if (app.startImWhenReady) app.startImWhenReady();
}
if (this.data.currentStatusKey && this.data.xuanzhongLeixingId) {
this.loadCurrentStatusOrders(true);
if (this._skipShowRefresh) {
this._skipShowRefresh = false;
this.restoreListScroll();
return;
}
// 从详情返回：保持列表与滚动位置，不整页重载
if (this._listInitialized) {
this.restoreListScroll();
return;
}
},
restoreListScroll() {
const top = this._savedScrollTop || 0;
if (top <= 0) return;
this.setData({ listScrollTop: 0 });
wx.nextTick(() => {
this.setData({ listScrollTop: top });
});
},
onListScroll(e) {
this._savedScrollTop = e.detail.scrollTop || 0;
},
buildListParams(key, page) {
const statusItem = this.data.statusList.find((s) => s.key === key);
const params = {
zhuangtai_list: statusItem.zhuangtaiList,
page,
page_size: 5,
leixing_id: this.data.xuanzhongLeixingId,
keyword: this.data.searchKeyword || undefined,
};
const { timeStart, timeEnd } = this.data;
if (timeStart) params.start_time = `${timeStart} 00:00:00`;
if (timeEnd) params.end_time = `${timeEnd} 23:59:59`;
if (this.data.selectedStaffMemberId) {
params.staff_member_id = this.data.selectedStaffMemberId;
}
return params;
},
async loadStaffList() {
try {
const res = await request({ url: STAFF_API.memberList, method: 'POST' });
if (res.data && res.data.code === 0) {
const list = (res.data.data && res.data.data.list) || [];
this.setData({ staffList: list });
}
} catch (e) {
/* 非老板无权限时静默 */
}
},
onStaffFilterChange(e) {
const idx = Number(e.detail.value);
const list = this.data.staffList || [];
const row = list[idx];
if (!row) return;
this._savedScrollTop = 0;
this.setData({
selectedStaffMemberId: String(row.id),
selectedStaffLabel: row.nickname || row.uid,
listScrollTop: 0,
});
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
clearStaffFilter() {
this._savedScrollTop = 0;
this.setData({
selectedStaffMemberId: '',
selectedStaffLabel: '全部客服',
listScrollTop: 0,
});
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
async loadOrderStats() {
try {
const params = {};
const { timeStart, timeEnd, selectedStaffMemberId, xuanzhongLeixingId } = this.data;
if (timeStart) params.start_time = `${timeStart} 00:00:00`;
if (timeEnd) params.end_time = `${timeEnd} 23:59:59`;
if (selectedStaffMemberId) params.staff_member_id = selectedStaffMemberId;
if (xuanzhongLeixingId) params.leixing_id = xuanzhongLeixingId;
const data = await fetchMerchantOrderStats(request, params);
const order = data.order || {};
this.setData({
orderStats: {
pending_count: order.pending_count || 0,
pending_amount: order.pending_amount || '0.00',
completed_count: order.completed_count || 0,
completed_amount: order.completed_amount || '0.00',
refund_count: order.refund_count || 0,
refund_amount: order.refund_amount || '0.00',
dispatch_count: order.dispatch_count || 0,
dispatch_amount: order.dispatch_amount || '0.00',
},
pendingCount: order.pending_count || 0,
canViewFinance: data.can_view_finance !== false,
});
} catch (e) {
console.warn('订单统计失败', e);
}
},
// 🆕 加载商品类型（和打手端用同一个接口 /dingdan/dsqdhqddlx）
async loadShangpinLeixing() {
try {
const res = await request({
url: '/dingdan/dsqdhqddlx',
method: 'POST',
header: { 'content-type': 'application/json' }
header: { 'content-type': 'application/json' },
});
if (res.data && (res.data.code === 200 || res.data.code === 0)) {
let list = res.data.data.list || res.data.data || [];
if (!Array.isArray(list)) list = [];
const oss = this.data.ossImageUrl;
// 拼接图片完整URL
const processed = list.map(item => ({
const processed = list.map((item) => ({
...item,
full_tupian_url: item.tupian_url && !item.tupian_url.startsWith('http')
? oss + item.tupian_url
: (item.tupian_url || '/images/default-type.png')
: (item.tupian_url || '/images/default-type.png'),
}));
this.setData({
shangpinleixing: processed,
xuanzhongLeixingId: processed[0]?.id || null
xuanzhongLeixingId: processed[0]?.id || null,
});
// 初始加载全部状态订单
this.loadCurrentStatusOrders(true);
}
} catch (e) {
@@ -97,16 +251,16 @@ Page(createPage({
}
},
// 选择商品类型
selectLeixing(e) {
const id = e.currentTarget.dataset.id;
if (id === this.data.xuanzhongLeixingId) return;
this.setData({ xuanzhongLeixingId: id });
this.resetCurrentStatusData();
this._savedScrollTop = 0;
this.setData({ xuanzhongLeixingId: id, listScrollTop: 0 });
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
// 搜索输入（防抖）
onSearchInput(e) {
this.setData({ searchKeyword: e.detail.value });
if (this._searchTimer) clearTimeout(this._searchTimer);
@@ -115,26 +269,76 @@ Page(createPage({
}, 500);
},
// 搜索确认
onSearchConfirm() {
this.resetCurrentStatusData();
this._savedScrollTop = 0;
this.setData({ listScrollTop: 0 });
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
// 清除搜索
clearSearch() {
this.setData({ searchKeyword: '' });
this.resetCurrentStatusData();
this._savedScrollTop = 0;
this.setData({ searchKeyword: '', listScrollTop: 0 });
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
},
// 切换状态Tab
onTimeStartChange(e) {
this.setData({ timeStart: e.detail.value }, () => this.triggerTimeFilterReload());
},
onTimeEndChange(e) {
this.setData({ timeEnd: e.detail.value }, () => this.triggerTimeFilterReload());
},
triggerTimeFilterReload() {
this._savedScrollTop = 0;
this.setData({ listScrollTop: 0 });
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
},
clearTimeFilter() {
this._savedScrollTop = 0;
this.setData({ timeStart: '', timeEnd: '', listScrollTop: 0 });
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
pickQuickRange(e) {
const days = Number(e.currentTarget.dataset.days);
if (!days) {
this.clearTimeFilter();
return;
}
const end = new Date();
const start = new Date();
start.setDate(end.getDate() - (days - 1));
const fmt = (d) => {
const y = d.getFullYear();
const m = String(d.getMonth() + 1).padStart(2, '0');
const day = String(d.getDate()).padStart(2, '0');
return `${y}-${m}-${day}`;
};
this._savedScrollTop = 0;
this.setData({
timeStart: fmt(start),
timeEnd: fmt(end),
listScrollTop: 0,
});
this.resetAllStatusData();
this.loadCurrentStatusOrders(true);
this.loadOrderStats();
},
switchStatus(e) {
const key = e.currentTarget.dataset.key;
if (key === this.data.currentStatusKey) return;
this.setData({ currentStatusKey: key });
this._savedScrollTop = 0;
this.setData({ currentStatusKey: key, listScrollTop: 0 });
const tabData = this.data.sjDingdanShuju[key];
// 如果该状态没有数据，则加载；否则只刷新视图
if (tabData.list.length === 0 && tabData.hasMore && !tabData.isLoading) {
this.loadCurrentStatusOrders(true);
} else {
@@ -142,67 +346,62 @@ Page(createPage({
}
},
// 🆕 加载订单（核心方法，接口固定用商家订单接口 /dingdan/sjdingdanhq）
async loadCurrentStatusOrders(isRefresh = false) {
async loadCurrentStatusOrders(isRefresh = false, pageOverride = null) {
const key = this.data.currentStatusKey;
const tabData = this.data.sjDingdanShuju[key];
if (tabData.isLoading) return;
const page = isRefresh ? 1 : tabData.page;
const page = isRefresh ? 1 : (pageOverride || tabData.page + 1);
if (!isRefresh && !tabData.hasMore) return;
this.setData({
[`sjDingdanShuju.${key}.isLoading`]: true,
isLoading: true,
isLoadingMore: !isRefresh
isLoading: isRefresh && tabData.list.length === 0,
isLoadingMore: !isRefresh,
});
try {
const statusItem = this.data.statusList.find(s => s.key === key);
const zhuangtaiList = statusItem.zhuangtaiList;
// 构建请求参数
const params = {
zhuangtai_list: zhuangtaiList,
page: page,
page_size: 5,
leixing_id: this.data.xuanzhongLeixingId, // 🆕 商品类型筛选
keyword: this.data.searchKeyword || undefined // 🆕 模糊搜索
};
const statusItem = this.data.statusList.find((s) => s.key === key);
const params = this.buildListParams(key, page);
const res = await request({
url: '/dingdan/sjdingdanhq', // 商家订单接口（和原来一样）
url: isStaffMode() ? STAFF_API.orderList : '/dingdan/sjdingdanhq',
method: 'POST',
data: params,
header: { 'content-type': 'application/json' }
header: { 'content-type': 'application/json' },
});
const code = res.data.code;
if (code === 200 || code === 0) {
const newList = res.data.data.list || [];
const hasMore = res.data.data.has_more || false;
const total = Number(res.data.data.total);
const hasMore = typeof res.data.data.has_more === 'boolean'
? res.data.data.has_more
: (Number.isFinite(total) ? page * params.page_size < total : newList.length >= params.page_size);
// 处理数据：拼接图片、转换状态中文
const processed = newList.map(item => ({
...item,
zhuangtaiZh: getOrderStatusText(item.zhuangtai),
zhuangtaiColor: statusItem.color,
// 如果有商品图片则用商品图片，否则用默认图
tupian: item.tupian
? (item.tupian.startsWith('http') ? item.tupian : this.data.ossImageUrl + item.tupian)
: this.data.defaultImg
}));
const processed = newList.map((item) => this.processOrderItem(item, statusItem.color));
const prevList = isRefresh ? [] : tabData.list;
const updatedList = [...prevList, ...processed];
const currentList = this.data.sjDingdanShuju[key].list;
const updatedList = isRefresh ? processed : [...currentList, ...processed];
// 按订单 ID 去重，避免分页边界重复
const seen = new Set();
const deduped = updatedList.filter((row) => {
const id = row.dingdan_id;
if (!id || seen.has(id)) return false;
seen.add(id);
return true;
});
this.setData({
[`sjDingdanShuju.${key}.list`]: updatedList,
[`sjDingdanShuju.${key}.list`]: deduped,
[`sjDingdanShuju.${key}.page`]: page,
[`sjDingdanShuju.${key}.hasMore`]: hasMore,
[`sjDingdanShuju.${key}.isLoading`]: false,
isLoading: false,
isLoadingMore: false,
scrollViewRefreshing: false
scrollViewRefreshing: false,
});
this._listInitialized = true;
this.refreshCurrentListView();
} else {
throw new Error(res.data.msg || '加载失败');
@@ -214,94 +413,109 @@ Page(createPage({
[`sjDingdanShuju.${key}.isLoading`]: false,
isLoading: false,
isLoadingMore: false,
scrollViewRefreshing: false
scrollViewRefreshing: false,
});
this.refreshCurrentListView();
}
},
// 刷新当前视图
refreshCurrentListView() {
const key = this.data.currentStatusKey;
const tabData = this.data.sjDingdanShuju[key];
this.setData({
currentList: tabData.list,
hasMore: tabData.hasMore,
isLoading: tabData.isLoading
isLoading: tabData.isLoading,
});
},
// 重置当前状态数据
resetAllStatusData() {
const patch = {};
Object.keys(this.data.sjDingdanShuju).forEach((k) => {
patch[`sjDingdanShuju.${k}`] = { ...EMPTY_TAB };
});
this.setData(patch);
this.refreshCurrentListView();
},
resetCurrentStatusData() {
const key = this.data.currentStatusKey;
this.setData({
[`sjDingdanShuju.${key}.list`]: [],
[`sjDingdanShuju.${key}.page`]: 1,
[`sjDingdanShuju.${key}.hasMore`]: true,
[`sjDingdanShuju.${key}.isLoading`]: false
[`sjDingdanShuju.${key}`]: { ...EMPTY_TAB },
});
this.refreshCurrentListView();
},
// 🆕 加载待结算数量
async loadPendingCount() {
try {
const res = await request({
url: '/dingdan/sjdingdanhq',
method: 'POST',
data: {
zhuangtai_list: [8],
page: 1,
page_size: 1
}
});
if (res && res.data.code === 0) {
this.setData({ pendingCount: res.data.data.pending_count || 0 });
}
} catch (error) {
console.error('加载待结算数量失败:', error);
}
return this.loadOrderStats();
},
// 下拉刷新（由 scroll-view 触发）
onPullDownRefresh() {
if (this.data.isLoading) {
if (this.data.isLoading || this.data.isLoadingMore) {
this.setData({ scrollViewRefreshing: false });
return;
}
this.setData({ scrollViewRefreshing: true });
this._savedScrollTop = 0;
this.setData({ scrollViewRefreshing: true, listScrollTop: 0 });
this.resetCurrentStatusData();
this.loadCurrentStatusOrders(true);
},
// 上拉加载更多（由 scroll-view 触发）
onReachBottom() {
const key = this.data.currentStatusKey;
const tabData = this.data.sjDingdanShuju[key];
if (tabData.isLoading || !tabData.hasMore) return;
this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
this.loadCurrentStatusOrders(false);
},
// 🆕 手动点击"加载更多"按钮
onLoadMoreTap() {
const key = this.data.currentStatusKey;
const tabData = this.data.sjDingdanShuju[key];
if (tabData.isLoading || !tabData.hasMore) return;
this.setData({ [`sjDingdanShuju.${key}.page`]: tabData.page + 1 });
this.loadCurrentStatusOrders(false);
},
// 跳转订单详情
processOrderItem(item, zhuangtaiColor) {
const oss = this.data.ossImageUrl || '';
const leixing = this.data.shangpinleixing.find((l) => l.id === item.leixing_id);
const leixingIconUrl = leixing ? leixing.full_tupian_url : '/images/default-type.png';
let sjAvatarFull = '/images/default-avatar.png';
if (item.sj_avatar) {
sjAvatarFull = item.sj_avatar.startsWith('http') ? item.sj_avatar : oss + item.sj_avatar;
}
let zhidingAvatarFull = '';
if (item.zhiding_avatar) {
zhidingAvatarFull = item.zhiding_avatar.startsWith('http') ? item.zhiding_avatar : oss + item.zhiding_avatar;
}
const tags = normalizeOrderTags(item);
return {
...item,
zhuangtaiZh: getOrderStatusText(item.zhuangtai),
zhuangtaiColor: zhuangtaiColor || '#333333',
leixing_icon_url: leixingIconUrl,
sj_avatar_full: sjAvatarFull,
zhiding_avatar_full: zhidingAvatarFull,
isZhiding: item.zhuangtai === 7,
creat_time: item.creat_time || item.create_time || '',
...tags,
shangjia_youzhi: !!item.shangjia_youzhi,
};
},
goToSjDingdanXiangqing(e) {
const item = e.currentTarget.dataset.item;
if (!item) return;
this._skipShowRefresh = true;
const dataStr = encodeURIComponent(JSON.stringify(item));
wx.navigateTo({
url: `/pages/merchant-order-detail/merchant-order-detail?dingdanData=${dataStr}`
url: `/pages/merchant-order-detail/merchant-order-detail?dingdanData=${dataStr}`,
});
},
// 图片加载失败
onImageError() {}
}))
onImageError() {},
}));