gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎调整三方账号页面及升级依赖

Browse Source
This commit is contained in:
zuohuaijun 2024-09-12 01:06:52 +08:00
parent 967230876a
commit ed32d75357
3 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj
View File

@ -41,7 +41,7 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.167" />
<PackageReference Include="SSH.NET" Version="2024.1.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.5" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1084" />
<PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1085" />
<PackageReference Include="UAParser" Version="3.1.47" />
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
</ItemGroup>

12
Web/package.json
View File

@ -2,7 +2,7 @@
"name": "admin.net.pro",
"type": "module",
"version": "2.4.33",
"lastBuildTime": "2024.09.10",
"lastBuildTime": "2024.09.12",
"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
"author": "zuohuaijun",
"license": "MIT",
@ -60,7 +60,7 @@
"splitpanes": "^3.1.5",
"vcrontab-3": "^3.3.22",
"vform3-builds": "^3.0.10",
"vue": "^3.5.3",
"vue": "^3.5.4",
"vue-clipboard3": "^2.0.0",
"vue-demi": "0.14.6",
"vue-draggable-plus": "^0.5.3",
@ -68,10 +68,10 @@
"vue-i18n": "^10.0.0",
"vue-json-pretty": "^2.4.0",
"vue-plugin-hiprint": "0.0.57-beta30",
"vue-router": "^4.4.3",
"vue-router": "^4.4.4",
"vue-signature-pad": "^3.0.2",
"vue3-tree-org": "^4.2.2",
"vxe-pc-ui": "^4.1.21",
"vxe-pc-ui": "^4.1.25",
"vxe-table": "^4.7.59",
"vxe-table-plugin-element": "^4.0.4",
"vxe-table-plugin-export-xlsx": "^4.0.5",
@ -89,7 +89,7 @@
"@typescript-eslint/parser": "^8.5.0",
"@vitejs/plugin-vue": "^5.1.3",
"@vitejs/plugin-vue-jsx": "^4.0.1",
"@vue/compiler-sfc": "^3.5.3",
"@vue/compiler-sfc": "^3.5.4",
"code-inspector-plugin": "^0.16.1",
"eslint": "^9.10.0",
"eslint-plugin-vue": "^9.28.0",
@ -100,7 +100,7 @@
"sass": "^1.78.0",
"terser": "^5.32.0",
"typescript": "^5.6.2",
"vite": "^5.4.3",
"vite": "^5.4.4",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression2": "^1.3.0",
"vite-plugin-vue-setup-extend": "^0.4.0",

30
Web/src/views/system/oAuthUser/index.vue
View File

@ -39,17 +39,18 @@
<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-if="row.platformType === 4"> Gitee </el-tag>
<el-tag v-else-if="row.platformType === 5"> Alipay </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>
<el-tag v-if="row.sex === 1">男</el-tag>
<el-tag v-else-if="row.sex === 2" type="danger">女</el-tag>
</template>
<template #row_address="{ row }"> {{ row.country }} {{ row.province }} {{ row.city }} </template>
<template #row_record="{ row }">
<ModifyRecord :data="row" />
</template>
@ -97,25 +98,26 @@ const state = reactive({
});
// 本地存储参数
const localPageParamKey = 'localPageParam:weChatUser';
const localPageParamKey = 'localPageParam:oAuthUser';
// 表格参数配置
const options = useVxeTable<SysOAuthUser>(
{
id: 'weChatUser',
id: 'oAuthUser',
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: 'avatar', title: '头像', minWidth: 60, slots: { default: 'row_avatar' } },
{ 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' },
{ field: 'mobile', title: '手机号码', minWidth: 150, showOverflow: 'tooltip' },
{ field: '', title: '地址', minWidth: 200, showOverflow: 'tooltip', slots: { default: 'row_address' } },
// { field: 'city', title: '城市', minWidth: 150, showOverflow: 'tooltip' },
// { field: 'province', title: '省', minWidth: 120, showOverflow: 'tooltip' },
// { field: 'country', title: '国家', minWidth: 150, showOverflow: 'tooltip' },
{ field: 'openId', title: 'OpenId', showOverflow: 'tooltip' },
{ field: 'unionId', title: 'UnionId', showOverflow: 'tooltip' },
{ title: '操作', fixed: 'right', width: 100, showOverflow: true, slots: { default: 'row_buttons' } },
],
},
@ -159,7 +161,7 @@ const resetQuery = async () => {
// 打开编辑页面
const handleEdit = (row: any) => {
state.title = '编辑微信账号';
state.title = '编辑三方账号';
editOAuthUserRef.value?.openDialog(row);
};