From 600ad4f970f7959ef4c931f38df56f7e917d2ecb Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Tue, 14 Jan 2025 11:32:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/canteen/canteenDailyMenu/form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/canteen/canteenDailyMenu/form.vue b/src/views/canteen/canteenDailyMenu/form.vue
index 43787f4..089a636 100644
--- a/src/views/canteen/canteenDailyMenu/form.vue
+++ b/src/views/canteen/canteenDailyMenu/form.vue
@@ -47,7 +47,7 @@
 							<CircleClose />
 						</el-icon>
 						<el-image style="width: 80px; height: 80px" :src="imageBaseUrl + item.picUrl" fit="cover" />
-						<div class="w-full flex justify-around items-center text-black">
+						<div class="w-full flex justify-around items-center text-black mt-2">
 							<span>{{ item.name }}</span>
 							<span class="mx-1">|</span>
 							<span class="text-sm">

From 81d27be65488c7353662b5e5d8778e27c3d1abf4 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 14 Jan 2025 11:34:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=AF=BC=E5=85=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-recharge-apply/index.vue         | 2 +-
 src/views/wallet/wallet-recharge-apply/preview-excel.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index f23d69a..f34da42 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -96,7 +96,7 @@
 							>数据</el-button
 						>
 						<el-button
-							v-if="!row.processId"
+							v-if="row.importTime && row.processStatus != 1"
 							icon="Connection"
 							text
 							type="primary"
diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index b20160b..73d7c39 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -3,7 +3,7 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<right-toolbar class="ml10 mr20" style="float: right" :search="false" @queryTable="getDataList" />
+					<right-toolbar class="ml10 mr20" style="float: right" :search="false" @queryTable="getList" />
 				</div>
 			</el-row>
 			<el-table :data="data.list" v-loading="state.loading" border :header-cell-style="tableStyle.headerCellStyle">