diff --git a/商家端web/2.1 营销工具/2.1.1 会员功能/积分订单/总订单查看.html b/商家端web/2.1 营销工具/2.1.1 会员功能/积分订单/总订单查看.html
index 7ff7439..f93f108 100644
--- a/商家端web/2.1 营销工具/2.1.1 会员功能/积分订单/总订单查看.html
+++ b/商家端web/2.1 营销工具/2.1.1 会员功能/积分订单/总订单查看.html
@@ -308,7 +308,6 @@
- |
+ |
@@ -382,9 +380,7 @@
| 商品原价 |
优惠券减免 |
积分减免 |
- 商品终价 |
商品订单金额 |
- 商品数量 |
商品图片 |
@@ -396,8 +392,6 @@
2 |
0.1 |
0.1 |
- 1.8 |
- 1 |
- |
|
| 商品订单号 |
- 结算单位订单号 |
- 总订单号 |
- 总商品数量 |
商品原价 |
- 商品终价 |
商品数量 |
消耗积分 |
+ 顾客支付 |
+ 积分类型 |
订单状态 |
- 顾客实际支付 |
- 商品总价 |
配送费 |
- 优惠券减免 |
+ 打包费 |
支付时间 |
- 预计收入 |
- 关联总订单链接 |
| PO2024010001 |
- SO2024010001 |
- TO2024010001 |
- 5 |
¥158.00 |
- ¥145.00 |
2 |
200 |
+ ¥0.00 |
+ 积分换购 |
已完成 |
- ¥128.50 |
- ¥145.00 |
¥8.00 |
- ¥15.00 |
+ ¥2.00 |
2024-01-15 14:30:22 |
- ¥113.50 |
- 查看详情 |
| PO2024010002 |
- SO2024010002 |
- TO2024010002 |
- 3 |
¥105.00 |
- ¥95.00 |
1 |
150 |
+ ¥52.50 |
+ 积分优惠购 |
待备货 |
- ¥89.00 |
- ¥95.00 |
¥6.00 |
- ¥8.00 |
+ ¥1.50 |
2024-01-15 15:45:10 |
- ¥83.00 |
- 查看详情 |
| PO2024010003 |
- SO2024010003 |
- TO2024010003 |
- 8 |
¥268.00 |
- ¥238.00 |
4 |
380 |
+ ¥0.00 |
+ 积分换购 |
待取货 |
- ¥223.00 |
- ¥238.00 |
¥10.00 |
- ¥25.00 |
+ ¥3.00 |
2024-01-15 16:20:35 |
- ¥213.00 |
- 查看详情 |
| PO2024010004 |
- SO2024010004 |
- TO2024010004 |
- 12 |
¥456.00 |
- ¥398.00 |
6 |
580 |
+ ¥228.00 |
+ 积分优惠购 |
待收货 |
- ¥368.00 |
- ¥398.00 |
¥15.00 |
- ¥45.00 |
+ ¥4.50 |
2024-01-15 17:35:28 |
- ¥353.00 |
- 查看详情 |
@@ -417,75 +387,51 @@
const mockOrders = [
{
productOrderNo: 'PO2024010001',
- settlementOrderNo: 'SO2024010001',
- totalOrderNo: 'TO2024010001',
- totalQuantity: 5,
originalPrice: 158.00,
- finalPrice: 145.00,
productQuantity: 2,
pointsUsed: 200,
+ customerPayment: 0.00,
+ pointsType: '积分换购',
status: '已完成',
- actualPayment: 128.50,
- totalPrice: 145.00,
deliveryFee: 8.00,
- couponDiscount: 15.00,
- paymentTime: '2024-01-15 14:30:22',
- estimatedIncome: 113.50,
- orderLink: '查看详情'
+ packageFee: 2.00,
+ paymentTime: '2024-01-15 14:30:22'
},
{
productOrderNo: 'PO2024010002',
- settlementOrderNo: 'SO2024010002',
- totalOrderNo: 'TO2024010002',
- totalQuantity: 3,
originalPrice: 105.00,
- finalPrice: 95.00,
productQuantity: 1,
pointsUsed: 150,
+ customerPayment: 52.50,
+ pointsType: '积分优惠购',
status: '待备货',
- actualPayment: 89.00,
- totalPrice: 95.00,
deliveryFee: 6.00,
- couponDiscount: 8.00,
- paymentTime: '2024-01-15 15:45:10',
- estimatedIncome: 83.00,
- orderLink: '查看详情'
+ packageFee: 1.50,
+ paymentTime: '2024-01-15 15:45:10'
},
{
productOrderNo: 'PO2024010003',
- settlementOrderNo: 'SO2024010003',
- totalOrderNo: 'TO2024010003',
- totalQuantity: 8,
originalPrice: 268.00,
- finalPrice: 238.00,
productQuantity: 4,
pointsUsed: 380,
+ customerPayment: 0.00,
+ pointsType: '积分换购',
status: '待取货',
- actualPayment: 223.00,
- totalPrice: 238.00,
deliveryFee: 10.00,
- couponDiscount: 25.00,
- paymentTime: '2024-01-15 16:20:35',
- estimatedIncome: 213.00,
- orderLink: '查看详情'
+ packageFee: 3.00,
+ paymentTime: '2024-01-15 16:20:35'
},
{
productOrderNo: 'PO2024010004',
- settlementOrderNo: 'SO2024010004',
- totalOrderNo: 'TO2024010004',
- totalQuantity: 12,
originalPrice: 456.00,
- finalPrice: 398.00,
productQuantity: 6,
pointsUsed: 580,
+ customerPayment: 228.00,
+ pointsType: '积分优惠购',
status: '待收货',
- actualPayment: 368.00,
- totalPrice: 398.00,
deliveryFee: 15.00,
- couponDiscount: 45.00,
- paymentTime: '2024-01-15 17:35:28',
- estimatedIncome: 353.00,
- orderLink: '查看详情'
+ packageFee: 4.50,
+ paymentTime: '2024-01-15 17:35:28'
}
];
@@ -505,21 +451,15 @@
tbody.innerHTML = data.map(order => `
|
| ${order.productOrderNo} |
- ${order.settlementOrderNo} |
- ${order.totalOrderNo} |
- ${order.totalQuantity} |
¥${order.originalPrice.toFixed(2)} |
- ¥${order.finalPrice.toFixed(2)} |
${order.productQuantity} |
${order.pointsUsed} |
+ ¥${order.customerPayment.toFixed(2)} |
+ ${order.pointsType} |
${order.status} |
- ¥${order.actualPayment.toFixed(2)} |
- ¥${order.totalPrice.toFixed(2)} |
¥${order.deliveryFee.toFixed(2)} |
- ¥${order.couponDiscount.toFixed(2)} |
+ ¥${order.packageFee.toFixed(2)} |
${order.paymentTime} |
- ¥${order.estimatedIncome.toFixed(2)} |
- ${order.orderLink} |
`).join('');
}
diff --git a/大妈集市.rp b/大妈集市.rp
index 4782330..72f346f 100644
Binary files a/大妈集市.rp and b/大妈集市.rp differ