From ef70f387ae504f20e15aa7d7a933800b768892fc Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 30 九月 2025 19:26:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon
---
manager/src/views/activity-prize/prize-ruler.vue | 5 -----
manager/src/views/order/order/orderDetail.vue | 1 +
seller/src/views/order/order/orderDetail.vue | 1 +
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/manager/src/views/activity-prize/prize-ruler.vue b/manager/src/views/activity-prize/prize-ruler.vue
index e19a1c9..cdbd99c 100644
--- a/manager/src/views/activity-prize/prize-ruler.vue
+++ b/manager/src/views/activity-prize/prize-ruler.vue
@@ -143,11 +143,6 @@
minWidth: 200,
},
{
- title: '瑙勫垯缂栫爜',
- key: 'ruleCode',
- minWidth: 100,
- },
- {
title: '瑙勫垯鍊�',
key: 'ruleValue',
minWidth: 100,
diff --git a/manager/src/views/order/order/orderDetail.vue b/manager/src/views/order/order/orderDetail.vue
index 3c580c8..1ee945d 100644
--- a/manager/src/views/order/order/orderDetail.vue
+++ b/manager/src/views/order/order/orderDetail.vue
@@ -784,6 +784,7 @@
}
},
logisticsList () {
+ this.packageTraceList = []
this.logisticsModal = true;
API_Order.getPackage(this.sn).then((res) => {
if (res.success && res.result != null) {
diff --git a/seller/src/views/order/order/orderDetail.vue b/seller/src/views/order/order/orderDetail.vue
index a5c16bf..6a63b8b 100644
--- a/seller/src/views/order/order/orderDetail.vue
+++ b/seller/src/views/order/order/orderDetail.vue
@@ -1204,6 +1204,7 @@
}
},
logisticsList () {
+ this.packageTraceList = []
this.logisticsModal = true;
API_Order.getPackage(this.sn).then((res) => {
if (res.success && res.result != null) {
--
Gitblit v1.8.0