From 23806befcf6bb05afe5a4de5f708ceb18574e6ba Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 16 Apr 2026 11:29:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 src/api/thirdparty/third-pay-order.ts         |   9 ++
 .../thirdparty/third-pay-order/index.vue      |  79 +++++++++++++-
 .../wallet/components/transaction-list.vue    |  27 +++--
 src/views/wallet/wallet-cz/index.vue          |   9 +-
 src/views/wallet/wallet-inactive/index.vue    |  56 +++-------
 src/views/wallet/wallet-jz/index.vue          |   7 +-
 .../wallet/wallet-manage/change-balance.vue   |   8 +-
 src/views/wallet/wallet-manage/index.vue      | 100 +++++-------------
 src/views/wallet/wallet-qb/index.vue          |   7 +-
 .../wallet/wallet-recharge-water/index.vue    |  22 ++--
 .../wallet/wallet-rule-transaction/index.vue  |   3 +-
 src/views/wallet/wallet-th/index.vue          |   7 +-
 src/views/wallet/wallet-tk/index.vue          |   9 +-
 src/views/wallet/wallet-xf/index.vue          |   9 +-
 15 files changed, 197 insertions(+), 159 deletions(-)

diff --git a/.env.development b/.env.development
index 671ee0c..726b6ea 100644
--- a/.env.development
+++ b/.env.development
@@ -12,14 +12,14 @@ ENV = 'development'
 # VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 VITE_ADMIN_PROXY_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
-# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境线上
+# VITE_ADMIN_PROXY_PATH = https://stgl.pj.gov.cn/api # 正式环境线上
 
 # 图片访问基础地址
 # VITE_IMAGE_BASE_PATH = http://123.157.250.162:8089/api/ # 测试线上
 # VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api/ # 测试线上-过期
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
 VITE_IMAGE_BASE_PATH = https://dzc-test-1.fy.takin.cc # 邓-本地
-# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境线上
+# VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api/ # 正式环境线上
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/api/thirdparty/third-pay-order.ts b/src/api/thirdparty/third-pay-order.ts
index a0f007e..ad4dcbe 100644
--- a/src/api/thirdparty/third-pay-order.ts
+++ b/src/api/thirdparty/third-pay-order.ts
@@ -8,6 +8,15 @@ export function fetchList(query?: Object) {
 	})
 }
 
+// 小程序退款
+export function miniRefund(data?: any) {
+	return request({
+		url: "/third/third-mini-app-pay/refund",
+		method: "post",
+		data: data,
+	})
+}
+
 export function addObj(obj?: Object) {
 	return request({
 		url: "/third/third-pay-order",
diff --git a/src/views/thirdparty/third-pay-order/index.vue b/src/views/thirdparty/third-pay-order/index.vue
index ba1533a..fa1c1a3 100644
--- a/src/views/thirdparty/third-pay-order/index.vue
+++ b/src/views/thirdparty/third-pay-order/index.vue
@@ -2,6 +2,9 @@
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
       <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-form-item style="width: 250px" label="订单号" prop="payNo">
+          <el-input v-model="state.queryForm.payNo" />
+        </el-form-item>
         <el-form-item style="width: 250px" label="支付平台" prop="payPlatformType">
           <dict-select v-model="state.queryForm.payPlatformType" dict-code="mini_platform_type" />
         </el-form-item>
@@ -65,16 +68,57 @@
           </template>
         </el-table-column>
         <el-table-column prop="payTime" label="支付时间" width="180" />
-        <el-table-column prop="payRes" label="支付返回" width="200">
+        <el-table-column prop="payTime" label="支付" width="280">
           <template #default="{ row }">
-            <preview-xml :xml="row.payRes" />
+            <div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">支付参数:</div>
+                <preview-json v-if="row.payRep" :json="row.payRep" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">支付返回:</div>
+                <preview-json v-if="row.payRes" :json="row.payRes" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">支付回调返回:</div>
+                <preview-json v-if="row.payCallbackRes" :json="row.payCallbackRes" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="refundNo" label="退款订单号" width="200" show-overflow-tooltip />
         <el-table-column prop="refundTime" label="退款时间" width="180" />
-        <el-table-column prop="refundRes" label="退款返回" width="200">
+        <el-table-column prop="refundRes" label="退款" width="280">
           <template #default="{ row }">
-            <preview-xml :xml="row.refundRes" />
+            <div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">退款参数:</div>
+                <preview-json v-if="row.refundRep" :json="row.refundRep" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">退款返回:</div>
+                <preview-json v-if="row.refundRes" :json="row.refundRes" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+              <div class="flex items-center">
+                <div class="w-[40%] text-left">退款回调返回:</div>
+                <preview-json v-if="row.refundCallbackRes" :json="row.refundCallbackRes" />
+                <div class="color-danger" v-else>暂无</div>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right" align="center" label="操作" prop="createTime" width="100">
+          <template #default="{ row }">
+            <div class="flex items-center justify-center">
+              <el-button v-if="row.status == 20" icon="CloseBold" text type="primary" @click="refund(row)">
+                退款
+              </el-button>
+            </div>
           </template>
         </el-table-column>
       </el-table>
@@ -108,6 +152,7 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 const state: BasicTableProps = reactive<BasicTableProps>({
+  createdIsNeed: false,
   queryForm: {},
   pageList: thirdPayOrderApi.fetchList
 })
@@ -122,6 +167,14 @@ const {
   tableStyle
 } = useTable(state)
 
+onMounted(() => {
+  const { query } = useRoute()
+  if (query.payNo) {
+    state.queryForm.payNo = query.payNo
+  }
+  getDataList()
+})
+
 // 清空搜索条件
 const resetQuery = () => {
   // 清空搜索条件
@@ -131,6 +184,24 @@ const resetQuery = () => {
   getDataList()
 }
 
+const refund = async (row: any) => {
+  try {
+    await useMessageBox().confirm(`此操作将退款${row.price}元`)
+  } catch {
+    return
+  }
+  try {
+    await thirdPayOrderApi.miniRefund({
+      payNo: row.payNo,
+      refundPrice: ''
+    })
+    getDataList()
+    useMessage().success("退款成功")
+  } catch (err: any) {
+    useMessage().error(err.msg)
+  }
+}
+
 // 导出excel
 const exportExcel = () => {
   downBlobFile('/third/third-pay-order/export', Object.assign(state.queryForm, { ids: selectObjs }), 'thirdPayOrder.xlsx')
diff --git a/src/views/wallet/components/transaction-list.vue b/src/views/wallet/components/transaction-list.vue
index bee9e92..3e25643 100644
--- a/src/views/wallet/components/transaction-list.vue
+++ b/src/views/wallet/components/transaction-list.vue
@@ -1,17 +1,26 @@
 <template>
-	<el-dialog title="钱包余额明细" v-model="visible" width="60%" :close-on-click-modal="false" draggable>
+	<el-dialog title="钱包余额明细" v-model="visible" width="65%" :close-on-click-modal="false" draggable>
 		<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
 			:header-cell-style="tableStyle.headerCellStyle" @sort-change="sortChangeHandle">
-			<el-table-column align="center" width="200" label="编号" prop="id" />
 			<el-table-column align="center" width="200" label="钱包编号" prop="walletId" />
-			<el-table-column align="center" width="200" label="交易类型" prop="title" />
+			<el-table-column align="center" width="120" label="交易类型" prop="title" />
 			<el-table-column align="center" label="交易金额" prop="price">
 				<template #default="{ row }"> {{ displayPrice(row.price) }} </template>
 			</el-table-column>
 			<el-table-column align="center" label="钱包余额" prop="balance">
 				<template #default="{ row }"> {{ displayPrice(row.balance) }} </template>
 			</el-table-column>
-			<el-table-column align="center" label="交易时间" prop="createTime" width="180px" />
+			<el-table-column align="center" width="80" label="版本号" prop="version" />
+			<el-table-column align="center" label="交易时间" prop="createTime" width="180" />
+			<el-table-column align="center" label="操作" prop="createTime" width="100">
+				<template #default="{ row }">
+					<div class="flex items-center justify-center">
+						<el-button icon="CloseBold" text type="primary" @click="refund(row)">
+							退款
+						</el-button>
+					</div>
+				</template>
+			</el-table-column>
 		</el-table>
 		<template #footer>
 			<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
@@ -25,12 +34,13 @@ import { BasicTableProps, useTable } from "/@/hooks/table"
 import * as walletTransactionApi from "/@/api/wallet/wallet-transaction"
 import { displayPrice } from "/@/utils/formatMoney"
 
+const { push } = useRouter()
+
 // 定义变量内容
 const visible = ref(false)
 // 定义字典
 
 // 提交表单数据
-const form = reactive({})
 const state: BasicTableProps = reactive<BasicTableProps>({
 	queryForm: {},
 	pageList: walletTransactionApi.publicPageJoin,
@@ -40,10 +50,13 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 const { getDataList, total, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } =
 	useTable(state)
 
+const refund = async (row: any) => {
+	push("/thirdparty/third-pay-order/index?payNo=" + row.bizId)
+}
+
 // 打开弹窗
 const openDialog = (id: string) => {
 	visible.value = true
-	form.id = ""
 	if (id) {
 		state.queryForm.walletId = id
 		state.dataList = []
@@ -55,4 +68,4 @@ const openDialog = (id: string) => {
 defineExpose({
 	openDialog,
 })
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index f01be91..333da85 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -16,6 +16,10 @@
 							<el-form-item v-if="false" style="width: 200px" label="充值类型" prop="type">
 								<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
 									type="daterange" />
@@ -44,9 +48,8 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="40" />
-						<el-table-column prop="username" label="用户" />
+						<el-table-column type="index" label="#" width="60" />
+						<el-table-column width="120" prop="username" label="用户" />
 						<el-table-column prop="userAvatar" label="头像">
 							<template #default="{ row }">
 								<preview-image :src="row.userAvatar" />
diff --git a/src/views/wallet/wallet-inactive/index.vue b/src/views/wallet/wallet-inactive/index.vue
index 3b1fb8c..654af84 100644
--- a/src/views/wallet/wallet-inactive/index.vue
+++ b/src/views/wallet/wallet-inactive/index.vue
@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
@@ -18,24 +11,20 @@
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="不活跃月数" prop="unactiveMonthsNumber">
-								<el-input v-model="state.queryForm.unactiveMonthsNumber" type="number" placeholder="不活跃月数" />
+								<el-input v-model="state.queryForm.unactiveMonthsNumber" type="number"
+									placeholder="不活跃月数" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+								}}</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button
-								plain
-								:disabled="multiple"
-								icon="Delete"
-								type="primary"
-								v-auth="'wallet_walletManage_del'"
-								@click="handleDelete(selectObjs)"
-							>
+							<el-button plain :disabled="multiple" icon="Delete" type="primary"
+								v-auth="'wallet_walletManage_del'" @click="handleDelete(selectObjs)">
 								删除
 							</el-button>
 							<!-- <right-toolbar
@@ -48,24 +37,12 @@
 							></right-toolbar> -->
 						</div>
 					</el-row>
-					<el-table
-						:data="tableList"
-						v-loading="state.loading"
-						:row-key="(row:any) => row.id"
-						lazy
-						:load="load"
-						:indent="30"
-						:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-						:summary-method="getSummaries"
-						show-summary
-						:header-cell-style="tableStyle.headerCellStyle"
-						:cell-style="tableStyle.cellStyle"
-						@selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle"
-						:row-class-name="tableRowClassName"
-					>
-						<el-table-column v-auth="'wallet_walletManage_del'" type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="80" />
+					<el-table :data="tableList" v-loading="state.loading" :row-key="(row: any) => row.id" lazy
+						:load="load" :indent="30" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+						:summary-method="getSummaries" show-summary :header-cell-style="tableStyle.headerCellStyle"
+						:cell-style="tableStyle.cellStyle" @selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle" :row-class-name="tableRowClassName">
+						<el-table-column type="index" label="#" width="60" />
 						<el-table-column prop="username" label="用户" />
 						<el-table-column prop="userAvatar" label="头像">
 							<template #default="{ row }">
@@ -80,7 +57,8 @@
 						</el-table-column>
 						<el-table-column prop="updateTime" label="最后充值时间" />
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+						v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
diff --git a/src/views/wallet/wallet-jz/index.vue b/src/views/wallet/wallet-jz/index.vue
index dd3a853..4130d6f 100644
--- a/src/views/wallet/wallet-jz/index.vue
+++ b/src/views/wallet/wallet-jz/index.vue
@@ -13,6 +13,10 @@
 							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
 								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
 									type="daterange" />
@@ -39,9 +43,8 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="40" />
-						<el-table-column prop="username" label="用户" show-overflow-tooltip />
+						<el-table-column width="120" prop="username" label="用户" show-overflow-tooltip />
 						<el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
 							<template #default="{ row }">
 								<preview-image :src="row.userAvatar" />
diff --git a/src/views/wallet/wallet-manage/change-balance.vue b/src/views/wallet/wallet-manage/change-balance.vue
index b46dad2..6b3d1f0 100644
--- a/src/views/wallet/wallet-manage/change-balance.vue
+++ b/src/views/wallet/wallet-manage/change-balance.vue
@@ -1,6 +1,7 @@
 <template>
 	<el-dialog title="修改余额" v-model="visible" width="30%" :close-on-click-modal="false" draggable>
-		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px" v-loading="loading">
+		<el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="120px"
+			v-loading="loading">
 			<el-row :gutter="24">
 				<el-col :span="24" class="mb20">
 					<el-form-item label="用户编号" prop="id">
@@ -27,7 +28,8 @@
 				</el-col>
 				<el-col :span="24" class="mb20">
 					<el-form-item label="变动余额(元)" prop="changeBalance">
-						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1" class="!w-240px" />
+						<el-input-number v-model="form.changeBalance" :min="0" :precision="2" :step="0.1"
+							class="!w-240px" />
 					</el-form-item>
 				</el-col>
 				<el-col :span="24" class="mb20">
@@ -98,7 +100,7 @@ const openDialog = (userId: string, id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {})
+	const valid = await dataFormRef.value.validate().catch(() => { })
 	if (!valid) return false
 	if (form.changeBalance <= 0) {
 		useMessage().error("变动余额不能为零")
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index b2d425b..a0e9799 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -1,16 +1,9 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree
-				ref="draggableDepTreeRef"
-				placeholder="请输入部门名称"
-				:show-expand="true"
-				@getSelectNode="handleGetSelectNode"
-				switch-inactive-text="包含"
-				switch-active-text="不包含"
-				:defaultTreeWidth="20"
-				:nodeClickable="false"
-			>
+			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
+				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
+				:defaultTreeWidth="20" :nodeClickable="false">
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-form-item style="width: 300px" label="用户" prop="userId">
@@ -23,45 +16,26 @@
 							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 						</el-form-item>
 						<el-form-item>
-							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
+							}}</el-button>
 							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 						</el-form-item>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button
-								plain
-								:disabled="multiple"
-								icon="Delete"
-								type="primary"
-								v-auth="'wallet_walletManage_del'"
-								@click="handleDelete(selectObjs)"
-							>
+							<el-button plain :disabled="multiple" icon="Delete" type="primary"
+								v-auth="'wallet_walletManage_del'" @click="handleDelete(selectObjs)">
 								删除
 							</el-button>
-							<right-toolbar
-								v-model:showSearch="showSearch"
-								:export="'wallet_walletManage_export'"
-								@exportExcel="exportExcel"
-								class="ml10 mr20"
-								style="float: right"
-								@queryTable="getDataList"
-							></right-toolbar>
+							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletManage_export'"
+								@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
+								@queryTable="getDataList"></right-toolbar>
 						</div>
 					</el-row>
-					<el-table
-						:data="state.dataList"
-						v-loading="state.loading"
-						border
-						:summary-method="getSummaries"
-						show-summary
-						:cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle"
-					>
-						<el-table-column type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="80" />
+					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
+						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+						<el-table-column type="index" label="#" width="60" />
 						<el-table-column prop="username" width="100" label="用户" />
 						<el-table-column prop="userAvatar" width="80" label="头像">
 							<template #default="{ row }">
@@ -103,49 +77,29 @@
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 						<el-table-column prop="createTime" width="200" label="创建时间" />
-						<el-table-column
-							label="操作"
-							fixed="right"
-							width="250"
-							v-auths="[
-								'wallet_walletManage_edit',
-								'wallet_walletTransaction_update_balance',
-								'wallet_walletRuleTransaction_transfer_accounts',
-							]"
-						>
+						<el-table-column label="操作" fixed="right" width="250" v-auths="[
+							'wallet_walletManage_edit',
+							'wallet_walletTransaction_update_balance',
+							'wallet_walletRuleTransaction_transfer_accounts',
+						]">
 							<template #default="{ row }">
 								<div class="flex items-start">
-									<el-button
-										icon="InfoFilled"
-										text
-										type="primary"
-										v-auth="'wallet_walletManage_edit'"
-										@click="formDialogRef.openDialog(row.id)"
-										>详情</el-button
-									>
-									<el-button
-										icon="Money"
-										text
-										type="primary"
+									<el-button icon="InfoFilled" text type="primary" v-auth="'wallet_walletManage_edit'"
+										@click="formDialogRef.openDialog(row.id)">详情</el-button>
+									<el-button icon="Money" text type="primary"
 										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="changeBalanceRef.openDialog(row.userId, row.id)"
-										>充值/扣款</el-button
-									>
-									<el-button
-										v-if="row.isRule == 1"
-										icon="SwitchFilled"
-										text
-										type="primary"
+										@click="changeBalanceRef.openDialog(row.userId, row.id)">充值/扣款</el-button>
+									<el-button v-if="row.isRule == 1" icon="SwitchFilled" text type="primary"
 										v-auth="'wallet_walletRuleTransaction_transfer'"
-										@click="doTransferAccounts(row)"
-									>
+										@click="doTransferAccounts(row)">
 										转账
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
+						v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index 259545d..cbbfcd6 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -38,7 +38,6 @@
 									<el-tooltip class="item" effect="dark" content="统计" placement="top">
 										<el-button icon="DataLine" circle @click="viewBalanceStatistics" />
 									</el-tooltip>
-
 								</right-toolbar>
 							</div>
 						</div>
@@ -46,10 +45,8 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column v-auth="'wallet_walletManage_del'" type="selection" width="40"
-							align="center" />
-						<el-table-column type="index" label="#" width="80" />
-						<el-table-column prop="username" width="100" label="用户" />
+						<el-table-column type="index" label="#" width="60" />
+						<el-table-column prop="username" width="120" label="用户" />
 						<el-table-column prop="userAvatar" width="80" label="头像">
 							<template #default="{ row }">
 								<preview-image :src="row.userAvatar" />
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index 19c9ab0..dbaa285 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -16,7 +16,7 @@
 							<el-form-item style="width: 200px" label="审核状态" prop="processStatus">
 								<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
 								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
 									clearable />
 							</el-form-item>
@@ -25,8 +25,9 @@
 									value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
-								}}</el-button>
+								<el-button icon="Search" type="primary" @click="getDataList">
+									{{ $t("common.queryBtn") }}
+								</el-button>
 								<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 							</el-form-item>
 						</el-row>
@@ -41,7 +42,6 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
 						:header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" show-summary
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column width="200" label="用户">
 							<template #default="{ row }">
@@ -56,8 +56,8 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="importTime" label="充值月" />
-						<el-table-column prop="bizType" label="充值类型">
+						<el-table-column prop="importTime" width="120" label="充值月" />
+						<el-table-column prop="bizType" width="120" label="充值类型">
 							<template #default="{ row }">
 								<dict-tag :options="wallet_biz_recharge" :value="row.bizType" />
 							</template>
@@ -72,23 +72,23 @@
 								</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="processStatus" label="审核状态">
+						<el-table-column prop="processStatus" width="120" label="审核状态">
 							<template #default="{ row }">
 								<dict-tag :options="check_status" :value="row.processStatus" />
 							</template>
 						</el-table-column>
-						<el-table-column prop="processTime" label="审核时间" align="center" />
-						<el-table-column prop="beforePrice" label="操作前的金额" align="center">
+						<el-table-column prop="processTime" width="160" label="审核时间" align="center" />
+						<el-table-column prop="beforePrice" width="120" label="操作前的金额" align="center">
 							<template #default="{ row }">
 								<div class="color-primary">{{ displayPrice(row.beforePrice) }}</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="price" label="操作金额" align="center">
+						<el-table-column prop="price" width="120" label="操作金额" align="center">
 							<template #default="{ row }">
 								<div class="color-success">{{ displayPrice(row.price) }}</div>
 							</template>
 						</el-table-column>
-						<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="200">
+						<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="100">
 							<template #default="{ row }">
 								<el-button v-auth="'wallet_walletRechargeImport_recover'" icon="RefreshRight" text
 									type="primary" @click="handleRecover(row.id)">
diff --git a/src/views/wallet/wallet-rule-transaction/index.vue b/src/views/wallet/wallet-rule-transaction/index.vue
index d4f092c..e0e1695 100644
--- a/src/views/wallet/wallet-rule-transaction/index.vue
+++ b/src/views/wallet/wallet-rule-transaction/index.vue
@@ -43,8 +43,7 @@
 				<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
 					:header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
 					@sort-change="sortChangeHandle">
-					<el-table-column type="selection" width="40" align="center" />
-					<el-table-column type="index" label="#" width="80" />
+					<el-table-column type="index" label="#" width="60" />
 					<el-table-column label="用户">
 						<el-table-column width="120" prop="username" label="姓名" />
 						<el-table-column width="120" prop="userMobile" label="手机号" />
diff --git a/src/views/wallet/wallet-th/index.vue b/src/views/wallet/wallet-th/index.vue
index b462841..b20bb4b 100644
--- a/src/views/wallet/wallet-th/index.vue
+++ b/src/views/wallet/wallet-th/index.vue
@@ -10,6 +10,10 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
 									type="daterange" />
@@ -36,8 +40,7 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="40" />
+						<el-table-column type="index" label="#" width="60" />
 						<el-table-column prop="username" width="120" label="用户" show-overflow-tooltip />
 						<el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
 							<template #default="{ row }">
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index dd3dd7c..44247b8 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -10,6 +10,10 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
 									type="daterange" />
@@ -36,9 +40,8 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="40" />
-						<el-table-column prop="username" label="用户" show-overflow-tooltip />
+						<el-table-column type="index" label="#" width="60" />
+						<el-table-column width="120" prop="username" label="用户" show-overflow-tooltip />
 						<el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
 							<template #default="{ row }">
 								<preview-image :src="row.userAvatar" />
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index b2430a9..56455ce 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -13,6 +13,10 @@
 							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
 								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
 							</el-form-item>
+							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
+							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
 									type="daterange" />
@@ -39,9 +43,8 @@
 					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
 						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
 						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
-						<el-table-column type="selection" width="40" align="center" />
-						<el-table-column type="index" label="#" width="40" />
-						<el-table-column prop="username" label="用户" show-overflow-tooltip />
+						<el-table-column type="index" label="#" width="60" />
+						<el-table-column width="120" prop="username" label="用户" show-overflow-tooltip />
 						<el-table-column prop="userAvatar" label="头像" show-overflow-tooltip>
 							<template #default="{ row }">
 								<preview-image :src="row.userAvatar" />