From ca2ab3179c10fe2ad1383fae1cbbefb9b20a2576 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 26 二月 2025 15:55:50 +0800
Subject: [PATCH] ll
---
admin/src/views/combo/components/Edit.vue | 2 +-
admin/src/views/combo/components/SaleDetail.vue | 4 ++--
admin/src/views/combo/components/OrderDetail.vue | 2 +-
admin/src/views/combo/components/ComboDetail.vue | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/combo/components/ComboDetail.vue b/admin/src/views/combo/components/ComboDetail.vue
index 98e1ede..ea24c96 100644
--- a/admin/src/views/combo/components/ComboDetail.vue
+++ b/admin/src/views/combo/components/ComboDetail.vue
@@ -66,9 +66,9 @@
</div>
<div class="line">
<div class="key">浣跨敤鏃堕棿锛�</div>
- <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}</div>
- <div class="value" v-if="detail.useType == 1">璐拱鍚巤{ detail.useDays }}澶╁唴鏈夋晥</div>
- <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }} 鍚� {{ detail.useDays }}澶╁唴鏈夋晥</div>
+ <div class="value" v-if="detail.useType == 0">{{ detail.useStartDate }} 鑷� {{ detail.useEndDate }}鍐呮湁鏁�</div>
+ <div class="value" v-if="detail.useType == 1">璐拱鍚庣珛鍗崇敓鏁堬紝鏈夋晥鏈焮{ detail.useDays }}澶�</div>
+ <div class="value" v-if="detail.useType == 2">鑷獅{ detail.useStartDate }}璧穥{ detail.useDays }}澶╁唴鏈夋晥</div>
</div>
<div class="line">
<div class="key">閫傜敤鑼冨洿锛�</div>
diff --git a/admin/src/views/combo/components/Edit.vue b/admin/src/views/combo/components/Edit.vue
index 584457d..ee6f0a0 100644
--- a/admin/src/views/combo/components/Edit.vue
+++ b/admin/src/views/combo/components/Edit.vue
@@ -227,7 +227,7 @@
comboDetailPost(id).then(res => {
this.param = res
this.$set(this.param, 'saleDate', [res.startDate, res.endDate])
- if (res.useStartDate && res.useEndDate) {
+ if (res.useStartDate && res.useEndDate && res.type != 0) {
this.$set(this.param, 'useDate', [res.useStartDate, res.useEndDate])
}
this.$set(this.param, 'id', type == 'copy' ? null : this.param.id)
diff --git a/admin/src/views/combo/components/OrderDetail.vue b/admin/src/views/combo/components/OrderDetail.vue
index 4da44b6..7aac679 100644
--- a/admin/src/views/combo/components/OrderDetail.vue
+++ b/admin/src/views/combo/components/OrderDetail.vue
@@ -59,7 +59,7 @@
<el-table-column prop="name" min-width="100px" label="濂楅鍗�" show-overflow-tooltip align="center"></el-table-column>
<el-table-column prop="refundType" label="鏈夋晥鏈�" min-width="160px" align="center">
<template slot-scope="{row}">
- {{ row.startDate }} 鑷� {{ row.endDate }}
+ {{ row.useStartDate }} 鑷� {{ row.useEndDate }}
</template>
</el-table-column>
<el-table-column label="鏁伴噺" width="80px" align="center">
diff --git a/admin/src/views/combo/components/SaleDetail.vue b/admin/src/views/combo/components/SaleDetail.vue
index 4ad54e5..8fb3e0b 100644
--- a/admin/src/views/combo/components/SaleDetail.vue
+++ b/admin/src/views/combo/components/SaleDetail.vue
@@ -4,7 +4,7 @@
<div class="modal_title">濂楅鍚嶇О锛歿{ detail.name }}</div>
<div class="place">
<span>濂楅鍙凤細{{ detail.code }}</span>
- <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useDays }}澶�</span>
+ <span v-if="detail.useType == 1">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 0">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
<span v-if="detail.useType == 2">鏈夋晥鏈燂細{{ detail.useStartDate }}鑷硔{ detail.useEndDate }}</span>
</div>
@@ -17,7 +17,7 @@
</div>
<el-table v-if="activeTab == 0" v-loading="loading" :data="list" stripe border>
<el-table-column prop="createDate" align="center" label="浣跨敤鏃堕棿" min-width="120" show-overflow-tooltip />
- <el-table-column prop="discountMemberId" align="center" label="鍏宠仈璁㈠崟" min-width="140" show-overflow-tooltip />
+ <el-table-column prop="goodsorderId" align="center" label="鍏宠仈璁㈠崟" min-width="140" show-overflow-tooltip />
<el-table-column prop="" align="center" label="楠戣溅鏃堕暱" min-width="80" show-overflow-tooltip>
<template v-slot="{ row }">
{{ row.rideTime }}鍒嗛挓
--
Gitblit v1.9.3