Merge remote-tracking branch 'origin/master'

src/api/app/app-menu.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/app/app-menu/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/app/app-menu",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/app/app-menu/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/app/app-menu",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/app/app-menu",
+		method: "put",
+		data: obj,
+	})
+}

src/api/login/index.ts

@@ -1,171 +1,170 @@
-import request from '/@/utils/request';
-import {Session} from '/@/utils/storage';
-import {validateNull} from '/@/utils/validate';
-import {useUserInfo} from '/@/stores/userInfo';
-import other from '/@/utils/other';
+import request from "/@/utils/request"
+import { Session } from "/@/utils/storage"
+import { validateNull } from "/@/utils/validate"
+import { useUserInfo } from "/@/stores/userInfo"
+import other from "/@/utils/other"
 
 /**
  * https://www.ietf.org/rfc/rfc6749.txt
  * OAuth 协议 4.3.1 要求格式为 form 而不是 JSON 注意！
  */
-const FORM_CONTENT_TYPE = 'application/x-www-form-urlencoded';
+const FORM_CONTENT_TYPE = "application/x-www-form-urlencoded"
 
 // 登录方式
 export enum LoginTypeEnum {
 	PASSWORD,
 	MOBILE,
 	REGISTER,
-	EXPIRE
+	EXPIRE,
 }
 
 // 登录错误信息
 export enum LoginErrorEnum {
-	CREDENTIALS_EXPIRED = 'credentials_expired'// 密码过期
+	CREDENTIALS_EXPIRED = "credentials_expired", // 密码过期
 }
 
-
 /**
  * 登录
  * @param data
  */
 export const login = (data: any) => {
-	const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT);
-	Session.set('basicAuth', basicAuth);
+	const basicAuth = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_PASSWORD_CLIENT)
+	Session.set("basicAuth", basicAuth)
 	// 密码加密
-	const encPassword = other.encryption(data.password, import.meta.env.VITE_PWD_ENC_KEY);
-	const { username, randomStr, code, grant_type, scope } = data;
+	const encPassword = other.encryption(data.password, import.meta.env.VITE_PWD_ENC_KEY)
+	const { username, randomStr, code, grant_type, scope } = data
 	return request({
-		url: '/auth/oauth2/token',
-		method: 'post',
+		url: "/auth/oauth2/token",
+		method: "post",
 		params: { username, randomStr, code, grant_type, scope },
 		data: { password: encPassword },
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': FORM_CONTENT_TYPE,
+			"Content-Type": FORM_CONTENT_TYPE,
 		},
-	});
-};
+	})
+}
 
 export const loginByMobile = (mobile: any, code: any) => {
-	const grant_type = 'mobile';
-	const scope = 'server';
-	const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_MOBILE_CLIENT);
-	Session.set('basicAuth', basicAuth);
+	const grant_type = "mobile"
+	const scope = "server"
+	const basicAuth = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_MOBILE_CLIENT)
+	Session.set("basicAuth", basicAuth)
 
 	return request({
-		url: '/auth/oauth2/token',
+		url: "/auth/oauth2/token",
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': FORM_CONTENT_TYPE,
+			"Content-Type": FORM_CONTENT_TYPE,
 		},
-		method: 'post',
-		params: { mobile: 'SMS@' + mobile, code: code, grant_type, scope },
-	});
-};
+		method: "post",
+		params: { mobile: "SMS@" + mobile, code: code, grant_type, scope },
+	})
+}
 
 export const loginBySocial = (state: string, code: string) => {
-	const grant_type = 'mobile';
-	const scope = 'server';
-	const basicAuth = 'Basic ' + window.btoa(import.meta.env.VITE_OAUTH2_SOCIAL_CLIENT);
-	Session.set('basicAuth', basicAuth);
+	const grant_type = "mobile"
+	const scope = "server"
+	const basicAuth = "Basic " + window.btoa(import.meta.env.VITE_OAUTH2_SOCIAL_CLIENT)
+	Session.set("basicAuth", basicAuth)
 
 	return request({
-		url: '/auth/oauth2/token',
+		url: "/auth/oauth2/token",
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': FORM_CONTENT_TYPE,
+			"Content-Type": FORM_CONTENT_TYPE,
 		},
-		method: 'post',
-		params: { mobile: state + '@' + code, code: code, grant_type, scope },
-	});
-};
+		method: "post",
+		params: { mobile: state + "@" + code, code: code, grant_type, scope },
+	})
+}
 
 export const sendMobileCode = (mobile: string) => {
 	return request({
-		url: '/admin/sysMessage/send/smsCode',
-		method: 'get',
-		params: { mobile }
-	});
-};
+		url: "/admin/sysMessage/send/smsCode",
+		method: "get",
+		params: { mobile },
+	})
+}
 
 export const refreshTokenApi = (refresh_token: string) => {
-	const grant_type = 'refresh_token';
-	const scope = 'server';
+	const grant_type = "refresh_token"
+	const scope = "server"
 	// 获取当前选中的 basic 认证信息
-	const basicAuth = Session.get('basicAuth');
+	const basicAuth = Session.get("basicAuth")
 
 	return request({
-		url: '/auth/oauth2/token',
+		url: "/auth/oauth2/token",
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': FORM_CONTENT_TYPE,
+			"Content-Type": FORM_CONTENT_TYPE,
 		},
-		method: 'post',
+		method: "post",
 		params: { refresh_token, grant_type, scope },
-	});
-};
+	})
+}
 
 /**
  * 校验令牌，若有效期小于半小时自动续期
  * @param refreshLock
  */
 export const checkToken = (refreshTime: number, refreshLock: boolean) => {
-	const basicAuth = Session.get('basicAuth');
+	const basicAuth = Session.get("basicAuth")
 	request({
-		url: '/auth/token/check_token',
+		url: "/auth/token/check_token",
 		headers: {
 			skipToken: true,
 			Authorization: basicAuth,
-			'Content-Type': FORM_CONTENT_TYPE,
+			"Content-Type": FORM_CONTENT_TYPE,
 		},
-		method: 'get',
+		method: "get",
 		params: { token: Session.getToken() },
 	})
 		.then((response) => {
 			if (validateNull(response) || response.code === 1) {
-				clearInterval(refreshTime);
-				return;
+				clearInterval(refreshTime)
+				return
 			}
-			const expire = Date.parse(response.data.expiresAt);
+			const expire = Date.parse(response.data.expiresAt)
 			if (expire) {
-				const expiredPeriod = expire - new Date().getTime();
+				const expiredPeriod = expire - new Date().getTime()
 				//小于半小时自动续约
 				if (expiredPeriod <= 30 * 60 * 1000) {
 					if (!refreshLock) {
-						refreshLock = true;
+						refreshLock = true
 						useUserInfo()
 							.refreshToken()
 							.catch(() => {
-								clearInterval(refreshTime);
-							});
-						refreshLock = false;
+								clearInterval(refreshTime)
+							})
+						refreshLock = false
 					}
 				}
 			}
 		})
 		.catch(() => {
 			// 发生异常关闭定时器
-			clearInterval(refreshTime);
-		});
-};
+			clearInterval(refreshTime)
+		})
+}
 
 /**
  * 获取用户信息
  */
 export const getUserInfo = () => {
 	return request({
-		url: '/admin/user/info',
-		method: 'get',
-	});
-};
+		url: "/admin/user/info",
+		method: "get",
+	})
+}
 
 export const logout = () => {
 	return request({
-		url: '/auth/token/logout',
-		method: 'delete',
-	});
-};
+		url: "/auth/token/logout",
+		method: "delete",
+	})
+}

src/api/thirdparty/third-pay-order.ts

@@ -0,0 +1,40 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+	return request({
+		url: "/third/third-pay-order/page",
+		method: "get",
+		params: query,
+	})
+}
+
+export function addObj(obj?: Object) {
+	return request({
+		url: "/third/third-pay-order",
+		method: "post",
+		data: obj,
+	})
+}
+
+export function getObj(id?: string) {
+	return request({
+		url: "/third/third-pay-order/" + id,
+		method: "get",
+	})
+}
+
+export function delObjs(ids?: Object) {
+	return request({
+		url: "/third/third-pay-order",
+		method: "delete",
+		data: ids,
+	})
+}
+
+export function putObj(obj?: Object) {
+	return request({
+		url: "/third/third-pay-order",
+		method: "put",
+		data: obj,
+	})
+}

src/components/Select/SelectHard.vue

@@ -1,18 +1,8 @@
 <template>
-	<el-select
-		style="width: 100%"
-		v-model="state.selectId"
-		:placeholder="props.placeholder"
-		:clearable="props.clearable"
-		remote-show-suffix
-		filterable
-		remote
-		:disabled="props.disabled"
-		:remote-method="remoteSearch"
-		:loading="state.loading"
-		@visible-change="(e: boolean) => e && getOptions()"
-		@change="change"
-	>
+	<el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder"
+		:clearable="props.clearable" remote-show-suffix filterable remote :disabled="props.disabled"
+		:remote-method="remoteSearch" :loading="state.loading" @visible-change="(e: boolean) => e && getOptions()"
+		:multiple="multiple" @change="change">
 		<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>
@@ -40,6 +30,7 @@ const props = withDefaults(
 		clearable?: boolean
 		autoFirst?: boolean
 		apiParams?: any
+		multiple?: boolean
 	}>(),
 	{
 		placeholder: "请选择",
@@ -47,6 +38,7 @@ const props = withDefaults(
 		clearable: true,
 		autoFirst: false,
 		apiParams: {},
+		multiple: false,
 	},
 )
 

src/utils/formatMoney.ts

@@ -9,6 +9,12 @@ export function displayPrice(price: any, suffix: string = "元", fixed = 2) {
 	return (parsedNumber / 100.0).toFixed(fixed) + suffix
 }
 
+export function displayYuanToYuan(price: any, suffix: string = "元", fixed = 2) {
+	if (typeof price === "undefined") return "0.00" + suffix
+	const parsedNumber = typeof price === "string" ? parseFloat(price) : price
+	return parsedNumber.toFixed(fixed) + suffix
+}
+
 export function displayWeight(price: any, fixed = 2) {
 	if (typeof price === "undefined") return "0"
 	const parsedNumber = typeof price === "string" ? parseFloat(price) : price

src/utils/other.ts

@@ -300,6 +300,7 @@ export function postDownBlobFile(url: any, data: any, fileName: string) {
 			descs: data?.descs ?? [],
 		},
 		data,
+		timeout: 360 * 1000,
 	})
 		.then((response) => {
 			handleBlobFile(response, fileName)

src/utils/request.ts

@@ -1,8 +1,8 @@
 import axios, {AxiosInstance, AxiosResponse, InternalAxiosRequestConfig} from 'axios';
-import { Session } from '/@/utils/storage';
-import { useMessageBox } from '/@/hooks/message';
-import qs from 'qs';
-import other from './other';
+import { Session } from "/@/utils/storage"
+import { useMessageBox } from "/@/hooks/message"
+import qs from "qs"
+import other from "./other"
 
 /**
  * 创建并配置一个 Axios 实例对象
@@ -10,12 +10,12 @@ import other from './other';
 const service: AxiosInstance = axios.create({
 	baseURL: import.meta.env.VITE_API_URL,
 	timeout: 50000, // 全局超时时间
-    paramsSerializer: {
-        serialize: (params: any) => {
-            return qs.stringify(params, {arrayFormat: 'repeat'});
-        }
-    }
-});
+	paramsSerializer: {
+		serialize: (params: any) => {
+			return qs.stringify(params, { arrayFormat: "repeat" })
+		},
+	},
+})
 
 /**
  * Axios请求拦截器，对请求进行处理
@@ -25,39 +25,38 @@ const service: AxiosInstance = axios.create({
  * @param config AxiosRequestConfig对象，包含请求配置信息
  */
 service.interceptors.request.use(
-
 	(config: InternalAxiosRequestConfig) => {
 		// 统一增加Authorization请求头, skipToken 跳过增加token
-		const token = Session.getToken();
+		const token = Session.getToken()
 		if (token && !config.headers?.skipToken) {
-			config.headers![CommonHeaderEnum.AUTHORIZATION] = `Bearer ${token}`;
+			config.headers![CommonHeaderEnum.AUTHORIZATION] = `Bearer ${token}`
 		}
 
 		// 统一增加TENANT-ID请求头
-		const tenantId = Session.getTenant();
+		const tenantId = Session.getTenant()
 		if (tenantId) {
-			config.headers![CommonHeaderEnum.TENANT_ID] = tenantId;
+			config.headers![CommonHeaderEnum.TENANT_ID] = tenantId
 		}
 
 		// 请求报文加密
 		if (config.headers![CommonHeaderEnum.ENC_FLAG]) {
-			const enc = other.encryption(JSON.stringify(config.data), import.meta.env.VITE_PWD_ENC_KEY);
+			const enc = other.encryption(JSON.stringify(config.data), import.meta.env.VITE_PWD_ENC_KEY)
 			config.data = {
 				encryption: enc,
-			};
+			}
 		}
 
 		// 自动适配单体和微服务架构不同的URL
-		config.url = other.adaptationUrl(config.url);
+		config.url = other.adaptationUrl(config.url)
 
 		// 处理完毕，返回config对象
-		return config;
+		return config
 	},
 	(error) => {
 		// 对请求错误进行处理
-		return Promise.reject(error);
-	}
-);
+		return Promise.reject(error)
+	},
+)
 
 /**
  * 响应拦截器处理函数
@@ -66,55 +65,56 @@ service.interceptors.request.use(
  */
 const handleResponse = (response: AxiosResponse<any>) => {
 	if (response.data.code === 1) {
-		throw response.data;
+		throw response.data
 	}
 
 	// 针对密文返回解密
 	if (response.data.encryption) {
-		const originData = JSON.parse(other.decryption(response.data.encryption, import.meta.env.VITE_PWD_ENC_KEY));
-		response.data = originData;
-		return response.data;
+		const originData = JSON.parse(other.decryption(response.data.encryption, import.meta.env.VITE_PWD_ENC_KEY))
+		response.data = originData
+		return response.data
 	}
 
-	return response.data;
-};
+	return response.data
+}
 
 /**
  * 添加 Axios 的响应拦截器，用于全局响应结果处理
  */
 service.interceptors.response.use(handleResponse, (error) => {
-	const status = Number(error.response.status) || 200;
+	const status = Number(error.response.status) || 200
 	if (status === 423) {
-		return Promise.reject({msg:'"演示环境，仅供预览"'});
+		return Promise.reject({ msg: '"演示环境，仅供预览"' })
 	}
 
 	if (status === 424) {
 		useMessageBox()
-			.confirm('令牌状态已过期，请点击重新登录')
+			.confirm("令牌状态已过期，请点击重新登录")
 			.then(() => {
-				Session.clear(); // 清除浏览器全部临时缓存
-				window.location.href = '/'; // 去登录页
-				return;
-			});
+				Session.clear() // 清除浏览器全部临时缓存
+				window.location.href = "/" // 去登录页
+				return
+			})
 	}
 
 	if (status === 426) {
 		useMessageBox()
-			.confirm('租户状态已过期，请联系管理员')
+			.confirm("租户状态已过期，请联系管理员")
 			.then(() => {
-				Session.clear(); // 清除浏览器全部临时缓存
-				return;
-			});
+				Session.clear() // 清除浏览器全部临时缓存
+				return
+			})
 	}
-	return Promise.reject(error.response.data);
-});
+	return Promise.reject(error.response.data)
+})
 
 // 常用header
 export enum CommonHeaderEnum {
-	'TENANT_ID' = 'TENANT-ID',
-	'ENC_FLAG' = 'Enc-Flag',
-	'AUTHORIZATION' = 'Authorization',
+	"TENANT_ID" = "TENANT-ID",
+	"ENC_FLAG" = "Enc-Flag",
+	"AUTHORIZATION" = "Authorization",
 }
 
 // 导出 axios 实例
-export default service;
+export default service
+

src/views/admin/system/menu/index.vue

@@ -4,7 +4,8 @@
 			<el-row v-show="showSearch" class="ml10">
 				<el-form :inline="true" :model="state.queryForm" ref="queryRef">
 					<el-form-item :label="$t('sysmenu.name')" prop="menuName">
-						<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px" v-model="state.queryForm.menuName" />
+						<el-input :placeholder="$t('sysmenu.inputNameTip')" clearable style="max-width: 180px"
+							v-model="state.queryForm.menuName" />
 					</el-form-item>
 					<el-form-item>
 						<el-button @click="query" class="ml10" icon="search" type="primary">
@@ -16,34 +17,22 @@
 			</el-row>
 			<el-row>
 				<div class="mb8" style="width: 100%">
-					<el-button @click="onOpenAddMenu" class="ml10" icon="folder-add" type="primary" v-auth="'sys_menu_add'">
+					<el-button @click="onOpenAddMenu" class="ml10" icon="folder-add" type="primary"
+						v-auth="'sys_menu_add'">
 						{{ $t("common.addBtn") }}
 					</el-button>
-					<right-toolbar
-						v-model:showSearch="showSearch"
-						class="ml10"
-						style="float: right; margin-right: 20px"
-						@queryTable="query"
-					></right-toolbar>
+					<right-toolbar v-model:showSearch="showSearch" class="ml10" style="float: right; margin-right: 20px"
+						@queryTable="query"></right-toolbar>
 				</div>
 			</el-row>
-			<el-table
-				class="el-table"
-				ref="tableRef"
-				:data="tableList"
-				row-key="id"
-				style="width: 100%"
-				v-loading="state.loading"
-				border
-				:header-cell-style="tableStyle?.headerCellStyle"
-				:expand-row-keys="expandRowKeys"
-				lazy
-				:load="load"
-				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-				@expand-change="handleExpandChange"
-			>
-				<el-table-column :label="$t('sysmenu.name')" fixed prop="name" align="left" show-overflow-tooltip min-width="200" />
-				<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" align="center" show-overflow-tooltip />
+			<el-table class="el-table" ref="tableRef" :data="tableList" row-key="id" style="width: 100%"
+				v-loading="state.loading" border :header-cell-style="tableStyle?.headerCellStyle"
+				:expand-row-keys="expandRowKeys" lazy :load="load"
+				:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" @expand-change="handleExpandChange">
+				<el-table-column :label="$t('sysmenu.name')" fixed prop="name" align="left" show-overflow-tooltip
+					min-width="200" />
+				<el-table-column :label="$t('sysmenu.sortOrder')" prop="sortOrder" align="center"
+					show-overflow-tooltip />
 				<el-table-column :label="$t('sysmenu.icon')" prop="icon" show-overflow-tooltip align="center">
 					<template #default="scope">
 						<SvgIcon :name="scope.row.meta.icon" />
@@ -63,26 +52,23 @@
 						<el-tag type="info" v-else>关闭</el-tag>
 					</template>
 				</el-table-column>
-				<el-table-column :label="$t('sysmenu.permission')" :show-overflow-tooltip="true" prop="permission" align="center" />
+				<el-table-column :label="$t('sysmenu.permission')" :show-overflow-tooltip="true" prop="permission"
+					align="center" />
 				<el-table-column :label="$t('common.action')" show-overflow-tooltip width="250" align="center">
 					<template #default="scope">
-						<el-button icon="folder-add" @click="onOpenAddMenu('add', scope.row)" text type="primary" v-auth="'sys_menu_add'">
+						<el-button icon="folder-add" @click="onOpenAddMenu('add', scope.row)" text type="primary"
+							v-auth="'sys_menu_add'">
 							{{ $t("common.addBtn") }}
 						</el-button>
-						<el-button icon="edit-pen" @click="onOpenEditMenu('edit', scope.row)" text type="primary" v-auth="'sys_menu_edit'"
-							>{{ $t("common.editBtn") }}
+						<el-button icon="edit-pen" @click="onOpenEditMenu('edit', scope.row)" text type="primary"
+							v-auth="'sys_menu_edit'">{{ $t("common.editBtn") }}
 						</el-button>
 
-						<el-tooltip icon="delete" :content="$t('sysmenu.deleteDisabledTip')" :disabled="!deleteMenuDisabled(scope.row)" placement="top">
+						<el-tooltip icon="delete" :content="$t('sysmenu.deleteDisabledTip')"
+							:disabled="!deleteMenuDisabled(scope.row)" placement="top">
 							<span style="margin-left: 12px">
-								<el-button
-									icon="delete"
-									:disabled="deleteMenuDisabled(scope.row)"
-									@click="handleDelete(scope.row)"
-									text
-									type="primary"
-									v-auth="'sys_menu_del'"
-								>
+								<el-button icon="delete" :disabled="deleteMenuDisabled(scope.row)"
+									@click="handleDelete(scope.row)" text type="primary" v-auth="'sys_menu_del'">
 									{{ $t("common.delBtn") }}
 								</el-button>
 							</span>
@@ -210,7 +196,7 @@ const tableList = computed(() => {
 const restoreExpandedRows = async () => {
 	await nextTick()
 	if (!tableRef.value || expandedRowIds.value.size === 0) return
-	
+
 	// 递归加载并展开节点
 	const loadAndExpandRows = async (list: any[]) => {
 		for (const row of list || []) {
@@ -228,7 +214,7 @@ const restoreExpandedRows = async () => {
 						console.error('加载子节点失败:', error)
 					}
 				}
-				
+
 				// 展开该节点
 				try {
 					tableRef.value.toggleRowExpansion(row, true)
@@ -237,7 +223,7 @@ const restoreExpandedRows = async () => {
 				} catch (error) {
 					console.error('展开节点失败:', error)
 				}
-				
+
 				// 如果有子节点，递归处理
 				if (row.children && row.children.length > 0) {
 					await loadAndExpandRows(row.children)
@@ -245,7 +231,7 @@ const restoreExpandedRows = async () => {
 			}
 		}
 	}
-	
+
 	await loadAndExpandRows(state.dataList)
 }
 
@@ -291,6 +277,7 @@ const handleDelete = async (row: any) => {
 :v-deep(.el-table .el-table__row .cell) {
 	display: flex;
 }
+
 :v-deep(.el-table .el-table__row .cell .el-table__expand-icon .el-icon) {
 	width: 20px;
 	height: 20px;

src/views/biz/app/app-menu/form.vue

@@ -0,0 +1,146 @@
+<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="platform">
+            <dict-select v-model="form.platform" dict-code="app_menu_platform" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="菜单类型" prop="type">
+            <dict-select v-model="form.type" dict-code="app_menu_type" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="图标" prop="icon">
+            <upload-img v-model:imageUrl="form.icon" height="60px" width="60px" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="页面路径" prop="page">
+            <el-input v-model="form.page" placeholder="请输入页面路径" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="页面标题" prop="title">
+            <el-input v-model="form.title" placeholder="请输入页面标题" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="是否显示" prop="visible">
+            <dict-select v-model="form.visible" dict-code="yes_no_type" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item prop="sort">
+            <template #label>排序
+              <tip content="越大越在前" />
+            </template>
+            <el-input-number v-model="form.sort" 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>
+</template>
+
+<script setup lang="ts" name="AppMenuDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as appMenuApi from "/@/api/app/app-menu"
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  platform: '',
+  type: '',
+  icon: '',
+  page: '',
+  title: '',
+  visible: '',
+  sort: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+  platform: [{ required: true, message: "请选择平台", trigger: "change" }],
+  type: [{ required: true, message: "请选择菜单类型", trigger: "change" }],
+  page: [{ required: true, message: "页面路径不能为空", trigger: "blur" }],
+  title: [{ required: true, message: "页面标题不能为空", trigger: "blur" }],
+  visible: [{ required: true, message: "请选择是否显示", trigger: "change" }],
+  sort: [{ required: true, message: "排序不能为空", trigger: "change" }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取appMenu信息
+  if (id) {
+    form.id = id
+    getappMenuData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await appMenuApi.putObj(form) : await appMenuApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getappMenuData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  appMenuApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/biz/app/app-menu/index.vue

@@ -0,0 +1,158 @@
+<template>
+  <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-row>
+          <el-form-item style="width: 300px" label="页面标题" prop="title">
+            <el-input v-model="state.queryForm.title" placeholder="请输入页面标题" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="平台" prop="platform">
+            <dict-select v-model="state.queryForm.platform" dict-code="app_menu_platform" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="菜单类型" prop="type">
+            <dict-select v-model="state.queryForm.type" dict-code="app_menu_type" />
+          </el-form-item>
+          <el-form-item style="width: 300px" label="是否显示" prop="visible">
+            <dict-select v-model="state.queryForm.visible" dict-code="yes_no_type" />
+          </el-form-item>
+          <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-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'app_appMenu_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'app_appMenu_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'app_appMenu_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"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="platform" label="平台">
+          <template #default="{ row }">
+            <dict-tag :options="app_menu_platform" :value="row.platform" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="type" label="菜单类型">
+          <template #default="{ row }">
+            <dict-tag :options="app_menu_type" :value="row.type" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="icon" label="图标">
+          <template #default="{ row }">
+            <preview-image width="40px" height="40px" :src="row.icon" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="page" label="页面路径" width="400" show-overflow-tooltip />
+        <el-table-column prop="title" label="页面标题" />
+        <el-table-column prop="visible" label="是否显示">
+          <template #default="{ row }">
+            <dict-tag :options="yes_no_type" :value="row.visible" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="{ row }">
+            <el-button icon="edit-pen" text type="primary" v-auth="'app_appMenu_edit'"
+              @click="formDialogRef.openDialog(row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'app_appMenu_del'"
+              @click="handleDelete([row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemAppMenu">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as appMenuApi from "/@/api/app/app-menu"
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+const { app_menu_platform, app_menu_type, yes_no_type } = useDict('app_menu_platform', 'app_menu_type', 'yes_no_type')
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: appMenuApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/app/appMenu/export', Object.assign(state.queryForm, { ids: selectObjs }), 'appMenu.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await appMenuApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/supermarketerp/purchaseManagement/smErpCgDd/form.vue

@@ -13,12 +13,8 @@
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">经办人：</span>
-						<SelectHandlerUser
-							v-model.trim="baseDataForm.handlerUserId"
-							placeholder="请选择经办人"
-							style="width: 200px"
-							:isDisplayName="true"
-						/>
+						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人"
+							style="width: 200px" :isDisplayName="true" />
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">关联补货申请：</span>
@@ -26,7 +22,8 @@
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">货商：</span>
-						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" :isDisplayName="true" />
+						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px"
+							:disabled="disabled" :isDisplayName="true" />
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">备注：</span>
@@ -43,90 +40,65 @@
 						<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="经办人" prop="handlerUserId">
-						<SelectHandlerUser
-							v-model.trim="baseDataForm.handlerUserId"
-							placeholder="请选择经办人"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
+						<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人"
+							style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="关联补货申请" prop="linkCode">
-						<el-input
-							v-model="baseDataForm.linkCode"
-							:suffix-icon="Search"
-							@click="handleClickLinkCode"
-							readonly
-							placeholder="请选择补货申请单"
-							style="width: 200px"
-							:disabled="disabled"
-						/>
+						<el-input v-model="baseDataForm.linkCode" :suffix-icon="Search" @click="handleClickLinkCode"
+							readonly placeholder="请选择补货申请单" style="width: 200px" :disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="货商" prop="supplierId">
-						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
+						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px"
+							:disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">
-						<el-input v-model="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
+						<el-input v-model="baseDataForm.remark" placeholder="请输入备注" style="width: 200px"
+							:disabled="disabled" />
 					</el-form-item>
 				</div>
 			</el-form>
 
 			<el-row v-if="!disabled" class="my-3">
 				<el-button type="primary" plain @click="handleClickSpuSelect">商品选择</el-button>
-				<el-button @click="removeSelectRowEvent" :disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
+				<el-button @click="removeSelectRowEvent"
+					:disabled="state.selectedRowsErpSpuIds.length <= 0">删除选中</el-button>
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
-			<vxe-table
-				ref="editableTableRef"
-				border
-				:loading="loading"
-				show-overflow
-				max-height="410"
-				:edit-config="{
-					trigger: 'click',
-					mode: 'cell',
-					beforeEditMethod({ row, column, rowIndex }:any) {
-						// 禁止编辑
-						// if (column.property === '') {
-						// 	return false
-						// }
-						if(disabled) return false
-						return true
-					},
-				}"
-				:column-config="{ resizable: true }"
-				:row-config="{ isHover: true }"
-				:resizable-config="{ dragMode: 'fixed' }"
-				:data="state.editableTableData"
-				:edit-rules="validRules"
-				@checkbox-all="selectChangeEvent"
-				@checkbox-change="selectChangeEvent"
-				size="mini"
-				align="center"
-			>
+			<vxe-table ref="editableTableRef" border :loading="loading" show-overflow max-height="410" :edit-config="{
+				trigger: 'click',
+				mode: 'cell',
+				beforeEditMethod({ row, column, rowIndex }: any) {
+					// 禁止编辑
+					// if (column.property === '') {
+					// 	return false
+					// }
+					if (disabled) return false
+					return true
+				},
+			}" :column-config="{ resizable: true }" :row-config="{ isHover: true }" :resizable-config="{ dragMode: 'fixed' }"
+				:data="state.editableTableData" :edit-rules="validRules" @checkbox-all="selectChangeEvent"
+				@checkbox-change="selectChangeEvent" size="mini" align="center">
 				<vxe-column type="checkbox" width="40" fixed="left" />
 				<vxe-column type="seq" width="50" fixed="left" />
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
-						<span v-else>{{ row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
+						<span v-else>{{row.erpSpuId && state.erpSpuSimpleAll.find((item: any) => item.id ===
+							row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
 				<vxe-column field="unitId" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
 						<el-select v-model="row.unitId" placeholder="请选择包装单位">
-							<el-option
-								v-if="row.erpUnitVos?.length > 0"
-								v-for="item in row.erpUnitVos"
-								:key="item.id"
-								:label="item.unit"
-								:value="item.id"
-							/>
+							<el-option v-if="row.erpUnitVos?.length > 0" v-for="item in row.erpUnitVos" :key="item.id"
+								:label="item.unit" :value="item.id" />
 							<el-option v-else :key="row.id" :label="row.unit" :value="row.unitId" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
-						<span v-if="row.unitId">{{ row.unit ?? row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.unit }}</span>
+						<span v-if="row.unitId">{{row.unit ?? row.erpUnitVos?.find((item: any) => item.id ==
+							row.unitId)?.unit }}</span>
 						<span v-else style="color: #c0c4cf">请选择</span>
 					</template>
 				</vxe-column>
@@ -150,7 +122,8 @@
 							{{ displayPrice(row.quantity * parseFloat(row.purchasePrice)) }}
 						</span>
 						<span v-if="row.unitId && row.quantity && row.erpUnitVos">
-							{{ displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.purchasePrice) * row.quantity) }}
+							{{displayPrice(Number(row.erpUnitVos?.find((item: any) => item.id ==
+								row.unitId)?.purchasePrice) * row.quantity) }}
 						</span>
 					</template>
 				</vxe-column>
@@ -179,12 +152,8 @@
 			<!-- 商品选择对话框 -->
 			<select-dialog ref="erpSpuSelectDialogRef" @getSelectedRows="getSelectedRows" />
 
-			<link-code-dialog
-				ref="linkCodeDialogRef"
-				title="关联补货申请"
-				:getTableData="getCgsqPage"
-				@getSelectedLinkCode="getSelectedLinkCode"
-			/>
+			<link-code-dialog ref="linkCodeDialogRef" title="关联补货申请" :getTableData="getCgsqPage"
+				@getSelectedLinkCode="getSelectedLinkCode" />
 		</div>
 	</div>
 </template>
@@ -403,19 +372,19 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
-		clearData()
+		; (await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
+			(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+			clearData()
 }
 
 // 点击保存
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("state.editableTableData", state.editableTableData)
-	;(await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
-		(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
-		clearData() &&
-		emit("close")
+		; (await formValidate(baseDataFormRef, editableTableRef, state.editableTableData.length)) &&
+			(await submitData(baseDataForm, cgPlanSpuItems, loading, putObj, addObj)) &&
+			clearData() &&
+			emit("close")
 }
 
 // 清空填写的数据 返回 true

src/views/supermarketerp/purchaseManagement/smErpCgInventory/form.vue

@@ -22,7 +22,8 @@
 					</div> -->
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">货商：</span>
-						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" :isDisplayName="true" />
+						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px"
+							:disabled="disabled" :isDisplayName="true" />
 					</div>
 					<div style="width: 33.33%; height: 28px; line-height: 28px">
 						<span class="font-bold">备注：</span>
@@ -33,10 +34,12 @@
 			<el-form v-else ref="baseFormRef" :model="baseDataForm" :rules="dataRules" label-width="100px">
 				<div class="flex flex-wrap">
 					<el-form-item label="单据编号" prop="inventoryCode">
-						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px" :disabled="disabled" />
+						<el-input v-model.trim="baseDataForm.inventoryCode" readonly style="width: 200px"
+							:disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="单据日期" prop="inventoryDate">
-						<el-date-picker v-model="baseDataForm.inventoryDate" style="width: 200px" :disabled="disabled" value-format="YYYY-MM-DD" />
+						<el-date-picker v-model="baseDataForm.inventoryDate" style="width: 200px" :disabled="disabled"
+							value-format="YYYY-MM-DD" />
 					</el-form-item>
 					<!-- <el-form-item label="关联采购订单" prop="linkCode">
 						<el-input
@@ -58,10 +61,12 @@
 						/>
 					</el-form-item> -->
 					<el-form-item label="货商" prop="supplierId">
-						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px" :disabled="disabled" />
+						<SelectSupermarketSupplier v-model="baseDataForm.supplierId" style="width: 200px"
+							:disabled="disabled" />
 					</el-form-item>
 					<el-form-item label="备注" prop="remark">
-						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px" :disabled="disabled" />
+						<el-input v-model.trim="baseDataForm.remark" placeholder="请输入备注" style="width: 200px"
+							:disabled="disabled" />
 					</el-form-item>
 				</div>
 			</el-form>
@@ -72,32 +77,20 @@
 				<el-button type="danger" plain @click="clearData">清空数据</el-button>
 			</el-row>
 
-			<vxe-table
-				ref="vxeTableRef"
-				border
-				:loading="loading"
-				show-overflow
-				max-height="410"
-				:edit-config="{
-					trigger: 'click',
-					mode: 'cell',
-					beforeEditMethod({ row, column, rowIndex }:any) {
-						// 禁止编辑
-						// if (column.property === '') {
-						// 	return false
-						// }
-						if(disabled) return false
-						return true
-					},
-				}"
-				:column-config="{ resizable: true }"
-				:row-config="{ isHover: true }"
-				:resizable-config="{ dragMode: 'fixed' }"
-				:checkbox-config="{ highlight: true, range: true }"
-				:data="vxeTableData"
-				:edit-rules="validRules"
-				show-footer
-				:footer-data="[
+			<vxe-table ref="vxeTableRef" border :loading="loading" show-overflow max-height="410" :edit-config="{
+				trigger: 'click',
+				mode: 'cell',
+				beforeEditMethod({ row, column, rowIndex }: any) {
+					// 禁止编辑
+					// if (column.property === '') {
+					// 	return false
+					// }
+					if (disabled) return false
+					return true
+				},
+			}" :column-config="{ resizable: true }" :row-config="{ isHover: true }" :resizable-config="{ dragMode: 'fixed' }"
+				:checkbox-config="{ highlight: true, range: true }" :data="vxeTableData" :edit-rules="validRules"
+				show-footer :footer-data="[
 					{
 						seq: '合计',
 						quantity: total.quantity,
@@ -106,35 +99,28 @@
 						realPrice: `${total.realPrice}元`,
 						totalAmount: total.totalAmount,
 					},
-				]"
-				:merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 4 }]"
-				@checkbox-all=""
-				@checkbox-change=""
-				size="mini"
-				align="center"
-			>
+				]" :merge-footer-items="[{ row: 0, col: 2, rowspan: 1, colspan: 4 }]" @checkbox-all="" @checkbox-change=""
+				size="mini" align="center">
 				<vxe-column type="checkbox" width="40" fixed="left" />
 				<vxe-column field="seq" type="seq" width="50" fixed="left" />
 				<vxe-column field="productName" title="库存商品">
 					<template #default="{ row }">
 						<span v-if="row.productName">{{ row.productName }}</span>
-						<span v-else>{{ row.erpSpuId && erpSpuSimpleAll.find((item: any) => item.id === row.erpSpuId)?.productName }}</span>
+						<span v-else>{{row.erpSpuId && erpSpuSimpleAll.find((item: any) => item.id ===
+							row.erpSpuId)?.productName }}</span>
 					</template>
 				</vxe-column>
 				<vxe-column field="productNature" title="商品性质">
 					<template #default="{ row }">
-						{{ supermarket_nature.find((item: any) => item.value == row.productNature)?.label || "" }}
+						{{supermarket_nature.find((item: any) => item.value == row.productNature)?.label || ""}}
 					</template>
 				</vxe-column>
 				<vxe-column field="selectedUnitObj" title="包装单位" :edit-render="{}">
 					<template #edit="{ row }">
-						<el-select v-model="row.selectedUnitObj" value-key="id" placeholder="请选择包装单位" @change="onUnitChange(row)">
-							<el-option
-								v-for="item in row.erpUnitVos"
-								:key="item.id"
-								:label="item.spec ? item.unit + '-' + item.spec : item.unit"
-								:value="item"
-							/>
+						<el-select v-model="row.selectedUnitObj" value-key="id" placeholder="请选择包装单位"
+							@change="onUnitChange(row)">
+							<el-option v-for="item in row.erpUnitVos" :key="item.id"
+								:label="item.spec ? item.unit + '-' + item.spec : item.unit" :value="item" />
 						</el-select>
 					</template>
 					<template #default="{ row }">
@@ -148,14 +134,10 @@
 				</vxe-column>
 				<vxe-column field="quantity" title="数量" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
 					<template #edit="{ row, $rowIndex }">
-						<el-input-number
-							v-if="row.productNature == '1'"
-							v-model="row.quantity"
-							:min="0"
-							:precision="0"
-							@change="onQuantityChange(row, $rowIndex)"
-						/>
-						<el-input-number v-else v-model="row.quantity" :min="0" :precision="2" @change="onQuantityChange(row, $rowIndex)" />
+						<el-input-number v-if="row.productNature == '1'" v-model="row.quantity" :min="0" :precision="0"
+							@change="onQuantityChange(row, $rowIndex)" />
+						<el-input-number v-else v-model="row.quantity" :min="0" :precision="2"
+							@change="onQuantityChange(row, $rowIndex)" />
 					</template>
 				</vxe-column>
 				<vxe-column field="retailPrice" title="零售价" :edit-render="{ autoFocus: 'input', placeholder: '请输入' }">
@@ -190,13 +172,8 @@
 						{{ row?.selectedUnitObj?.totalAmount }}
 					</template>
 					<template #edit="{ row, $rowIndex }">
-						<el-input-number
-							v-if="row.selectedUnitObj"
-							v-model="row.selectedUnitObj.totalAmount"
-							:min="0"
-							:precision="2"
-							@change="onTotalAmountChange(row, $rowIndex)"
-						/>
+						<el-input-number v-if="row.selectedUnitObj" v-model="row.selectedUnitObj.totalAmount" :min="0"
+							:precision="2" @change="onTotalAmountChange(row, $rowIndex)" />
 					</template>
 					<template #footer="{ row }">
 						<span style="color: #2e5cf6; font-weight: bold">{{ total.totalAmount }}元</span>
@@ -433,19 +410,19 @@ const { formValidate, submitData } = useSmProcessFormAction()
 const onContinueAdd = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("vxeTableData.value", vxeTableData.value)
-	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
-		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
-		clearData()
+		; (await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+			(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
+			clearData()
 }
 
 // 点击保存
 const onSave = async () => {
 	console.log("baseDataForm", baseDataForm)
 	console.log("vxeTableData.value", vxeTableData.value)
-	;(await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
-		(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
-		clearData() &&
-		emit("close")
+		; (await formValidate(baseFormRef, vxeTableRef, vxeTableData.value.length)) &&
+			(await submitData(baseDataForm, settledTableItems.value, loading, putObj, addObj)) &&
+			clearData() &&
+			emit("close")
 }
 
 // 清空数据

src/views/thirdparty/third-pay-order/form.vue

@@ -0,0 +1,187 @@
+<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="payPlatformType">
+            <el-input v-model="form.payPlatformType" placeholder="请输入支付平台类型" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付类型" prop="bizType">
+            <el-input v-model="form.bizType" placeholder="请输入支付类型" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付相关id" prop="bizId">
+            <el-input v-model="form.bizId" 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="用户code" prop="userCode">
+            <el-input v-model="form.userCode" placeholder="请输入用户code" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付金额(分)" prop="price">
+            <el-input v-model="form.price" 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="payNo">
+            <el-input v-model="form.payNo" placeholder="请输入支付订单号" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付时间" prop="payTime">
+            <el-input v-model="form.payTime" placeholder="请输入支付时间" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="支付返回" prop="payRes">
+            <el-input v-model="form.payRes" placeholder="请输入支付返回" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="退款订单号" prop="refundNo">
+            <el-input v-model="form.refundNo" 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="refundRes">
+            <el-input v-model="form.refundRes" placeholder="请输入退款返回" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="订单过期时间" prop="expireTime">
+            <el-input v-model="form.expireTime" 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>
+</template>
+
+<script setup lang="ts" name="ThirdPayOrderDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as thirdPayOrderApi from "/@/api/thirdparty/third-pay-order";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  payPlatformType: '',
+  bizType: '',
+  bizId: '',
+  userId: '',
+  userCode: '',
+  price: '',
+  status: '',
+  payNo: '',
+  payTime: '',
+  payRes: '',
+  refundNo: '',
+  refundTime: '',
+  refundRes: '',
+  expireTime: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取thirdPayOrder信息
+  if (id) {
+    form.id = id
+    getthirdPayOrderData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await thirdPayOrderApi.putObj(form) : await thirdPayOrderApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getthirdPayOrderData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  thirdPayOrderApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/thirdparty/third-pay-order/index.vue

@@ -0,0 +1,126 @@
+<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="'third_thirdPayOrder_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'third_thirdPayOrder_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'third_thirdPayOrder_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"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="payPlatformType" label="支付平台类型" show-overflow-tooltip />
+        <el-table-column prop="bizType" label="支付类型" show-overflow-tooltip />
+        <el-table-column prop="bizId" label="支付相关id" show-overflow-tooltip />
+        <el-table-column prop="userId" label="用户id" show-overflow-tooltip />
+        <el-table-column prop="userCode" label="用户code" show-overflow-tooltip />
+        <el-table-column prop="price" label="支付金额(分)" show-overflow-tooltip />
+        <el-table-column prop="status" label="支付状态" show-overflow-tooltip />
+        <el-table-column prop="payNo" label="支付订单号" show-overflow-tooltip />
+        <el-table-column prop="payTime" label="支付时间" show-overflow-tooltip />
+        <el-table-column prop="payRes" label="支付返回" show-overflow-tooltip />
+        <el-table-column prop="refundNo" label="退款订单号" show-overflow-tooltip />
+        <el-table-column prop="refundTime" label="退款时间" show-overflow-tooltip />
+        <el-table-column prop="refundRes" label="退款返回" show-overflow-tooltip />
+        <el-table-column prop="expireTime" label="订单过期时间" show-overflow-tooltip />
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'third_thirdPayOrder_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'third_thirdPayOrder_del'"
+              @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemThirdPayOrder">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as thirdPayOrderApi from "/@/api/thirdparty/third-pay-order";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: thirdPayOrderApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/third/third-pay-order/export', Object.assign(state.queryForm, { ids: selectObjs }), 'thirdPayOrder.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await thirdPayOrderApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>

src/views/wallet/wallet-setting/components/xfj/components/xfj-edit-table.vue

@@ -0,0 +1,99 @@
+<template>
+    <div>
+        <el-divider>{{ title }}配置</el-divider>
+        <vxe-table show-overflow max-height="410" size="mini" align="center" header-align="center"
+            :column-config="{ resizable: true }" :row-config="{ isHover: true }"
+            :resizable-config="{ dragMode: 'fixed' }" :data="listModel" :edit-config="{
+                trigger: 'click',
+                mode: 'cell',
+                beforeEditMethod({ row, column, rowIndex }: any) {
+                    return true
+                },
+            }">
+            <vxe-column type="seq" width="100" fixed="left" />
+            <vxe-column width="100" field="name" title="用餐时间段">
+                <template #default="{ row }">
+                    {{ row.name }}
+                </template>
+            </vxe-column>
+            <vxe-column width="150" field="basePrice" title="基础金额" :edit-render="{}">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ displayYuanToYuan(row.basePrice) }}</span>
+                </template>
+                <template #edit="{ row }">
+                    <div class="flex items-center">
+                        <el-input-number v-model="row.basePrice" size="small" :min="0" :step="1" :precision="2" />
+                        <div class="ml-[5px]">元</div>
+                    </div>
+                </template>
+            </vxe-column>
+            <vxe-column width="150" field="extraPer" title="调动金额(倍)" :edit-render="{}">
+                <template #default="{ row }">
+                    <span class="color-primary"> {{ row.extraPer }}倍</span>
+                </template>
+                <template #edit="{ row }">
+                    <div class="flex items-center">
+                        <el-input-number v-model="row.extraPer" size="small" :min="0" :step="0.1" :precision="2" />
+                        <div class="ml-[5px]">%</div>
+                    </div>
+                </template>
+            </vxe-column>
+            <vxe-column width="180" field="specialDishEnable" title="特色菜(二楼)是否额外收费" :edit-render="{}">
+                <template #default="{ row }">
+                    <dict-tag :options="yes_no_type" :value="row.specialDishEnable" />
+                </template>
+            </vxe-column>
+            <vxe-column width="150" field="enable" title="是否启用" :edit-render="{}">
+                <template #default="{ row }">
+                    <dict-tag :options="yes_no_type" :value="row.enable" />
+                </template>
+                <template #edit="{ row }">
+                    <el-switch active-value="1" inactive-value="0" v-model="row.enable" active-text="开启"
+                        inactive-text="关闭" inline-prompt />
+                </template>
+            </vxe-column>
+            <vxe-column align="left" field="desc" title="说明">
+                <template #default="{ row }">
+                    <div class="flex items-center" v-if="row.extraPer != 1">
+                        <div v-if="row.basePrice > 0" class="flex items-center">
+                            <span>用户在</span>
+                            <span class="color-danger">{{ title }}</span>
+                            <span>购买</span>
+                            <span class="color-danger">所有菜品</span>
+                            <span v-if="row.specialDishEnable == '0'" class="color-danger">(不包含特色菜)</span>
+                            <span>超过</span>
+                            <span class="color-primary">{{ displayYuanToYuan(row.basePrice) }}</span>
+                            <span>超过部分</span>
+                        </div>
+                        <div class="flex items-center" v-else>
+                            <span class="color-danger">所有菜品</span>
+                            <span v-if="row.specialDishEnable == '0'" class="color-danger">(不包含特色菜)</span>
+                        </div>
+                        <span>将收取</span>
+                        <span>{{ row.extraPer }}倍</span>
+                        <span>额外金额</span>
+                    </div>
+                    <div class="color-success" v-else>
+                        不额外收费
+                    </div>
+                </template>
+            </vxe-column>
+        </vxe-table>
+    </div>
+</template>
+
+<script setup lang="ts" name="xfj-edit-table">
+import { useDict } from "/@/hooks/dict"
+import { displayYuanToYuan } from "/@/utils/formatMoney"
+
+defineProps({
+    title: {
+        type: String,
+        default: "配置",
+    },
+})
+
+const { yes_no_type } = useDict("yes_no_type")
+
+const listModel = defineModel<any[]>("list", { default: () => [] })
+</script>

src/views/wallet/wallet-setting/components/xfj/index.vue

@@ -0,0 +1,143 @@
+<template>
+    <div class="w-full">
+        <div class="layout-padding-auto layout-padding-view">
+            <div v-loading="loading">
+                <xfj-edit-table title="在编普通食堂" v-model:list="state.zbDefaultXfjDiscounts" />
+                <xfj-edit-table title="非在编普通食堂" v-model:list="state.fzbDefaultXfjDiscounts" />
+                <el-form ref="dataFormRef" class="xfj-form" label-width="120px" :model="state" :rules="dataRules"
+                    formDialogRef>
+                    <el-form-item label="二楼食堂机器" prop="specialXfjIdList">
+                        <select-hard multiple style="width: 300px" v-model="state.specialXfjIdList"
+                            :apiParams="{ type: '2' }" />
+                    </el-form-item>
+                </el-form>
+                <xfj-edit-table title="在编特殊食堂(二楼)食堂" v-model:list="state.zbSpecialXfjDiscounts" />
+                <xfj-edit-table title="非在编特殊食堂(二楼)食堂" v-model:list="state.fzbSpecialXfjDiscounts" />
+            </div>
+            <div class="flex items-center mt-[10px]" v-auth="'wallet_setting_edit'">
+                <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="xfj">
+import { useMessage } from "/@/hooks/message"
+import { useDict } from "/@/hooks/dict"
+import { getObj, putObj } from "/@/api/wallet/wallet-setting"
+
+const XfjEditTable = defineAsyncComponent(() => import("./components/xfj-edit-table.vue"))
+
+onMounted(() => {
+    getwalletRechargeData()
+})
+
+// 定义变量内容
+const loading = ref(false)
+const { daily_menu } = useDict("daily_menu")
+
+const state = reactive({
+    id: undefined,
+    // 在编消默认费机优惠规则
+    zbDefaultXfjDiscounts: [],
+    // 在编消特殊费机优惠规则
+    zbSpecialXfjDiscounts: [],
+    // 非在编消默认费机优惠规则
+    fzbDefaultXfjDiscounts: [],
+    // 非在编消特殊费机优惠规则
+    fzbSpecialXfjDiscounts: [],
+    // 特殊消费机列表
+    specialXfjIdList: [],
+})
+// 定义校验规则
+const dataRules = ref({
+    // specialXfjIdList: [{ required: true, message: "请选择二楼食堂机器", trigger: "change" }],
+})
+
+const discountsFieldKey = ["zbDefaultXfjDiscounts", "zbSpecialXfjDiscounts", "fzbDefaultXfjDiscounts", "fzbSpecialXfjDiscounts"]
+
+// 提交
+const onSubmit = async () => {
+    try {
+        loading.value = true
+        const pa: any = {
+            ...state,
+        }
+        for (const key in pa) {
+            if (!discountsFieldKey.includes(key)) continue;
+            const list = pa[key];
+            if (!list || !list.length) continue;
+            for (const item of list) {
+                if (item.basePrice) {
+                    item.basePrice = Number(item.basePrice) * 100
+                }
+            }
+        }
+        await putObj(pa)
+        await getwalletRechargeData()
+        useMessage().success("修改成功")
+    } catch (err: any) {
+        useMessage().error(err.msg)
+    } finally {
+        loading.value = false
+    }
+}
+
+const getDefaultDiscounts = (list: any) => {
+    if (!list || !list.length) {
+        return daily_menu.value.map((item: any) => {
+            return {
+                name: item.label,
+                // 时间类型
+                hourType: item.value,
+                // 基础金额(分),超过了这个基数`extraPer`就生效
+                basePrice: 0,
+                // 额外多收的百分比(1.5,10块就是15块)
+                extraPer: 1.0,
+                // 描述
+                desc: "",
+                // 是否开启
+                enable: '1',
+                // 特色菜是否额外收费
+                specialDishEnable: '0',
+            }
+        })
+    }
+    const disposeList = list.map((item: any) => {
+        return {
+            ...item,
+            specialDishEnable: item?.specialDishEnable ?? "0",
+            basePrice: item.basePrice / 100,
+            name: daily_menu.value.find((i: any) => i.value == item.hourType)?.label,
+        }
+    })
+    return disposeList
+}
+
+// 初始化表单数据
+const getwalletRechargeData = async () => {
+    // 获取数据
+    loading.value = true
+    try {
+        const res = await getObj()
+        const data = { ...res.data }
+        data.zbDefaultXfjDiscounts = getDefaultDiscounts(data.zbDefaultXfjDiscounts)
+        data.fzbDefaultXfjDiscounts = getDefaultDiscounts(data.fzbDefaultXfjDiscounts)
+        data.zbSpecialXfjDiscounts = getDefaultDiscounts(data.zbSpecialXfjDiscounts)
+        data.fzbSpecialXfjDiscounts = getDefaultDiscounts(data.fzbSpecialXfjDiscounts)
+        Object.assign(state, data)
+    } catch (error) {
+        console.log("初始化表单数据:", error);
+    } finally {
+        loading.value = false
+    }
+}
+</script>
+
+<style scoped>
+.xfj-form {
+    margin: 20px 0;
+    padding: 10px 20px;
+    background: var(--next-bg-main-color);
+}
+</style>

src/views/wallet/wallet-setting/index.vue

@@ -1,14 +1,12 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-tabs v-model="activeName" class="demo-tabs">
-				<div v-for="v in data.tabList" :key="v.id">
-					<el-tab-pane :label="v.label" :name="v.id">
-						<div></div>
-					</el-tab-pane>
-				</div>
+			<el-tabs v-model="activeName">
+				<el-tab-pane v-for="v in data.tabList" :key="v.id" :label="v.label" :name="v.id">
+					<div></div>
+				</el-tab-pane>
 			</el-tabs>
-			<div class="flex justify-center">
+			<div class="setting-content">
 				<recharge-package v-if="activeName == 10" />
 				<extra-price v-if="activeName == 20" />
 				<refund v-if="activeName == 30" />
@@ -17,6 +15,7 @@
 				<third-zy v-if="activeName == 60" />
 				<user-setting v-if="activeName == 70" />
 				<wallet-recharge v-if="activeName == 80" />
+				<xfj v-if="activeName == 90" />
 			</div>
 		</div>
 	</div>
@@ -31,6 +30,7 @@ const ExtraPrice = defineAsyncComponent(() => import("./components/extra-price/i
 const ThirdZy = defineAsyncComponent(() => import("./components/third-zy/index.vue"))
 const UserSetting = defineAsyncComponent(() => import("./components/user/index.vue"))
 const WalletRecharge = defineAsyncComponent(() => import("./components/wallet-recharge/index.vue"))
+const Xfj = defineAsyncComponent(() => import("./components/xfj/index.vue"))
 
 const data = {
 	tabList: [
@@ -42,8 +42,22 @@ const data = {
 		{ id: 60, label: "正元同步配置" },
 		{ id: 70, label: "用户同步配置" },
 		{ id: 80, label: "批量申请/扣款发票配置" },
+		{ id: 90, label: "消费机配置" },
 	],
 }
 
 const activeName = ref(data.tabList[0].id)
 </script>
+
+<style scoped>
+.tab-content {
+	width: 100%;
+	height: 200px;
+	background: blue;
+}
+
+.setting-content {
+	flex: 1;
+	overflow-y: scroll;
+}
+</style>