From 39bfeb1fdef32b1229cde4f3db98ca34264d76de Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 21 Mar 2025 15:08:55 +0800
Subject: [PATCH] =?UTF-8?q?create:=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-payType-total/index.vue | 15 ++++++---------
 src/views/wallet/mch-manage/index.vue       |  5 ++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/hard/hard-payType-total/index.vue b/src/views/hard/hard-payType-total/index.vue
index 25445ac..dd741f3 100644
--- a/src/views/hard/hard-payType-total/index.vue
+++ b/src/views/hard/hard-payType-total/index.vue
@@ -14,7 +14,7 @@
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
-							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
+							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType" v-if="false">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 							</el-form-item>
 							<el-form-item style="width: 450px" label="创建时间" prop="payTimeList">
@@ -54,10 +54,7 @@
 						<el-table-column type="index" label="#" width="50" />
 						<el-table-column label="支付方式" align="center">
 							<template #default="{ row }">
-								<div class="flex flex-row items-center justify-center">
-									<div class="mr-2">{{ row.hardName }}</div>
-									<dict-tag :options="hard_type" :value="row.hardType" />
-								</div>
+								<dict-tag :options="hard_pay_type" :value="row.payType" />
 							</template>
 						</el-table-column>
 						<el-table-column label="流水金额" align="center" prop="totalPayPrice">
@@ -70,7 +67,7 @@
 						<el-table-column label="流水次数" align="center" prop="totalPayCount">
 							<template #default="{ row }">
 								<span class="color-primary">
-									{{ row.totalPayCount }}
+									{{ row.totalPayCount || 0 }}
 								</span>
 							</template>
 						</el-table-column>
@@ -84,7 +81,7 @@
 						<el-table-column label="退款次数" align="center" prop="totalRefundCount">
 							<template #default="{ row }">
 								<span class="color-danger">
-									{{ row.totalRefundCount }}
+									{{ row.totalRefundCount || 0 }}
 								</span>
 							</template>
 						</el-table-column>
@@ -98,7 +95,7 @@
 						<el-table-column label="实际消费次数" align="center" prop="totalProfitCount">
 							<template #default="{ row }">
 								<span class="color-success">
-									{{ row.totalProfitCount }}
+									{{ row.totalProfitCount || 0 }}
 								</span>
 							</template>
 						</el-table-column>
@@ -125,7 +122,7 @@ const multiple = ref(true)
 const draggableDepTreeRef = ref() // 树组件ref引用
 
 // 定义查询字典
-const { hard_type } = useDict("hard_type")
+const { hard_pay_type } = useDict("hard_pay_type")
 
 const state: BasicTableProps = reactive<BasicTableProps>({
 	isPage: false,
diff --git a/src/views/wallet/mch-manage/index.vue b/src/views/wallet/mch-manage/index.vue
index bb4644b..e350044 100644
--- a/src/views/wallet/mch-manage/index.vue
+++ b/src/views/wallet/mch-manage/index.vue
@@ -143,12 +143,15 @@ const resetQuery = () => {
 const refreshQrcode = async (row: any) => {
 	try {
 		await useMessageBox().confirm("是否重新生成正元二维码")
+	} catch (e) {
+		return
+	}
+	try {
 		await mchManangeApi.refreshQrcode({ mchId: row.id })
 		getDataList()
 		useMessage().success("生成成功")
 	} catch (e) {
 		useMessage().error("生成失败")
-		return
 	}
 }