From ba84f64e373abb1a89f16eb4049b5e57f5ba7595 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 21 Dec 2025 10:02:30 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E3=80=90system=E3=80=91=E7=A7=9F?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=9A100%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/tenant/index.ts                |  2 +-
 .../package}/index.ts                         |  0
 .../tenant/components/package-list.vue        |  4 +-
 .../tenant/components/tenant-list.vue         | 24 ++++++++++-
 src/pages-system/tenant/index.vue             |  2 +-
 .../tenant/package/detail/index.vue           |  4 +-
 .../tenant/package/form/index.vue             |  5 ++-
 .../tenant/tenant/detail/index.vue            |  4 +-
 src/pages-system/tenant/tenant/form/index.vue |  8 ++--
 src/pages/index/index.ts                      | 40 +++++++++++++++++++
 10 files changed, 78 insertions(+), 15 deletions(-)
 rename src/api/system/{tenant-package => tenant/package}/index.ts (100%)

diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
index 82c5348..0c1f026 100644
--- a/src/api/system/tenant/index.ts
+++ b/src/api/system/tenant/index.ts
@@ -9,7 +9,7 @@ export interface Tenant {
   contactName: string
   contactMobile: string
   accountCount: number
-  expireTime: Date
+  expireTime: Date | any
   websites: string[]
   status: number
   createTime?: Date
diff --git a/src/api/system/tenant-package/index.ts b/src/api/system/tenant/package/index.ts
similarity index 100%
rename from src/api/system/tenant-package/index.ts
rename to src/api/system/tenant/package/index.ts
diff --git a/src/pages-system/tenant/components/package-list.vue b/src/pages-system/tenant/components/package-list.vue
index e63a2f3..4203946 100644
--- a/src/pages-system/tenant/components/package-list.vue
+++ b/src/pages-system/tenant/components/package-list.vue
@@ -56,10 +56,10 @@
 </template>
 
 <script lang="ts" setup>
-import type { TenantPackage } from '@/api/system/tenant-package'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import type { LoadMoreState } from '@/http/types'
 import { onMounted, ref } from 'vue'
-import { getTenantPackagePage } from '@/api/system/tenant-package'
+import { getTenantPackagePage } from '@/api/system/tenant/package'
 import { useAccess } from '@/hooks/useAccess'
 import { DICT_TYPE } from '@/utils/constants'
 import { formatDateTime } from '@/utils/date'
diff --git a/src/pages-system/tenant/components/tenant-list.vue b/src/pages-system/tenant/components/tenant-list.vue
index 004d624..9d01fef 100644
--- a/src/pages-system/tenant/components/tenant-list.vue
+++ b/src/pages-system/tenant/components/tenant-list.vue
@@ -22,6 +22,10 @@
             <text class="mr-8rpx shrink-0 text-[#999]">联系人：</text>
             <text class="min-w-0 flex-1 truncate">{{ item.contactName || '-' }}</text>
           </view>
+          <view class="mb-12rpx flex items-center text-28rpx text-[#666]">
+            <text class="mr-8rpx text-[#999]">租户套餐：</text>
+            <text>{{ getPackageName(item.packageId) }}</text>
+          </view>
           <view class="mb-12rpx flex items-center text-28rpx text-[#666]">
             <text class="mr-8rpx text-[#999]">联系手机：</text>
             <text>{{ item.contactMobile || '-' }}</text>
@@ -65,9 +69,11 @@
 
 <script lang="ts" setup>
 import type { Tenant } from '@/api/system/tenant'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import type { LoadMoreState } from '@/http/types'
 import { onMounted, ref } from 'vue'
 import { getTenantPage } from '@/api/system/tenant'
+import { getTenantPackageList } from '@/api/system/tenant/package'
 import { useAccess } from '@/hooks/useAccess'
 import { DICT_TYPE } from '@/utils/constants'
 import { formatDateTime } from '@/utils/date'
@@ -76,12 +82,27 @@ import TenantSearchForm from './tenant-search-form.vue'
 const { hasAccessByCodes } = useAccess()
 const total = ref(0)
 const list = ref<Tenant[]>([])
+const packageList = ref<TenantPackage[]>([])
 const loadMoreState = ref<LoadMoreState>('loading')
 const queryParams = ref({
   pageNo: 1,
   pageSize: 10,
 })
 
+/** 获取套餐名称 */
+function getPackageName(packageId?: number) {
+  if (packageId === 0) {
+    return '系统租户'
+  }
+  const pkg = packageList.value.find(item => item.id === packageId)
+  return pkg?.name || '-'
+}
+
+/** 加载租户套餐列表 */
+async function loadPackageList() {
+  packageList.value = await getTenantPackageList()
+}
+
 /** 查询租户列表 */
 async function getList() {
   loadMoreState.value = 'loading'
@@ -141,7 +162,8 @@ onReachBottom(() => {
 })
 
 /** 初始化 */
-onMounted(() => {
+onMounted(async () => {
+  await loadPackageList()
   getList()
 })
 </script>
diff --git a/src/pages-system/tenant/index.vue b/src/pages-system/tenant/index.vue
index 0991d23..ee323d2 100644
--- a/src/pages-system/tenant/index.vue
+++ b/src/pages-system/tenant/index.vue
@@ -24,8 +24,8 @@
 <script lang="ts" setup>
 import { computed, ref } from 'vue'
 import { navigateBackPlus } from '@/utils'
-import TenantList from './components/tenant-list.vue'
 import PackageList from './components/package-list.vue'
+import TenantList from './components/tenant-list.vue'
 
 definePage({
   style: {
diff --git a/src/pages-system/tenant/package/detail/index.vue b/src/pages-system/tenant/package/detail/index.vue
index 7acae86..9d030b2 100644
--- a/src/pages-system/tenant/package/detail/index.vue
+++ b/src/pages-system/tenant/package/detail/index.vue
@@ -41,10 +41,10 @@
 </template>
 
 <script lang="ts" setup>
-import type { TenantPackage } from '@/api/system/tenant-package'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import { onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
-import { deleteTenantPackage, getTenantPackage } from '@/api/system/tenant-package'
+import { deleteTenantPackage, getTenantPackage } from '@/api/system/tenant/package'
 import { useAccess } from '@/hooks/useAccess'
 import { navigateBackPlus } from '@/utils'
 import { DICT_TYPE } from '@/utils/constants'
diff --git a/src/pages-system/tenant/package/form/index.vue b/src/pages-system/tenant/package/form/index.vue
index dab99e2..29d7e9b 100644
--- a/src/pages-system/tenant/package/form/index.vue
+++ b/src/pages-system/tenant/package/form/index.vue
@@ -57,10 +57,10 @@
 </template>
 
 <script lang="ts" setup>
-import type { TenantPackage } from '@/api/system/tenant-package'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import { computed, onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
-import { createTenantPackage, getTenantPackage, updateTenantPackage } from '@/api/system/tenant-package'
+import { createTenantPackage, getTenantPackage, updateTenantPackage } from '@/api/system/tenant/package'
 import { getIntDictOptions } from '@/hooks/useDict'
 import { navigateBackPlus } from '@/utils'
 import { DICT_TYPE } from '@/utils/constants'
@@ -130,6 +130,7 @@ async function handleSubmit() {
 }
 
 /** 初始化 */
+// TODO @芋艿：这里有个租户套餐的设置；只支持 pc 操作；
 onMounted(() => {
   getDetail()
 })
diff --git a/src/pages-system/tenant/tenant/detail/index.vue b/src/pages-system/tenant/tenant/detail/index.vue
index 8dfa9aa..d6015b6 100644
--- a/src/pages-system/tenant/tenant/detail/index.vue
+++ b/src/pages-system/tenant/tenant/detail/index.vue
@@ -47,11 +47,11 @@
 
 <script lang="ts" setup>
 import type { Tenant } from '@/api/system/tenant'
-import type { TenantPackage } from '@/api/system/tenant-package'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import { onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import { deleteTenant, getTenant } from '@/api/system/tenant'
-import { getTenantPackageList } from '@/api/system/tenant-package'
+import { getTenantPackageList } from '@/api/system/tenant/package'
 import { useAccess } from '@/hooks/useAccess'
 import { navigateBackPlus } from '@/utils'
 import { DICT_TYPE } from '@/utils/constants'
diff --git a/src/pages-system/tenant/tenant/form/index.vue b/src/pages-system/tenant/tenant/form/index.vue
index 5e9b06e..b008c7c 100644
--- a/src/pages-system/tenant/tenant/form/index.vue
+++ b/src/pages-system/tenant/tenant/form/index.vue
@@ -60,7 +60,7 @@
             label="用户密码"
             label-width="200rpx"
             prop="password"
-            type="password"
+            show-password
             clearable
             placeholder="请输入用户密码"
           />
@@ -111,11 +111,11 @@
 
 <script lang="ts" setup>
 import type { Tenant } from '@/api/system/tenant'
-import type { TenantPackage } from '@/api/system/tenant-package'
+import type { TenantPackage } from '@/api/system/tenant/package'
 import { computed, onMounted, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
 import { createTenant, getTenant, updateTenant } from '@/api/system/tenant'
-import { getTenantPackageList } from '@/api/system/tenant-package'
+import { getTenantPackageList } from '@/api/system/tenant/package'
 import { getIntDictOptions } from '@/hooks/useDict'
 import { navigateBackPlus } from '@/utils'
 import { DICT_TYPE } from '@/utils/constants'
@@ -135,7 +135,7 @@ const toast = useToast()
 const getTitle = computed(() => props.id ? '编辑租户' : '新增租户')
 const formLoading = ref(false)
 const packageOptions = ref<TenantPackage[]>([])
-const formData = ref<Tenant & { username?: string; password?: string }>({
+const formData = ref<Tenant & { username?: string, password?: string }>({
   id: undefined,
   name: '',
   packageId: 0,
diff --git a/src/pages/index/index.ts b/src/pages/index/index.ts
index c400223..78c6a77 100644
--- a/src/pages/index/index.ts
+++ b/src/pages/index/index.ts
@@ -117,6 +117,30 @@ const menuGroupsData: MenuGroup[] = [
         iconColor: '#ff85c0',
         permission: 'system:notify-template:query',
       },
+      {
+        key: 'tenant',
+        name: '租户管理',
+        icon: 'shop',
+        url: '/pages-system/tenant/index',
+        iconColor: '#9254de',
+        permission: 'system:tenant:query',
+      },
+      {
+        key: 'social',
+        name: '社交用户',
+        icon: 'share',
+        url: '/pages-system/social/index',
+        iconColor: '#08979c',
+        permission: 'system:social-client:query',
+      },
+      {
+        key: 'oauth2',
+        name: 'OAuth2 管理',
+        icon: 'shield-check',
+        url: '/pages-system/oauth2/index',
+        iconColor: '#d48806',
+        permission: 'system:oauth2-client:query',
+      },
     ],
   },
   {
@@ -139,6 +163,22 @@ const menuGroupsData: MenuGroup[] = [
         iconColor: '#f5222d',
         permission: 'infra:api-error-log:query',
       },
+      {
+        key: 'config',
+        name: '参数配置',
+        icon: 'setting',
+        url: '/pages-infra/config/index',
+        iconColor: '#597ef7',
+        permission: 'infra:config:query',
+      },
+      {
+        key: 'dataSourceConfig',
+        name: '数据源配置',
+        icon: 'database',
+        url: '/pages-infra/data-source-config/index',
+        iconColor: '#13c2c2',
+        permission: 'infra:data-source-config:query',
+      },
       {
         key: 'websocket',
         name: 'WebSocket',