From eacba04de1bf9a31e1503e7c07938f1812fe86c5 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 17 Jun 2025 10:02:30 +0800
Subject: [PATCH] refactor(mall): 优化活动关注记录查询逻辑
---
src/main/resources/templates/febs/views/modules/order/orderList.html | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 2216d97..6b54e39 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -506,19 +506,14 @@
{field: 'refererName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'deliveryType', title: '提货方式',
templet: function (d) {
- if (d.status === 1) {
+ if (d.deliveryType === 1) {
return '<span style="color:blue;">自提</span>'
- } else if (d.status === 2) {
+ } else if (d.deliveryType === 2) {
return '<span style="color:green;">快递</span>'
}else{
return ''
}
}, minWidth: 100,align:'center'},
- {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
- {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
- {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
- {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
- {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
{field: 'status', title: '状态',
templet: function (d) {
if (d.status === 1) {
@@ -539,6 +534,12 @@
return ''
}
}, minWidth: 80,align:'center'},
+ {field: 'goodsName', title: '商品', minWidth: 160,align:'left'},
+ {field: 'goodsAmount', title: '价格', minWidth: 80,align:'left', totalRow:true},
+ {field: 'carriage', title: '邮费', minWidth: 80,align:'left', totalRow:true},
+ {field: 'amount', title: '总金额', minWidth: 100,align:'left', totalRow:true},
+ {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
+
// {field: 'deliveryState', title: '配送状态',
// templet: function (d) {
// if (d.deliveryState === 1) {
--
Gitblit v1.9.1