diff --git a/src/views/system/jdorder/orderList.vue b/src/views/system/jdorder/orderList.vue
index 2dd0824..a0bd08a 100644
--- a/src/views/system/jdorder/orderList.vue
+++ b/src/views/system/jdorder/orderList.vue
@@ -40,6 +40,24 @@
仅显示已完成订单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -446,7 +464,10 @@ export default {
endTime: null,
orderBy: 'create_time',
isAsc: 'desc',
- hasFinishTime: false
+ hasFinishTime: false,
+ isRefunded: undefined,
+ isRefundReceived: undefined,
+ isRebateReceived: undefined
},
// 同步物流对话框
syncLogisticsDialogVisible: false,
@@ -612,7 +633,10 @@ export default {
endTime: null,
orderBy: 'create_time',
isAsc: 'desc',
- hasFinishTime: false
+ hasFinishTime: false,
+ isRefunded: undefined,
+ isRefundReceived: undefined,
+ isRebateReceived: undefined
}
// 重置排序为默认降序
this.queryParams.orderBy = 'create_time'
@@ -1161,15 +1185,17 @@ export default {
/** 获取订单状态标签类型 */
getOrderStatusType(status) {
+ // 取消状态（优先级最高）
+ if (status === 3) return 'danger' // 无效-取消（红色，优先级高于违规）
// 正常状态
if (status === 16) return 'success' // 已付款
if (status === 17) return 'success' // 已完成
if (status === 15) return 'warning' // 待付款
if (status === 24) return 'warning' // 已付定金
// 违规状态
- if ([13, 25, 26, 27, 28].includes(status)) return 'danger' // 违规订单
+ if ([13, 25, 26, 27, 28].includes(status)) return 'warning' // 违规订单（黄色，优先级低于取消）
// 无效状态
- if ([2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单
+ if ([2, 4, 5, 6, 7, 8, 9, 11, 14, 19, 20, 21, 22, 23, 29, 30, 31, 34].includes(status)) return 'info' // 无效订单
if (status === 33) return 'success' // 超市卡充值订单
return 'info' // 其他状态
},