From 25a25f620b016505a629b9c7565ea1c01864adab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 04 九月 2025 18:35:15 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/parkBike into 2.0.1
---
admin/src/views/combo/components/SaleDetail.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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