From 293beedcf8eeb25ac10072e2a01681d414d6ff75 Mon Sep 17 00:00:00 2001
From: ctw <>
Date: Thu, 9 Jan 2025 19:55:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=AF=8F=E6=97=A5=E8=8F=9C=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |   8 +-
 src/views/canteen/canteenDailyMenu/index.vue | 149 +++++--------------
 2 files changed, 42 insertions(+), 115 deletions(-)

diff --git a/.env.development b/.env.development
index 577906e..639afc5 100644
--- a/.env.development
+++ b/.env.development
@@ -8,16 +8,16 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
 # VITE_ADMIN_PROXY_PATH = http://localhost:9999/
-VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
+# VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 
 # 图片访问基础地址
-# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089
+VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
 # VITE_IMAGE_BASE_PATH = http://localhost:9999
-VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
+# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 
 # 代码生成服务地址
 VITE_GEN_PROXY_PATH = http://192.168.110.156:5003
diff --git a/src/views/canteen/canteenDailyMenu/index.vue b/src/views/canteen/canteenDailyMenu/index.vue
index bdaf4d3..e460c06 100644
--- a/src/views/canteen/canteenDailyMenu/index.vue
+++ b/src/views/canteen/canteenDailyMenu/index.vue
@@ -1,44 +1,44 @@
 <template>
 	<div class="layout-padding">
-		<div style="margin-left: 4.5%; margin-top: 1.5%">
-			<el-form-item label="商户" prop="merchantId">
-				<select-mch v-model="merchantId" style="width: 200px" />
-			</el-form-item>
-			<h1 class="title">今日菜谱</h1>
-		</div>
-		<table width="100%" class="titleTable">
-			<tr class="trclass">
-				<td @click="addClick(-1)">&lt;</td>
+		<el-form-item label="商户" prop="merchantId" class="w-60 ml-10 my-6">
+			<select-mch v-model="merchantId" />
+		</el-form-item>
+		<h1 class="mx-auto text-5xl">今日菜谱</h1>
+
+		<table class="w-11/12 border-collapse cursor-pointer mx-auto">
+			<tr>
+				<td class="text-6xl" @click="addClick(-1)">&lt;</td>
 				<td
 					v-for="(item, index) in weekData.data"
 					:key="index"
 					@click="timeClick(item, index)"
-					class="tdclass"
 					:class="{ selectedSpan: isActive === index ? 'selected' : '' }"
+					class="border-2 border-solid border-gray-200 text-center"
 				>
 					<span>{{ item }}</span>
 				</td>
-				<td @click="addClick(1)">&gt;</td>
+				<td class="text-6xl" @click="addClick(1)">&gt;</td>
 			</tr>
 		</table>
-		<div class="dataDiv">
-			<table :style="{ width: tableWitch + 'px' }" class="foodTable">
-				<tr class="food">
-					<td @click="addFood(1)">早餐</td>
-					<td v-for="(item, index) in foodData1" :key="index">
-						<img @click="delteData(item.tid)" :src="item.picUrl" class="imageCss" />
+
+		<div class="overflow-y-auto">
+			<table class="my-4">
+				<tr>
+					<td class="w-16 h-48 text-4xl text-center cursor-pointer text-blue-500" @click="addFood(1)">早餐</td>
+					<td class="w-64 h-48 text-center" v-for="(item, index) in foodData1" :key="index">
+						<img @click="delteData(item.tid)" :src="item.picUrl" class="p-3 w-full h-full object-cover" />
 					</td>
 				</tr>
-				<tr class="food" style="margin: 0px 5px 5px 0px">
-					<td @click="addFood(2)">中餐</td>
-					<td v-for="(item, index) in foodData2" :key="index">
-						<img @click="delteData(item.tid)" :src="item.picUrl" class="imageCss" />
+				<tr>
+					<td class="w-16 h-48 text-4xl text-center cursor-pointer text-blue-500" @click="addFood(2)">中餐</td>
+					<td class="w-64 h-48 text-center" v-for="(item, index) in foodData2" :key="index">
+						<img @click="delteData(item.tid)" :src="item.picUrl" class="p-3 w-full h-full object-cover" />
 					</td>
 				</tr>
-				<tr class="food">
-					<td @click="addFood(3)">晚餐</td>
-					<td v-for="(item, index) in foodData3" :key="index">
-						<img @click="delteData(item.tid)" :src="item.picUrl" class="imageCss" />
+				<tr>
+					<td class="w-16 h-48 text-4xl text-center cursor-pointer text-blue-500" @click="addFood(3)">晚餐</td>
+					<td class="w-64 h-48 text-center" v-for="(item, index) in foodData3" :key="index">
+						<img @click="delteData(item.tid)" :src="item.picUrl" class="p-3 w-full h-full object-cover" />
 					</td>
 				</tr>
 			</table>
@@ -66,21 +66,21 @@ const loading = ref(true); // 列表的加载中
 
 // ---------新增业务变量
 const message = useMessage(); // 消息弹窗
-const weekData = reactive({
-	data: [],
-}); //时间数组
-const weekParams = reactive({
-	index: 0,
-});
+
 const foodData1 = ref<any>({});
 const foodData2 = ref<any>({});
 const foodData3 = ref<any>({});
-let isActive = ref(-1);
+
 let timedata = '';
+let isActive = ref(-1);
+const weekParams = reactive({
+	index: 0,
+});
+const weekData = reactive({
+	data: [],
+}); //时间数组
 const merchantId = ref();
-const merchantStatus = ref(true);
 const merchantInfo = ref<any>([]);
-let tableWitch = 1000;
 
 const addFood = async (hourType: number) => {
 	if (!merchantId.value) {
@@ -114,11 +114,11 @@ watch(merchantId, () => {
 });
 
 const fetchData = async () => {
-	let weekDataRes = await selectWeekInfo(weekParams);
+	const weekDataRes = await selectWeekInfo(weekParams);
 	weekData.data = weekDataRes.data;
 	isActive.value = 0;
 	timedata = weekData.data[0];
-	//时间格式
+	// 时间格式
 	timedata = timedata.substring(0, timedata.indexOf('('));
 	selectTimeFood();
 };
@@ -127,7 +127,6 @@ const selectTimeFood = async () => {
 	foodData1.value = [];
 	foodData2.value = [];
 	foodData3.value = [];
-	tableWitch = 1000;
 	let params = {
 		time: timedata,
 		merchantId: merchantId.value,
@@ -151,11 +150,6 @@ const selectTimeFood = async () => {
 				break;
 		}
 	});
-	if (count > 0) {
-		tableWitch = count * 300 + 100;
-	} else {
-		tableWitch = 600;
-	}
 };
 /** 删除数据源按钮 */
 const delteData = async (tid: number) => {
@@ -185,90 +179,23 @@ const delteData = async (tid: number) => {
 /** 初始化下拉框 */
 const merchantInit = async () => {
 	// 获取下拉框选项
-	let res = await pageJoin({ current: 1, size: 9999 });
+	const res = await pageJoin({ current: 1, size: 9999 });
 	merchantInfo.value = res.data.records;
 
 	//默认选中第一个
 	if (merchantInfo.value) {
 		merchantId.value = merchantInfo.value[0].id;
-
-		if (merchantInfo.value.length > 1) {
-			merchantStatus.value = false;
-		}
 		fetchData();
 	}
 };
-/** 初始化 **/
 onMounted(() => {
 	merchantInit();
 });
 </script>
 
 <style lang="scss">
-.title {
-	font-size: 28px;
-	display: inline-block;
-	margin-left: 25%;
-}
-
-.titleTable {
-	border-collapse: collapse;
-	border-spacing: 0;
-	margin-top: 20px;
-	cursor: pointer;
-}
-
-.tdclass {
-	border: 1px solid rgb(233, 233, 233);
-	width: 13%;
-	height: 36px;
-	text-align: center;
-	background-color: white;
-}
-
-.trclass > td:first-child {
-	text-align: center;
-}
-.trclass > td:last-child {
-	text-align: center;
-}
-
-.foodTable {
-	margin-top: 30px;
-}
-
-.food td {
-	width: 250px;
-	height: 200px;
-	display: inline-block;
-	background-color: white;
-	margin-left: 20px;
-	cursor: pointer;
-}
-.imageCss {
-	width: 250px;
-}
-
-.food td:first-child {
-	width: 60px;
-	height: 200px;
-	display: inline-flex;
-	align-items: center;
-	margin-left: 4%;
-	background-color: transparent;
-	font-size: 26px;
-	cursor: pointer;
-	// text-decoration: blue underline;
-	color: rgb(0, 118, 228);
-	cursor: pointer;
-}
-
-.dataDiv {
-	overflow-x: auto;
-}
-
 .selectedSpan {
-	border: 1px solid rgb(255, 187, 0);
+	border: 2px solid rgb(255, 187, 0);
 	color: rgb(255, 187, 0);
 }
 </style>

From 28447c4a6c59f7a4f1469fd0c14341db685ddace Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 9 Jan 2025 20:51:24 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A0=B8?=
 =?UTF-8?q?=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hard/hard-after-sale.ts               |  20 +-
 src/views/hard/hard-after-sale/form.vue       | 257 +++++++++---------
 src/views/hard/hard-after-sale/index.vue      | 111 +++++---
 .../hard/hard-after-sale/order-refund.vue     | 101 ++++++-
 .../hard/hard-after-sale/refund-reject.vue    |  70 +++++
 src/views/hard/hard-order/index.vue           |  46 +++-
 src/views/wallet/wallet-cz/index.vue          |  25 +-
 src/views/wallet/wallet-tk/index.vue          |  58 +++-
 src/views/wallet/wallet-xf/index.vue          |  53 +++-
 9 files changed, 521 insertions(+), 220 deletions(-)
 create mode 100644 src/views/hard/hard-after-sale/refund-reject.vue

diff --git a/src/api/hard/hard-after-sale.ts b/src/api/hard/hard-after-sale.ts
index cbc6571..2462cb0 100644
--- a/src/api/hard/hard-after-sale.ts
+++ b/src/api/hard/hard-after-sale.ts
@@ -9,6 +9,23 @@ export function history(query?: Object) {
   })
 }
 
+export function agree(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale/agree',
+    method: 'put',
+    params: obj
+  })
+}
+
+export function disagree(obj?: Object) {
+  return request({
+    url: '/hard/hard-after-sale/disagree',
+    method: 'post',
+    data: obj
+  })
+}
+
+
 export function detailByOrderId(query?: Object) {
   return request({
     url: '/hard/hard-after-sale/detail-by-order-id',
@@ -17,9 +34,10 @@ export function detailByOrderId(query?: Object) {
   })
 }
 
+
 export function pageJoin(query?: Object) {
   return request({
-    url: '/hard/hard-after-sale/page',
+    url: '/hard/hard-after-sale/page-join',
     method: 'get',
     params: query
   })
diff --git a/src/views/hard/hard-after-sale/form.vue b/src/views/hard/hard-after-sale/form.vue
index c7156de..8527166 100644
--- a/src/views/hard/hard-after-sale/form.vue
+++ b/src/views/hard/hard-after-sale/form.vue
@@ -1,119 +1,118 @@
 <template>
-    <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
-      :close-on-click-modal="false" draggable>
-      <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
-       <el-row :gutter="24">
-    <el-col :span="12" class="mb20">
-      <el-form-item label="售后单号" prop="no">
-        <el-input v-model="form.no" placeholder="请输入售后单号"/>
-      </el-form-item>
-      </el-col>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="12" class="mb20">
+          <el-form-item label="售后单号" prop="no">
+            <el-input v-model="form.no" placeholder="请输入售后单号" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="售后类型" prop="type">
-        <el-input v-model="form.type" placeholder="请输入售后类型"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="售后类型" prop="type">
+            <el-input v-model="form.type" placeholder="请输入售后类型" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="售后状态" prop="status">
-        <el-input v-model="form.status" placeholder="请输入售后状态"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="售后状态" prop="status">
+            <el-input v-model="form.status" placeholder="请输入售后状态" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="售后方式" prop="way">
-        <el-input v-model="form.way" placeholder="请输入售后方式"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="售后方式" prop="way">
+            <el-input v-model="form.way" placeholder="请输入售后方式" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="用户id" prop="userId">
-        <el-input v-model="form.userId" placeholder="请输入用户id"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="用户id" prop="userId">
+            <el-input v-model="form.userId" placeholder="请输入用户id" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="申请原因" prop="applyReason">
-        <el-input v-model="form.applyReason" placeholder="请输入申请原因"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="申请原因" prop="applyReason">
+            <el-input v-model="form.applyReason" placeholder="请输入申请原因" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="补充描述" prop="applyDescription">
-        <el-input v-model="form.applyDescription" placeholder="请输入补充描述"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="补充描述" prop="applyDescription">
+            <el-input v-model="form.applyDescription" placeholder="请输入补充描述" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="补充凭证图片" prop="applyPicUrls">
-        <el-input v-model="form.applyPicUrls" placeholder="请输入补充凭证图片"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="补充凭证图片" prop="applyPicUrls">
+            <el-input v-model="form.applyPicUrls" placeholder="请输入补充凭证图片" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="订单编号" prop="orderId">
-        <el-input v-model="form.orderId" placeholder="请输入订单编号"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="订单编号" prop="orderId">
+            <el-input v-model="form.orderId" placeholder="请输入订单编号" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="订单流水号" prop="orderNo">
-        <el-input v-model="form.orderNo" placeholder="请输入订单流水号"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="订单流水号" prop="orderNo">
+            <el-input v-model="form.orderNo" placeholder="请输入订单流水号" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="审批时间" prop="auditTime">
-        <el-input v-model="form.auditTime" placeholder="请输入审批时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="审批时间" prop="auditTime">
+            <el-input v-model="form.auditTime" placeholder="请输入审批时间" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="审批人" prop="auditUserId">
-        <el-input v-model="form.auditUserId" placeholder="请输入审批人"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="审批人" prop="auditUserId">
+            <el-input v-model="form.auditUserId" placeholder="请输入审批人" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="审批备注" prop="auditReason">
-        <el-input v-model="form.auditReason" placeholder="请输入审批备注"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="审批备注" prop="auditReason">
+            <el-input v-model="form.auditReason" placeholder="请输入审批备注" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="退款金额，单位：分" prop="refundPrice">
-        <el-input v-model="form.refundPrice" placeholder="请输入退款金额，单位：分"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="退款金额，单位：分" prop="refundPrice">
+            <el-input v-model="form.refundPrice" placeholder="请输入退款金额，单位：分" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="支付退款编号" prop="payRefundId">
-        <el-input v-model="form.payRefundId" placeholder="请输入支付退款编号"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付退款编号" prop="payRefundId">
+            <el-input v-model="form.payRefundId" placeholder="请输入支付退款编号" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="退款时间" prop="refundTime">
-        <el-input v-model="form.refundTime" placeholder="请输入退款时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="退款时间" prop="refundTime">
+            <el-input v-model="form.refundTime" placeholder="请输入退款时间" />
+          </el-form-item>
+        </el-col>
 
-    <el-col :span="12" class="mb20">
-      <el-form-item label="退货时间" prop="deliveryTime">
-        <el-input v-model="form.deliveryTime" placeholder="请输入退货时间"/>
-      </el-form-item>
-      </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="退货时间" prop="deliveryTime">
+            <el-input v-model="form.deliveryTime" placeholder="请输入退货时间" />
+          </el-form-item>
+        </el-col>
 
-			</el-row>
-      </el-form>
-      <template #footer>
-        <span class="dialog-footer">
-          <el-button @click="visible = false">取消</el-button>
-          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
-        </span>
-      </template>
-    </el-dialog>
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script setup lang="ts" name="HardAfterSaleDialog">
@@ -131,24 +130,24 @@ const loading = ref(false)
 
 // 提交表单数据
 const form = reactive({
-		id:'',
-	  no: '',
-	  type: '',
-	  status: '',
-	  way: '',
-	  userId: '',
-	  applyReason: '',
-	  applyDescription: '',
-	  applyPicUrls: '',
-	  orderId: '',
-	  orderNo: '',
-	  auditTime: '',
-	  auditUserId: '',
-	  auditReason: '',
-	  refundPrice: '',
-	  payRefundId: '',
-	  refundTime: '',
-	  deliveryTime: '',
+  id: '',
+  no: '',
+  type: '',
+  status: '',
+  way: '',
+  userId: '',
+  applyReason: '',
+  applyDescription: '',
+  applyPicUrls: '',
+  orderId: '',
+  orderNo: '',
+  auditTime: '',
+  auditUserId: '',
+  auditReason: '',
+  refundPrice: '',
+  payRefundId: '',
+  refundTime: '',
+  deliveryTime: '',
 });
 
 // 定义校验规则
@@ -161,9 +160,9 @@ const openDialog = (id: string) => {
   form.id = ''
 
   // 重置表单数据
-	nextTick(() => {
-		dataFormRef.value?.resetFields();
-	});
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
 
   // 获取hardAfterSale信息
   if (id) {
@@ -174,18 +173,18 @@ const openDialog = (id: string) => {
 
 // 提交
 const onSubmit = async () => {
-	const valid = await dataFormRef.value.validate().catch(() => {});
-	if (!valid) return false;
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
 
-	try {
+  try {
     loading.value = true;
-		form.id ? await putObj(form) : await addObj(form);
-		useMessage().success(form.id ? '修改成功' : '添加成功');
-		visible.value = false;
-		emit('refresh');
-	} catch (err: any) {
-		useMessage().error(err.msg);
-	} finally {
+    form.id ? await putObj(form) : await addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
     loading.value = false;
   }
 };
diff --git a/src/views/hard/hard-after-sale/index.vue b/src/views/hard/hard-after-sale/index.vue
index d43c936..9b529b2 100644
--- a/src/views/hard/hard-after-sale/index.vue
+++ b/src/views/hard/hard-after-sale/index.vue
@@ -1,38 +1,73 @@
 <template>
   <div class="layout-padding">
     <div class="layout-padding-auto layout-padding-view">
-      <el-row>
-        <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'hard_hardAfterSale_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary"
-            v-auth="'hard_hardAfterSale_del'" @click="handleDelete(selectObjs)">
-            删除
-          </el-button>
-          <right-toolbar v-model:showSearch="showSearch" :export="'hard_hardAfterSale_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 
-        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-				@selection-change="selectionChangHandle"
+      <el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+        <el-row :gutter="24">
+          <el-col :span="4">
+            <el-form-item class="w100" label="用户" prop="userIds">
+              <select-user v-model="state.queryForm.userIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="退款状态" prop="status">
+              <dict-select v-model="state.queryForm.status" dict-code="hard_sale_status" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="w100" label="申请时间" prop="createTimeList">
+              <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD" type="daterange" />
+            </el-form-item>
+          </el-col>
+          <el-form-item>
+            <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-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="40" />
-          <el-table-column prop="userId" label="用户id"  show-overflow-tooltip/>
-          <el-table-column prop="applyReason" label="申请原因"  show-overflow-tooltip/>
-          <el-table-column prop="applyDescription" label="补充描述"  show-overflow-tooltip/>
-          <el-table-column prop="applyPicUrls" label="补充凭证图片"  show-overflow-tooltip/>
-          <el-table-column prop="orderId" label="订单编号"  show-overflow-tooltip/>
-          <el-table-column prop="orderNo" label="订单流水号"  show-overflow-tooltip/>
-        <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'hard_hardAfterSale_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+        <el-table-column prop="username" label="用户" />
+        <el-table-column prop="userAvatar" label="头像">
+          <template #default="{ row }">
+            <preview-image :src="row.userAvatar" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="userMobile" width="120" label="手机号" />
+        <el-table-column label="支付金额" align="center" prop="practicalTotalPrice">
+          <template #default="{ row }">
+            <span class="color-primary">
+              {{ displayPrice(row.orderPayPrice) }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款金额" align="center">
+          <template #default="{ row }">
+            <span class="color-success">
+              {{ displayPrice(row.refundPrice) }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="退款状态" align="center">
+          <template #default="{ row }">
+            <dict-tag :options="hard_sale_status" :value="row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" align="center" width="180px" prop="createTime" />
+        <el-table-column label="操作" width="200">
+          <template #default="{ row }">
+            <el-button icon="ShoppingCartFull" text type="primary"
+              @click="shopCarDialogRef.openDialog(row.orderId)">购物车</el-button>
+            <el-button icon="WalletFilled" link type="primary" @click="doRefund(row)">
+              退款
+            </el-button>
+            <el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'hard_hardAfterSale_edit'"
+              @click="formDialogRef.openDialog(row.id)">编辑</el-button>
+            <el-button v-if="false" icon="delete" text type="primary" v-auth="'hard_hardAfterSale_del'"
+              @click="handleDelete([row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -41,22 +76,25 @@
 
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
-
+    <shop-car ref="shopCarDialogRef" />
   </div>
 </template>
 
 <script setup lang="ts" name="systemHardAfterSale">
 import { BasicTableProps, useTable } from "/@/hooks/table";
-import { pageJoin, delObjs } from  '/@/api/hard/hard-after-sale'
+import { pageJoin, delObjs } from '/@/api/hard/hard-after-sale'
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const ShopCar = defineAsyncComponent(() => import('../components/shop-car.vue'));
 // 定义查询字典
-
+const { hard_sale_status } = useDict("hard_sale_status")
 // 定义变量内容
 const formDialogRef = ref()
+const shopCarDialogRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)
@@ -64,6 +102,8 @@ const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 
+const { push } = useRouter()
+
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
   pageList: pageJoin
@@ -76,7 +116,7 @@ const {
   sizeChangeHandle,
   sortChangeHandle,
   downBlobFile,
-	tableStyle
+  tableStyle
 } = useTable(state)
 
 // 清空搜索条件
@@ -99,6 +139,11 @@ const selectionChangHandle = (objs: { id: string }[]) => {
   multiple.value = !objs.length;
 };
 
+const doRefund = (row: any) => {
+  push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.orderId, type: "apply" } })
+}
+
+
 // 删除操作
 const handleDelete = async (ids: string[]) => {
   try {
diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue
index 761d794..372f0e1 100644
--- a/src/views/hard/hard-after-sale/order-refund.vue
+++ b/src/views/hard/hard-after-sale/order-refund.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="layout-padding">
-        <div class="layout-padding-auto layout-padding-view">
+        <div v-loading="loading" class="layout-padding-auto layout-padding-view" style="overflow: scroll !important;">
             <el-descriptions :column="3" border title="订单信息">
                 <el-descriptions-item :span="3" label="订单号: ">
                     {{ globalData.detail.id }}
@@ -63,11 +63,62 @@
                     </el-table>
                 </el-descriptions-item>
             </el-descriptions>
-            <el-descriptions v-if="globalData.afterSaleData.id" title="售后信息">
+
+            <!-- 退款状态 -->
+            <el-descriptions v-if="globalData.afterSaleData.id" :column="2" border title="退款状态">
+                <el-descriptions-item :column="1" label="退款状态: ">
+                    <dict-tag :options="hard_sale_status" :value="globalData.afterSaleData.status" />
+                </el-descriptions-item>
+                <el-descriptions-item :column="1"
+                    v-if="globalData.type == 'apply' && globalData.afterSaleData.status == 10" label="操作: "
+                    label-class-name="no-colon">
+                    <div class="flex justify-evenly">
+                        <el-button type="primary" @click="agree">
+                            同意售后
+                        </el-button>
+                        <el-button type="danger" @click="refundRejectRef.openDialog(globalData.detail.id)">
+                            拒绝售后
+                        </el-button>
+                    </div>
+                </el-descriptions-item>
             </el-descriptions>
+
+            <el-descriptions v-if="globalData.afterSaleData.id" border title="售后信息">
+                <el-descriptions-item :span="3" label="退款编号: ">
+                    {{ globalData.afterSaleData.no }}
+                </el-descriptions-item>
+                <el-descriptions-item label="售后类型: ">
+                    <dict-tag :options="hard_after_sale_type" :value="globalData.afterSaleData.type" />
+                </el-descriptions-item>
+                <el-descriptions-item label="售后方式: ">
+                    <dict-tag :options="hard_after_sale_way" :value="globalData.afterSaleData.way" />
+                </el-descriptions-item>
+                <el-descriptions-item label="退款金额: ">
+                    {{ displayPrice(globalData.afterSaleData.refundPrice) }}
+                </el-descriptions-item>
+                <el-descriptions-item label="退款原因: ">
+                    {{ globalData.afterSaleData.applyReason }}
+                </el-descriptions-item>
+                <el-descriptions-item label="补充描述: ">
+                    {{ globalData.afterSaleData.applyDescription }}
+                </el-descriptions-item>
+            </el-descriptions>
+
             <el-descriptions v-if="globalData.log && globalData.log.length" title="售后日志">
+                <el-descriptions-item labelClassName="no-colon">
+                    <el-timeline>
+                        <el-timeline-item v-for="v in globalData.log" :key="v.id" :timestamp="v.createTime"
+                            placement="top">
+                            <div class="el-timeline-right-content">
+                                <span>{{ v.content }}</span>
+                            </div>
+                        </el-timeline-item>
+                    </el-timeline>
+                </el-descriptions-item>
             </el-descriptions>
         </div>
+
+        <refund-reject-form ref="refundRejectRef" @refresh="getDetail" />
     </div>
 </template>
 
@@ -78,16 +129,20 @@ import { useDict } from '/@/hooks/dict';
 import * as hardOrder from "/@/api/hard/hard-order";
 import * as hardCar from "/@/api/hard/hard-car";
 import * as hardAfterSaleApi from '/@/api/hard/hard-after-sale'
-import * as hardAfterSaleLogApi from '/@/api/hard/hard-after-sale-log'
 import { displayPrice } from "/@/utils/formatMoney"
-import { data } from "autoprefixer";
+import { ElLoading } from 'element-plus'
+
+// 引入组件
+const RefundRejectForm = defineAsyncComponent(() => import('./refund-reject.vue'));
 
 // 定义查询字典
-const { hard_pay_type, hard_order_type, hard_order_status, hard_type } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type")
+const { hard_pay_type, hard_order_type, hard_order_status, hard_after_sale_way, hard_after_sale_type, hard_sale_status } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_after_sale_way", "hard_after_sale_type", "hard_sale_status")
 
 const { query } = useRoute()
-
+const refundRejectRef = ref()
+const loading = ref(false)
 const globalData = reactive<any>({
+    type: "",
     detail: {},
     afterSaleData: {},
     log: []
@@ -106,9 +161,29 @@ const state: BasicTableProps = reactive<BasicTableProps>({
 const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state)
 
 onMounted(async () => {
+    const type = query.type as unknown as any
+    if (type) {
+        globalData.type = type
+    }
     await getDetail()
 })
 
+const agree = async () => {
+    let loading: any = null
+    try {
+        await useMessage().delConfirm("是否同意售后？")
+        loading = ElLoading.service({
+            lock: true,
+            text: '提交中',
+            background: 'rgba(0, 0, 0, 0.7)',
+        })
+        await hardAfterSaleApi.agree({ id: globalData.afterSaleData.id })
+        await getDetail()
+    } finally {
+        setTimeout(() => loading.close(), 1000)
+    }
+}
+
 const getDetail = async () => {
     const id = query.id as unknown as any
     if (!id) return
@@ -119,7 +194,7 @@ const getDetail = async () => {
     const { data: afterSaleData } = await hardAfterSaleApi.detailByOrderId({ orderId: id })
     if (afterSaleData && afterSaleData.id) {
         globalData.afterSaleData = afterSaleData
-        const { data: log } = await hardAfterSaleApi.history(afterSaleData.id)
+        const { data: log } = await hardAfterSaleApi.history({ id: afterSaleData.id })
         globalData.log = log
     }
 }
@@ -178,29 +253,29 @@ const getDetail = async () => {
         align-items: center;
         min-height: 30px;
         padding: 10px;
-        background-color: var(--app-content-bg-color);
+        background-color: #409eff;
 
         &::before {
             position: absolute;
             top: 10px;
             left: 13px;
-            border-color: transparent var(--app-content-bg-color) transparent transparent;
-            /* 尖角颜色，左侧朝向 */
+            border-color: transparent #409eff transparent transparent;
             border-style: solid;
             border-width: 8px;
-            /* 调整尖角大小 */
             content: '';
         }
     }
 
-    .dot-node-style {
+    .el-timeline-item__node {
         position: absolute;
         left: -5px;
+        top: -50%;
+        transform: translateY(100%);
         display: flex;
         width: 20px;
         height: 20px;
         font-size: 10px;
-        color: #fff;
+        background: #409eff;
         border-radius: 50%;
         justify-content: center;
         align-items: center;
diff --git a/src/views/hard/hard-after-sale/refund-reject.vue b/src/views/hard/hard-after-sale/refund-reject.vue
new file mode 100644
index 0000000..2dcc35c
--- /dev/null
+++ b/src/views/hard/hard-after-sale/refund-reject.vue
@@ -0,0 +1,70 @@
+<template>
+    <el-dialog title="拒绝售后" v-model="visible" width="45%" :close-on-click-modal="false" draggable>
+        <el-form ref="dataFormRef" :model="form" label-width="80px" :rules="dataRules" v-loading="loading">
+            <el-form-item label="审批备注" prop="auditReason">
+                <el-input v-model="form.auditReason" :rows="3" placeholder="请输入审批备注" type="textarea" />
+            </el-form-item>
+        </el-form>
+        <template #footer>
+            <el-button type="primary" @click="onSubmit">确 定</el-button>
+            <el-button @click="visible = false">取 消</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="refund-reject">
+import { useMessage } from "/@/hooks/message";
+import * as hardAfterSaleApi from '/@/api/hard/hard-after-sale'
+
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+
+const form = reactive<any>({
+    id: undefined,
+    auditReason: "",
+})
+
+// 定义校验规则
+const dataRules = ref({
+    auditReason: [{ required: true, message: '请输入拒绝原因', trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = async (id: string) => {
+    visible.value = true
+    form.id = ''
+    if (!id) return
+    nextTick(() => {
+        dataFormRef.value?.resetFields();
+    });
+    form.id = id
+    const { data } = await hardAfterSaleApi.detailByOrderId({ orderId: id })
+    Object.assign(form, data)
+};
+
+// 提交
+const onSubmit = async () => {
+    const valid = await dataFormRef.value.validate().catch(() => { });
+    if (!valid) return false;
+    try {
+        loading.value = true;
+        await hardAfterSaleApi.disagree(form);
+        useMessage().success(form.id ? '修改成功' : '添加成功');
+        visible.value = false;
+        emit('refresh');
+    } catch (err: any) {
+        useMessage().error(err.msg);
+    } finally {
+        loading.value = false;
+    }
+};
+
+// 暴露变量
+defineExpose({
+    openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index ad3d9a6..bc59cc4 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -8,6 +8,16 @@
               <select-user v-model="state.queryForm.userIds" />
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item class="w100" label="商户" prop="mchIds">
+              <select-mch v-model="state.queryForm.mchIds" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item class="w100" label="创建时间" prop="payTimeList">
+              <el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
+            </el-form-item>
+          </el-col>
           <el-form-item>
             <el-button icon="Search" type="primary" @click="getDataList">{{ $t('common.queryBtn')
               }}</el-button>
@@ -78,7 +88,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column width="200px" label="订单信息">
+        <el-table-column width="200px" label="付款信息">
           <template #default="{ row }">
             <div class="status">
               <span>商品总价</span>
@@ -100,15 +110,35 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column width="270px" label="退款信息">
+          <template #default="{ row }">
+            <div class="status">
+              <span>退款金额</span>
+              <span class="color-success">
+                {{ displayPrice(row.refundPrice) }}
+              </span>
+            </div>
+            <div class="status">
+              <span>退款状态</span>
+              <span class="color-success">
+                <dict-tag :options="hard_refund_status" :value="row.refundStatus" />
+              </span>
+            </div>
+            <div class="status">
+              <span>退款时间</span>
+              <span>
+                {{ row.refundTime }}
+              </span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column label="支付时间" align="center" prop="payTime" width="180px" />
         <el-table-column label="操作" width="200">
           <template #default="{ row }">
             <el-button icon="ShoppingCartFull" text type="primary"
               @click="shopCarDialogRef.openDialog(row.id)">购物车</el-button>
-            <el-button icon="WalletFilled"
-              v-if="!row.payRefundId && row.orderType != 3 && row.orderType != 4 && ['5', '10'].includes(row.orderStatus)"
-              link type="primary" @click="doRefund(row)">
-              退款
+            <el-button icon="InfoFilled" link type="primary" @click="doRefund(row)">
+              详情
             </el-button>
             <el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'hard_hardwareOrder_edit'"
               @click="formDialogRef.openDialog(row.id)">编辑</el-button>
@@ -119,11 +149,9 @@
       </el-table>
       <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
     </div>
-
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
     <shop-car ref="shopCarDialogRef" />
-
   </div>
 </template>
 
@@ -142,7 +170,7 @@ const { push } = useRouter()
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 const ShopCar = defineAsyncComponent(() => import('../components/shop-car.vue'));
 // 定义查询字典
-const { hard_pay_type, hard_order_type, hard_order_status, hard_type } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type")
+const { hard_pay_type, hard_order_type, hard_order_status, hard_type, hard_refund_status } = useDict("hard_pay_type", "hard_order_type", "hard_order_status", "hard_type", "hard_refund_status")
 // 定义变量内容
 const formDialogRef = ref()
 const shopCarDialogRef = ref()
@@ -191,7 +219,7 @@ const handleClick = (e: any) => {
 }
 
 const doRefund = (row: any) => {
-  push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.id } })
+  push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.id, type: "view" } })
 }
 
 // 导出excel
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index b220965..debab62 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -8,15 +8,18 @@
               <select-user v-model="state.queryForm.userIds" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+          <el-col :span="6">
+            <el-form-item class="w100" label="充值时间" prop="payTimeList">
+              <el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
             </el-form-item>
           </el-col>
           <el-form-item>
-            <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-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>
@@ -32,13 +35,13 @@
         @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 prop="userAvatar" label="头像" >
+        <el-table-column prop="username" label="用户" />
+        <el-table-column prop="userAvatar" label="头像">
           <template #default="{ row }">
             <preview-image :src="row.userAvatar" />
           </template>
         </el-table-column>
-        <el-table-column prop="userMobile" width="120" label="手机号"  />
+        <el-table-column prop="userMobile" width="120" label="手机号" />
         <el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡类型">
           <template #default="{ row }">
             <div class="flex items-center justify-center">
@@ -59,8 +62,8 @@
             <div class="color-primary">{{ displayPrice(row.balance) }}</div>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" width="200" label="创建时间" show-overflow-tooltip />
-        <el-table-column label="操作" width="150">
+        <el-table-column prop="createTime" width="200" label="充值时间" />
+        <el-table-column v-if="false" label="操作" width="150">
           <template #default="scope">
             <el-button icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
               @click="handleDelete([scope.row.id])">删除</el-button>
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index 2716e1b..36a4985 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -8,15 +8,18 @@
               <select-user v-model="state.queryForm.userIds" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+          <el-col :span="6">
+            <el-form-item class="w100" label="退款时间" prop="payTimeList">
+              <el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
             </el-form-item>
           </el-col>
           <el-form-item>
-            <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-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>
@@ -39,12 +42,31 @@
           </template>
         </el-table-column>
         <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡类型">
+          <template #default="{ row }">
+            <div class="flex items-center justify-center">
+              <div class="color-primary">{{ row.walletTypeName }}</div>
+              <div class="flex items-center just ml5">
+                <dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="退款金额">
+          <template #default="{ row }">
+            <div class="color-success">{{ displayPrice(row.price) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" width="200" label="退款时间" />
         <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRecharge_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
-              @click="handleDelete([scope.row.id])">删除</el-button>
+          <template #default="{ row }">
+            <el-button icon="InfoFilled" link type="primary" @click="doRefund(row)">
+              详情
+            </el-button>
+            <el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'wallet_walletRecharge_edit'"
+              @click="formDialogRef.openDialog(row.id)">编辑</el-button>
+            <el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
+              @click="handleDelete([row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -62,11 +84,13 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
 import { pageTk } from "/@/api/wallet/wallet-transaction";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
+import * as hardAfterSaleApi from '/@/api/hard/hard-after-sale'
+import { displayPrice } from "/@/utils/formatMoney"
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-
+const { wallet_type } = useDict('wallet_type');
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -76,6 +100,8 @@ const showSearch = ref(true)
 const selectObjs = ref([]) as any
 const multiple = ref(true)
 
+const { push } = useRouter()
+
 const state: BasicTableProps = reactive<BasicTableProps>({
   queryForm: {},
   pageList: pageTk
@@ -100,6 +126,14 @@ const resetQuery = () => {
   getDataList()
 }
 
+const doRefund = async (row: any) => {
+  const { data } = await hardAfterSaleApi.getObj(row.bizId)
+  if (!data) { 
+    useMessage().error("查看错误")
+  }
+  push({ path: '/hard/hard-after-sale/order-refund', query: { id: data.orderId, type: "view" } })
+}
+
 // 导出excel
 const exportExcel = () => {
   downBlobFile('/wallet/walletRecharge/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletRecharge.xlsx')
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index ac12074..edca1db 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -8,15 +8,18 @@
               <select-user v-model="state.queryForm.userIds" />
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
-              <select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+          <el-col :span="6">
+            <el-form-item class="w100" label="消费时间" prop="payTimeList">
+              <el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD" type="daterange" />
             </el-form-item>
           </el-col>
           <el-form-item>
-            <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-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>
@@ -39,12 +42,31 @@
           </template>
         </el-table-column>
         <el-table-column prop="userMobile" width="120" label="手机号" show-overflow-tooltip />
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="饭卡类型">
+          <template #default="{ row }">
+            <div class="flex items-center justify-center">
+              <div class="color-primary">{{ row.walletTypeName }}</div>
+              <div class="flex items-center just ml5">
+                <dict-tag :options="wallet_type" :value="row.walletTypeUniqueCode" />
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="walletTypeUniqueCode" width="200" label="消费金额">
+          <template #default="{ row }">
+            <div class="color-danger">{{ displayPrice(row.price) }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" width="200" label="消费时间" />
         <el-table-column label="操作" width="150">
-          <template #default="scope">
-            <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRecharge_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
-            <el-button icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
-              @click="handleDelete([scope.row.id])">删除</el-button>
+          <template #default="{row}">
+            <el-button icon="InfoFilled" link type="primary" @click="doRefund(row)">
+              详情
+            </el-button>
+            <el-button v-if="false" icon="edit-pen" text type="primary" v-auth="'wallet_walletRecharge_edit'"
+              @click="formDialogRef.openDialog(row.id)">编辑</el-button>
+            <el-button v-if="false" icon="delete" text type="primary" v-auth="'wallet_walletRecharge_del'"
+              @click="handleDelete([row.id])">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -62,11 +84,14 @@ import { BasicTableProps, useTable } from "/@/hooks/table";
 import { pageXf } from "/@/api/wallet/wallet-transaction";
 import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
+
+const { push } = useRouter()
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-
+const { wallet_type } = useDict('wallet_type');
 // 定义变量内容
 const formDialogRef = ref()
 // 搜索变量
@@ -105,6 +130,10 @@ const exportExcel = () => {
   downBlobFile('/wallet/walletRecharge/export', Object.assign(state.queryForm, { ids: selectObjs }), 'walletRecharge.xlsx')
 }
 
+const doRefund = (row: any) => {
+  push({ path: '/hard/hard-after-sale/order-refund', query: { id: row.bizId, type: "view" } })
+}
+
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
   selectObjs.value = objs.map(({ id }) => id);

From 5f757796c804fc2b4ca14e7a324010dea3d988ab Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 10 Jan 2025 11:23:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?feat:=E5=95=86=E6=88=B7=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                    |  8 +--
 .prettierrc                         |  8 +++
 src/api/wallet/mch-manage.ts        | 52 +++++++++----------
 src/components/Select/SelectMch.vue | 63 +++++++++++++----------
 vite.config.ts                      | 78 ++++++++++++++---------------
 5 files changed, 113 insertions(+), 96 deletions(-)
 create mode 100644 .prettierrc

diff --git a/.env.development b/.env.development
index 639afc5..84d07a4 100644
--- a/.env.development
+++ b/.env.development
@@ -8,15 +8,15 @@ VITE_OPEN = true
 ENV = 'development'
 
 # ADMIN 服务地址
-VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
+# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/
 # VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/
-# VITE_ADMIN_PROXY_PATH = http://localhost:9999/
+VITE_ADMIN_PROXY_PATH = http://localhost:9999/
 # VITE_ADMIN_PROXY_PATH = http://192.168.101.29:9999/ # 邓-本地
 
 # 图片访问基础地址
-VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
+# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc
-# VITE_IMAGE_BASE_PATH = http://localhost:9999
+VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 
 # 代码生成服务地址
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 0000000..5e07d0e
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,8 @@
+{
+  "tabWidth": 2,
+  "useTabs": true,
+  "trailingComma": "all",
+  "semi": false,
+  "singleQuote": false,
+  "printWidth": 120
+}
\ No newline at end of file
diff --git a/src/api/wallet/mch-manage.ts b/src/api/wallet/mch-manage.ts
index 864d6cd..fd9bf27 100644
--- a/src/api/wallet/mch-manage.ts
+++ b/src/api/wallet/mch-manage.ts
@@ -1,58 +1,58 @@
-import request from '/@/utils/request';
+import request from "/@/utils/request"
 
-export function pageJoinSelect(query?: Object) {
+export function select(query?: Object) {
 	return request({
-		url: '/wallet/mch-manage/page-join-select',
-		method: 'get',
+		url: "/wallet/mch-manage/select",
+		method: "get",
 		params: query,
-	});
+	})
 }
 
 export function pageJoin(query?: Object) {
 	return request({
-		url: '/wallet/mch-manage/page-join',
-		method: 'get',
+		url: "/wallet/mch-manage/page-join",
+		method: "get",
 		params: query,
-	});
+	})
 }
 
 export function fetchList(query?: Object) {
 	return request({
-		url: '/wallet/mch-manage/page',
-		method: 'get',
+		url: "/wallet/mch-manage/page",
+		method: "get",
 		params: query,
-	});
+	})
 }
 
 export function addObj(obj?: Object) {
 	return request({
-		url: '/wallet/mch-manage',
-		method: 'post',
+		url: "/wallet/mch-manage",
+		method: "post",
 		data: obj,
-	});
+	})
 }
 
 export function getObj(id?: string) {
 	return request({
-		url: '/wallet/mch-manage/' + id,
-		method: 'get',
-	});
+		url: "/wallet/mch-manage/" + id,
+		method: "get",
+	})
 }
 
 export function delObjs(ids?: Object) {
 	return request({
-		url: '/wallet/mch-manage',
-		method: 'delete',
+		url: "/wallet/mch-manage",
+		method: "delete",
 		data: ids,
-	});
+	})
 }
 
 export function putObj(obj?: Object) {
 	return request({
-		url: '/wallet/mch-manage',
-		method: 'put',
+		url: "/wallet/mch-manage",
+		method: "put",
 		data: obj,
-	});
+	})
 }
 
 /**
@@ -61,10 +61,10 @@ export function putObj(obj?: Object) {
  */
 export function selectMerchantList(type?: string) {
 	return request({
-		url: '/wallet/mch-manage/selectMerchantList',
-		method: 'get',
+		url: "/wallet/mch-manage/selectMerchantList",
+		method: "get",
 		params: {
 			type: type,
 		},
-	});
+	})
 }
diff --git a/src/components/Select/SelectMch.vue b/src/components/Select/SelectMch.vue
index 307856d..509095e 100644
--- a/src/components/Select/SelectMch.vue
+++ b/src/components/Select/SelectMch.vue
@@ -1,7 +1,16 @@
 <template>
-	<el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder" clearable
-		remote-show-suffix filterable remote :remote-method="remoteSearch" :loading="state.loading"
-		@visible-change="(e: boolean) => e && getOptions()">
+	<el-select
+		style="width: 100%"
+		v-model="state.selectId"
+		:placeholder="props.placeholder"
+		clearable
+		remote-show-suffix
+		filterable
+		remote
+		:remote-method="remoteSearch"
+		:loading="state.loading"
+		@visible-change="(e: boolean) => e && getOptions()"
+	>
 		<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
@@ -16,62 +25,62 @@
 </template>
 
 <script setup lang="ts" name="select-merchant">
-import { reactive, computed, defineModel, withDefaults, defineProps } from 'vue';
-import * as mchApi from '/@/api/wallet/mch-manage';
+import { reactive, defineModel, withDefaults, defineProps } from "vue"
+import * as mchApi from "/@/api/wallet/mch-manage"
 
-const selectId = defineModel();
+const selectId = defineModel()
 
 export type Props = {
-	placeholder?: string;
-};
+	placeholder?: string
+}
 const props = withDefaults(defineProps<Props>(), {
-	placeholder: '请选择',
-});
+	placeholder: "请选择",
+})
 
 const queryForm = reactive<any>({
-	name: '',
+	name: null,
 	current: 1,
 	size: 10,
-});
+})
 
 const state = reactive<any>({
 	loading: true,
 	selectId: selectId,
 	options: [],
-});
+})
 
 watch(
 	selectId,
 	(newVal, oldValue) => {
-		if (newVal == oldValue) return;
-		state.selectId = newVal;
-		getOptions();
+		if (newVal == oldValue) return
+		state.selectId = newVal
+		getOptions()
 	},
-	{ immediate: true }
-);
+	{ immediate: true },
+)
 
 async function getOptions() {
 	try {
-		state.loading = true;
+		state.loading = true
 		const _pa = {
 			...queryForm,
-		};
-		const { data } = await mchApi.pageJoinSelect(_pa);
-		state.options = data.records ?? [];
+		}
+		const { data } = await mchApi.select(_pa)
+		state.options = data.records ?? []
 	} finally {
-		setTimeout(() => (state.loading = false), 500);
+		setTimeout(() => (state.loading = false), 500)
 	}
 }
 
 function remoteSearch(params: string) {
 	if (params != queryForm.name) {
-		queryForm.name = params;
-		getOptions();
+		queryForm.name = params
+		getOptions()
 	}
 }
 
 function clear() {
-	state.selectId = null;
-	getOptions();
+	state.selectId = null
+	getOptions()
 }
 </script>
diff --git a/vite.config.ts b/vite.config.ts
index 8fbe8e0..c7048f0 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,44 +1,44 @@
-import vue from '@vitejs/plugin-vue';
-import { resolve } from 'path';
-import { defineConfig, loadEnv, ConfigEnv } from 'vite';
-import vueSetupExtend from 'vite-plugin-vue-setup-extend';
-import AutoImport from 'unplugin-auto-import/vite';
-import topLevelAwait from 'vite-plugin-top-level-await';
-import { createStyleImportPlugin, VxeTableResolve } from 'vite-plugin-style-import';
-import viteCompression from 'vite-plugin-compression';
+import vue from "@vitejs/plugin-vue"
+import { resolve } from "path"
+import { defineConfig, loadEnv, ConfigEnv } from "vite"
+import vueSetupExtend from "vite-plugin-vue-setup-extend"
+import AutoImport from "unplugin-auto-import/vite"
+import topLevelAwait from "vite-plugin-top-level-await"
+import { createStyleImportPlugin, VxeTableResolve } from "vite-plugin-style-import"
+import viteCompression from "vite-plugin-compression"
 // @ts-ignore
-import { svgBuilder } from '/@/components/IconSelector/index';
+import { svgBuilder } from "/@/components/IconSelector/index"
 
-import dns from 'node:dns';
-dns.setDefaultResultOrder('verbatim');
+import dns from "node:dns"
+dns.setDefaultResultOrder("verbatim")
 
 const pathResolve = (dir: string) => {
-	return resolve(__dirname, '.', dir);
-};
+	return resolve(__dirname, ".", dir)
+}
 
 const alias: Record<string, string> = {
-	'/@': pathResolve('./src/'),
-	'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
-};
+	"/@": pathResolve("./src/"),
+	"vue-i18n": "vue-i18n/dist/vue-i18n.cjs.js",
+}
 
 const viteConfig = defineConfig((mode: ConfigEnv) => {
-	const env = loadEnv(mode.mode, process.cwd());
+	const env = loadEnv(mode.mode, process.cwd())
 	// 判断是否开发环境
-	const isDev = env.ENV === 'development';
+	const isDev = env.ENV === "development"
 	return {
 		plugins: [
 			vue(), // Vue 插件
-			svgBuilder('./src/assets/icons/'), // 将 SVG 文件转换成 Vue 组件
+			svgBuilder("./src/assets/icons/"), // 将 SVG 文件转换成 Vue 组件
 			vueSetupExtend(), // setup语法糖增强插件
 			AutoImport({
-				imports: ['vue', 'vue-router', 'pinia'], // 自动导入的依赖库数组
-				dts: './auto-imports.d.ts', // 自动导入类型定义文件路径
+				imports: ["vue", "vue-router", "pinia"], // 自动导入的依赖库数组
+				dts: "./auto-imports.d.ts", // 自动导入类型定义文件路径
 			}),
 			createStyleImportPlugin({
 				resolves: [VxeTableResolve()], // 配置vxetable 按需加载
 			}),
 			topLevelAwait({
-				promiseExportName: '__tla', // TLA Promise 变量名
+				promiseExportName: "__tla", // TLA Promise 变量名
 				promiseImportName: (i) => `__tla_${i}`, // TLA Promise 导入名
 			}),
 			viteCompression({
@@ -47,29 +47,29 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 		],
 		root: process.cwd(), // 项目根目录
 		resolve: { alias }, // 路径别名配置
-		base: mode.command === 'serve' ? './' : env.VITE_PUBLIC_PATH,
+		base: mode.command === "serve" ? "./" : env.VITE_PUBLIC_PATH,
 		optimizeDeps: {
-			include: ['element-plus/es/locale/lang/zh-cn', 'element-plus/es/locale/lang/en'],
+			include: ["element-plus/es/locale/lang/zh-cn", "element-plus/es/locale/lang/en"],
 		},
 		server: {
-			host: '0.0.0.0', // 服务器地址
+			host: "0.0.0.0", // 服务器地址
 			port: env.VITE_PORT as unknown as number, // 服务器端口号
-			open: env.VITE_OPEN === 'true', // 是否自动打开浏览器
+			open: env.VITE_OPEN === "true", // 是否自动打开浏览器
 			hmr: true, // 启用热更新
 			proxy: {
-				'/api/gen': {
+				"/api/gen": {
 					//单体架构下特殊处理代码生成模块代理
-					target: env.VITE_IS_MICRO === 'true' ? env.VITE_ADMIN_PROXY_PATH : env.VITE_GEN_PROXY_PATH,
+					target: env.VITE_IS_MICRO === "true" ? env.VITE_ADMIN_PROXY_PATH : env.VITE_GEN_PROXY_PATH,
 					changeOrigin: true,
-					rewrite: (path) => path.replace(/^\/api/, ''),
+					rewrite: (path) => path.replace(/^\/api/, ""),
 				},
-				'/api': {
+				"/api": {
 					target: env.VITE_ADMIN_PROXY_PATH, // 目标服务器地址
 					ws: true, // 是否启用 WebSocket
 					changeOrigin: true, // 是否修改请求头中的 Origin 字段
-					rewrite: (path) => path.replace(/^\/api/, ''),
+					rewrite: (path) => path.replace(/^\/api/, ""),
 				},
-				'^/ws/info/.*': {
+				"^/ws/info/.*": {
 					target: env.VITE_ADMIN_PROXY_PATH, // 目标服务器地址
 					ws: true, // 是否启用 WebSocket
 					changeOrigin: true,
@@ -77,10 +77,10 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			},
 		},
 		build: {
-			outDir: 'dist', // 打包输出目录//
+			outDir: "dist", // 打包输出目录//
 			chunkSizeWarningLimit: 1500, // 代码分包阈值
 			// 开发使用 esbuild 更快，生产环境打包使用 terser 可以删除更多注释
-			minify: isDev ? 'esbuild' : 'terser',
+			minify: isDev ? "esbuild" : "terser",
 			terserOptions: {
 				compress: {
 					drop_console: true, // 删除 console
@@ -97,8 +97,8 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 					assetFileNames: `assets/[name].[hash].[ext]`,
 					compact: true,
 					manualChunks: {
-						vue: ['vue', 'vue-router', 'pinia'],
-						echarts: ['echarts'],
+						vue: ["vue", "vue-router", "pinia"],
+						echarts: ["echarts"],
 					},
 				},
 			},
@@ -111,7 +111,7 @@ const viteConfig = defineConfig((mode: ConfigEnv) => {
 			__VERSION__: JSON.stringify(process.env.npm_package_version),
 			__NEXT_NAME__: JSON.stringify(process.env.npm_package_name),
 		},
-	};
-});
+	}
+})
 
-export default viteConfig;
+export default viteConfig