From 2ab79f5d1778e67673ff8147f72f6e61542dc864 Mon Sep 17 00:00:00 2001
From: BabyBoy <2019108827@qq.com>
Date: Sat, 20 Sep 2025 15:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7=E5=A5=97?=
 =?UTF-8?q?=E9=A4=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/darren/index.vue               |  2 +-
 src/views/darrenorder/index.vue          |  2 +-
 src/views/darrenuser/index.vue           |  2 +-
 src/views/system/tenantPackage/index.vue | 18 ++++++++++--------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/darren/index.vue b/src/views/darren/index.vue
index 42f14f3..104d05e 100644
--- a/src/views/darren/index.vue
+++ b/src/views/darren/index.vue
@@ -52,7 +52,7 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" border :data="tenantList" @selection-change="handleSelectionChange">
+      <el-table border :data="tenantList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="id" align="center" prop="id" />
         <el-table-column label="名字" align="center" prop="personName" />
diff --git a/src/views/darrenorder/index.vue b/src/views/darrenorder/index.vue
index f819faa..1633ab2 100644
--- a/src/views/darrenorder/index.vue
+++ b/src/views/darrenorder/index.vue
@@ -27,7 +27,7 @@
     </transition>
 
     <el-card shadow="hover">
-      <el-table v-loading="loading" border :data="tenantList">
+      <el-table  border :data="tenantList">
         <!-- <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="id" align="center" prop="id" /> -->
         <el-table-column label="团长姓名" align="center" prop="spreadUserName" />
diff --git a/src/views/darrenuser/index.vue b/src/views/darrenuser/index.vue
index c06e502..1796b9c 100644
--- a/src/views/darrenuser/index.vue
+++ b/src/views/darrenuser/index.vue
@@ -34,7 +34,7 @@
     </transition>
 
     <el-card shadow="hover">
-      <el-table v-loading="loading" border :data="tenantList">
+      <el-table border :data="tenantList">
         <el-table-column label="团长姓名" align="center" prop="spreadUserName" />
         <el-table-column label="用户昵称" align="center" prop="nickname" />
         <el-table-column label="用户手机号" align="center" prop="phoneHidden" />
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index e4863e1..e9c87c4 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -9,8 +9,7 @@
             </el-form-item>
             <el-form-item label="套餐类型" prop="tenantType">
               <el-select v-model="queryParams.tenantType" placeholder="请选择套餐类型" clearable>
-                <el-option label="代理租户" value="3"></el-option>
-                <el-option label="店铺租户" value="2"></el-option>
+                <el-option v-for="item in signList" :label="item.label" :value="item.value" :key="item.value"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item>
@@ -51,9 +50,7 @@
         <el-table-column label="套餐名称" align="center" prop="packageName" />
         <el-table-column label="套餐类型" align="center" prop="tenantType">
           <template #default="scope">
-            <span v-if="scope.row.tenantType === 3">代理租户</span>
-            <span v-else-if="scope.row.tenantType === 2">店铺租户</span>
-            <span v-else>{{ scope.row.tenantType }}</span>
+            {{ signList.find((item) => item.value === scope.row.tenantType)?.label || scope.row.tenantType }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" prop="remark" />
@@ -85,8 +82,7 @@
         </el-form-item>
         <el-form-item label="套餐类型" prop="tenantType">
           <el-select v-model="form.tenantType" placeholder="请选择套餐类型" clearable>
-            <el-option label="代理租户" :value="3"></el-option>
-            <el-option label="店铺租户" :value="2"></el-option>
+            <el-option v-for="item in signList" :label="item.label" :value="item.value" :key="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="关联菜单">
@@ -131,7 +127,12 @@ import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api
 import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types';
 import { MenuTreeOption } from '@/api/system/menu/types';
 import to from 'await-to-js';
-
+import { getDictionaryByKey } from '@/utils/dict';
+const signList = ref([]); //
+const getByKey = async () => {
+  const value1 = await getDictionaryByKey('sys_tenant_type');
+  signList.value = value1;
+};
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const tenantPackageList = ref<TenantPkgVO[]>([]);
@@ -351,6 +352,7 @@ const handleExport = () => {
 };
 
 onMounted(() => {
+  getByKey();
   getList();
 });
 </script>