diff --git a/Web/src/views/system/oAuthUser/component/editOAuthUser.vue b/Web/src/views/system/oAuthUser/component/editOAuthUser.vue
index 1e1e385c..131b4a1c 100644
--- a/Web/src/views/system/oAuthUser/component/editOAuthUser.vue
+++ b/Web/src/views/system/oAuthUser/component/editOAuthUser.vue
@@ -1,6 +1,6 @@
 <template>
-	<div class="editOAuthUser-container">
-		<el-dialog v-model="state.isShowDialog" draggable :close-on-click-modal="false" width="700px">
+	<div class="sysEditOAuthUser-container">
+		<el-dialog v-model="state.isShowDialog" draggable overflow destroy-on-close width="700px">
 			<template #header>
 				<div style="color: #fff">
 					<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>
@@ -8,22 +8,12 @@
 				</div>
 			</template>
 			<el-form :model="state.ruleForm" ref="ruleFormRef" label-width="auto">
-				<el-row :gutter="35">
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="账号" prop="account" :rules="[{ required: true, message: '账号不能为空', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.account" placeholder="账号" clearable />
-						</el-form-item>
-					</el-col>
+				<el-row :gutter="10">
 					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
 						<el-form-item label="昵称" prop="nickName" :rules="[{ required: true, message: '昵称不能为空', trigger: 'blur' }]">
 							<el-input v-model="state.ruleForm.nickName" placeholder="昵称" clearable />
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20">
-						<el-form-item label="手机号码" prop="mobile" :rules="[{ required: true, message: '手机号码不能为空', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.mobile" placeholder="手机号码" clearable />
-						</el-form-item>
-					</el-col>
 				</el-row>
 			</el-form>
 			<template #footer>
@@ -36,7 +26,7 @@
 	</div>
 </template>
 
-<script lang="ts" setup name="editOAuthUser">
+<script lang="ts" setup name="sysEditOAuthUser">
 import { reactive, ref } from 'vue';
 
 import { getAPI } from '/@/utils/axios-utils';
diff --git a/Web/src/views/system/oAuthUser/index.vue b/Web/src/views/system/oAuthUser/index.vue
index e2a8b2e0..959914f3 100644
--- a/Web/src/views/system/oAuthUser/index.vue
+++ b/Web/src/views/system/oAuthUser/index.vue
@@ -1,117 +1,89 @@
 <template>
-	<div class="sysOAuthUser-container">
-		<el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
-			<el-form :model="state.queryParams" ref="queryForm" :inline="true">
-				<el-form-item label="账号">
-					<el-input v-model="state.queryParams.account" placeholder="账号" clearable />
-				</el-form-item>
-				<el-form-item label="昵称">
-					<el-input v-model="state.queryParams.nickName" placeholder="昵称" clearable />
-				</el-form-item>
-				<el-form-item label="手机号码">
-					<el-input v-model="state.queryParams.mobile" placeholder="手机号码" clearable />
-				</el-form-item>
-				<el-form-item>
-					<el-button-group>
-						<el-button type="primary" icon="ele-Search" @click="handleQuery" v-auth="'sysOAuthUser:page'"> 查询 </el-button>
-						<el-button icon="ele-Refresh" @click="resetQuery"> 重置 </el-button>
-					</el-button-group>
-				</el-form-item>
+	<div class="sysOAuthUser-container" v-loading="options.loading">
+		<el-card shadow="hover" :body-style="{ padding: '5px 5px 0 5px', display: 'flex', width: '100%', height: '100%', alignItems: 'start' }">
+			<el-form :model="state.queryParams" ref="queryForm" :show-message="false" :inlineMessage="true" :label-width="'60px'" style="flex: 1 1 0%">
+				<el-row :gutter="10">
+					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+						<el-form-item label="微信昵称" prop="nickName">
+							<el-input v-model="state.queryParams.nickName" placeholder="微信昵称" clearable @keyup.enter.native="handleQuery(true)" />
+						</el-form-item>
+					</el-col>
+					<el-col class="mb5" :xs="24" :sm="12" :md="8" :lg="6" :xl="6">
+						<el-form-item label="手机号码" prop="mobile">
+							<el-input v-model="state.queryParams.mobile" placeholder="手机号码" clearable @keyup.enter.native="handleQuery(true)" />
+						</el-form-item>
+					</el-col>
+				</el-row>
 			</el-form>
+
+			<el-divider style="height: calc(100% - 5px); margin: 0 10px" direction="vertical" />
+
+			<el-row>
+				<el-col>
+					<el-button-group>
+						<el-button type="primary" icon="ele-Search" @click="handleQuery(true)" v-auth="'sysOAuthUser:page'" :loading="options.loading"> 查询 </el-button>
+						<el-button icon="ele-Refresh" @click="resetQuery" :loading="options.loading"> 重置 </el-button>
+					</el-button-group>
+				</el-col>
+			</el-row>
 		</el-card>
 
 		<el-card class="full-table" shadow="hover" style="margin-top: 5px">
-			<el-table :data="state.oAuthUserData" style="width: 100%" v-loading="state.loading" border>
-				<el-table-column type="index" label="序号" width="55" align="center" />
-				<el-table-column prop="platformType" label="平台类型" min-width="80" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag v-if="scope.row.platformType === 1"> 微信公众号 </el-tag>
-						<el-tag v-else-if="scope.row.platformType === 2"> 微信小程序 </el-tag>
-						<el-tag v-else-if="scope.row.platformType === 3"> QQ </el-tag>
-						<el-tag v-else-if="scope.row.platformType === 4"> Gitee </el-tag>
-						<el-tag v-else-if="scope.row.platformType === 5"> Alipay </el-tag>
-						<el-tag v-else> 未知 </el-tag>
-					</template>
-				</el-table-column>
-				<el-table-column prop="account" label="账号" min-width="150" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<a :href="scope.row.platformType === 4 ? 'https://gitee.com/' + scope.row.account : ''" target="_blank">
-							{{ scope.row.account }}
-						</a>
-					</template>
-				</el-table-column>
-				<el-table-column prop="nickName" label="昵称" min-width="150" align="center" show-overflow-tooltip />
-				<el-table-column prop="avatar" label="头像" min-width="100" align="center">
-					<template #default="scope">
-						<el-avatar :src="scope.row.avatar.indexOf('no_portrait.png') > 0 ? '' : scope.row.avatar" :size="32" :style="'vertical-align: middle; color: white; background-color: ' + getRandomColor()">
-							{{ scope.row.nickName?.slice(0, 1).toUpperCase() }}
-						</el-avatar>
-					</template>
-				</el-table-column>
-				<el-table-column prop="email" label="邮箱" min-width="150" align="center" show-overflow-tooltip />
-				<!-- <el-table-column prop="mobile" label="手机号码" min-width="120" align="center" show-overflow-tooltip /> -->
-				<!-- <el-table-column prop="sex" label="性别" width="100" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<el-tag v-if="scope.row.sex == 1"> 男 </el-tag>
-						<el-tag type="danger" v-else> 女 </el-tag>
-					</template>
-				</el-table-column> -->
-				<el-table-column prop="ipAddress" label="IP地址" min-width="150" align="center" show-overflow-tooltip />
-				<el-table-column label="地址" min-width="200" align="center" show-overflow-tooltip>
-					<template #default="scope"> {{ scope.row.country }}{{ scope.row.province }}{{ scope.row.city }} </template>
-				</el-table-column>
-				<!-- <el-table-column label="介绍" min-width="250" align="center" show-overflow-tooltip>
-					<template #default="scope"> {{ scope.row.remark.split(';').length == 7 ? scope.row.remark.split(';')[5] : '' }} </template>
-				</el-table-column> -->
-				<!-- <el-table-column prop="remark" label="备注" align="center" show-overflow-tooltip>
-					<template #default="scope"> {{ scope.row.remark.split(';').length == 7 ? scope.row.remark.split(';')[5] : '' }} </template>
-				</el-table-column> -->
-				<!-- <el-table-column prop="openId" label="OpenId" align="center" show-overflow-tooltip /> -->
-				<!-- <el-table-column prop="unionId" label="UnionId" align="center" show-overflow-tooltip /> -->
-				<el-table-column prop="remark" label="备注" min-width="250" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<div v-if="scope.row.remark.split(';').length == 7">
-							<el-tag effect="light"> 关注 {{ scope.row.remark.split(';')[3] }} </el-tag>
-							<el-tag type="warning" effect="light" style="margin-left: 5px" v-if="scope.row.remark.split(';')[1] > 0"> 粉丝 {{ scope.row.remark.split(';')[1] }} </el-tag>
-							<el-tag type="info" effect="light" style="margin-left: 5px"> {{ formatDate(new Date(scope.row.remark.split(';')[6]), 'YYYY-mm-dd HH:MM:SS') }} </el-tag>
-						</div>
-					</template>
-				</el-table-column>
-				<!-- <el-table-column prop="updateTime" label="更新时间" min-width="150" align="center" show-overflow-tooltip /> -->
-				<el-table-column prop="createTime" label="创建时间" min-width="150" align="center" show-overflow-tooltip />
-				<el-table-column label="修改记录" width="100" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<ModifyRecord :data="scope.row" />
-					</template>
-				</el-table-column>
-				<!-- <el-table-column label="操作" width="140" fixed="right" align="center" show-overflow-tooltip>
-					<template #default="scope">
-						<el-button icon="ele-Edit" size="small" text type="primary" @click="openEditOAuthUser(scope.row)" v-auth="'sysOAuthUser:update'"> 编辑 </el-button>
-						<el-button icon="ele-Delete" size="small" text type="danger" @click="delOAuthUser(scope.row)" v-auth="'sysOAuthUser:delete'"> 删除 </el-button>
-					</template>
-				</el-table-column> -->
-			</el-table>
-			<el-pagination
-				v-model:currentPage="state.tableParams.page"
-				v-model:page-size="state.tableParams.pageSize"
-				:total="state.tableParams.total"
-				:page-sizes="[10, 20, 50, 100]"
-				small
-				background
-				@size-change="handleSizeChange"
-				@current-change="handleCurrentChange"
-				layout="total, sizes, prev, pager, next, jumper"
-			/>
+			<vxe-grid ref="xGrid" class="xGrid-style" v-bind="options" @sort-change="sortChange">
+				<template #toolbar_buttons> </template>
+				<template #toolbar_tools> </template>
+				<template #empty>
+					<el-empty :image-size="200" />
+				</template>
+				<template #row_platformType="{ row }">
+					<el-tag v-if="row.platformType === 1"> 微信公众号 </el-tag>
+					<el-tag v-else-if="row.platformType === 2"> 微信小程序 </el-tag>
+					<el-tag v-else-if="row.platformType === 3"> QQ </el-tag>
+					<el-tag v-else-if="row.platformType === 4"> Alipay </el-tag>
+					<el-tag v-else-if="row.platformType === 5"> Gitee </el-tag>
+					<el-tag v-else> 未知 </el-tag>
+				</template>
+				<template #row_avatar="{ row }">
+					<el-avatar :src="row.avatar" :size="24" style="vertical-align: middle" />
+				</template>
+				<template #row_sex="{ row }">
+					<el-tag v-if="row.sex === 0">男</el-tag>
+					<el-tag v-else type="danger">女</el-tag>
+				</template>
+				<template #row_record="{ row }">
+					<ModifyRecord :data="row" />
+				</template>
+				<template #row_buttons="{ row }">
+					<el-tooltip content="编辑" placement="top">
+						<el-button icon="ele-Edit" size="small" text type="primary" @click="handleEdit(row)" v-auth="'sysOAuthUser:update'" :disabled="row.status === 1" />
+					</el-tooltip>
+					<el-tooltip content="删除" placement="top">
+						<el-button icon="ele-Delete" size="small" text type="danger" @click="handleDelete(row)" v-auth="'sysOAuthUser:delete'" :disabled="row.status === 1" />
+					</el-tooltip>
+				</template>
+				<template #pager>
+					<vxe-pager
+						:loading="options.loading"
+						v-model:current-page="state.tableParams.page"
+						v-model:page-size="state.tableParams.pageSize"
+						:total="state.tableParams.total"
+						@page-change="pageChange"
+					/>
+				</template>
+			</vxe-grid>
 		</el-card>
 
-		<EditOAuthUser ref="editOAuthUserRef" :title="state.editOAuthUserTitle" @handleQuery="handleQuery" />
+		<EditOAuthUser ref="editOAuthUserRef" :title="state.title" @handleQuery="handleQuery" />
 	</div>
 </template>
 
 <script lang="ts" setup name="sysOAuthUser">
 import { onMounted, reactive, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { formatDate } from '/@/utils/formatTime';
+import { auth } from '/@/utils/authFunction';
+import { VxeGridInstance, VxePagerEvents, VxePagerDefines } from 'vxe-table';
+import { useVxeTable } from '/@/hooks/vxeTableOptionsHook';
+
 import EditOAuthUser from '/@/views/system/oAuthUser/component/editOAuthUser.vue';
 import ModifyRecord from '/@/components/table/modifyRecord.vue';
 
@@ -119,54 +91,99 @@ import { getAPI } from '/@/utils/axios-utils';
 import { SysOAuthUserApi } from '/@/api-services/api';
 import { SysOAuthUser } from '/@/api-services/models';
 
+const xGrid = ref<VxeGridInstance>();
 const editOAuthUserRef = ref<InstanceType<typeof EditOAuthUser>>();
 const state = reactive({
-	loading: false,
-	oAuthUserData: [] as Array<SysOAuthUser>,
 	queryParams: {
-		account: undefined,
 		nickName: undefined,
 		mobile: undefined,
 	},
 	tableParams: {
 		page: 1,
-		pageSize: 20,
+		pageSize: 50,
+		field: 'id', // 默认的排序字段
+		order: 'aes', // 排序方向
+		descStr: 'desc', // 降序排序的关键字符
 		total: 0 as any,
 	},
-	editOAuthUserTitle: '',
+	title: '',
 });
 
+// 表格参数配置
+const options = useVxeTable<SysOAuthUser>({
+	id: 'weChatUser',
+	name: '三方账号',
+	columns: [
+		// { type: 'checkbox', width: 40, fixed: 'left' },
+		{ type: 'seq', title: '序号', width: 60, fixed: 'left' },
+		{ field: 'openId', title: 'OpenId', minWidth: 200, showOverflow: 'tooltip' },
+		{ field: 'unionId', title: 'UnionId', minWidth: 200, showOverflow: 'tooltip' },
+		{ field: 'platformType', title: '平台类型', minWidth: 110, showOverflow: 'tooltip', slots: { default: 'row_platformType' } },
+		{ field: 'nickName', title: '昵称', minWidth: 160, showOverflow: 'tooltip' },
+		{ field: 'avatar', title: '头像', minWidth: 70, slots: { default: 'row_avatar' } },
+		{ field: 'mobile', title: '手机号码', minWidth: 160, showOverflow: 'tooltip' },
+		{ field: 'sex', title: '性别', minWidth: 60, showOverflow: 'tooltip', slots: { default: 'row_sex' } },
+		{ field: 'city', title: '城市', minWidth: 150, showOverflow: 'tooltip' },
+		{ field: 'province', title: '省', minWidth: 120, showOverflow: 'tooltip' },
+		{ field: 'country', title: '国家', minWidth: 150, showOverflow: 'tooltip' },
+		{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
+	],
+	enableExport: auth('sysOAuthUser:export'),
+	searchCallback: () => handleQuery(),
+	queryAllCallback: () => fetchData({ pageSize: 99999 }),
+});
+
+// 页面初始化
 onMounted(async () => {
-	handleQuery();
+	await handleQuery();
 });
 
 // 查询操作
-const handleQuery = async () => {
-	state.loading = true;
-	let params = Object.assign(state.queryParams, state.tableParams);
-	var res = await getAPI(SysOAuthUserApi).apiSysOAuthUserPagePost(params);
-	state.oAuthUserData = res.data.result?.items ?? [];
+const handleQuery = async (reset = false) => {
+	options.loading = true;
+	if (reset) state.tableParams.page = 1;
+	var res = await fetchData(null);
+	xGrid.value?.loadData(res.data.result?.items ?? []);
 	state.tableParams.total = res.data.result?.total;
-	state.loading = false;
+	options.loading = false;
+};
+
+// 获取数据
+const fetchData = async (tableParams: any) => {
+	let params = Object.assign(state.queryParams, state.tableParams, tableParams);
+	return getAPI(SysOAuthUserApi).apiSysOAuthUserPagePost(params);
 };
 
 // 重置操作
 const resetQuery = () => {
-	state.queryParams.account = undefined;
 	state.queryParams.nickName = undefined;
 	state.queryParams.mobile = undefined;
+	handleQuery(true);
+};
+
+// 改变页码序号或页面容量
+const pageChange: VxePagerEvents.PageChange = ({ currentPage, pageSize }: VxePagerDefines.PageChangeEventParams) => {
+	state.tableParams.page = currentPage;
+	state.tableParams.pageSize = pageSize;
+	handleQuery();
+};
+
+// 列排序
+const sortChange = (options: any) => {
+	state.tableParams.field = options.field;
+	state.tableParams.order = options.order;
 	handleQuery();
 };
 
 // 打开编辑页面
-const openEditOAuthUser = (row: any) => {
-	state.editOAuthUserTitle = '编辑OAuth账号';
+const handleEdit = (row: any) => {
+	state.title = '编辑微信账号';
 	editOAuthUserRef.value?.openDialog(row);
 };
 
 // 删除
-const delOAuthUser = (row: any) => {
-	ElMessageBox.confirm(`确定删除OAuth账号：【${row.account}】?`, '提示', {
+const handleDelete = (row: any) => {
+	ElMessageBox.confirm(`确定删除三方账号：【${row.nickName}】?`, '提示', {
 		confirmButtonText: '确定',
 		cancelButtonText: '取消',
 		type: 'warning',
@@ -178,25 +195,4 @@ const delOAuthUser = (row: any) => {
 		})
 		.catch(() => {});
 };
-
-// 改变页面容量
-const handleSizeChange = (val: number) => {
-	state.tableParams.pageSize = val;
-	handleQuery();
-};
-
-// 改变页码序号
-const handleCurrentChange = (val: number) => {
-	state.tableParams.page = val;
-	handleQuery();
-};
-
-// 获取随机颜色
-const getRandomColor = () => {
-	var r = Math.round(Math.random() * 255),
-		g = Math.round(Math.random() * 255),
-		b = Math.round(Math.random() * 255);
-	var color = (r << 16) | (g << 8) | b;
-	return '#' + color.toString(16);
-};
 </script>