diff --git a/.env.development b/.env.development
index fda2274..a19076b 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://192.168.3.49:8808/'
+VITE_API_URL = 'http://192.168.3.11:8808/'
diff --git a/package-lock.json b/package-lock.json
index 3efec55..bd0144a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,6 +20,7 @@
         "echarts": "^5.5.0",
         "echarts-gl": "^2.0.9",
         "echarts-wordcloud": "^2.1.0",
+        "element-china-area-data": "^6.1.0",
         "element-plus": "^2.10.7",
         "file-saver": "^2.0.5",
         "js-cookie": "^3.0.5",
@@ -2670,6 +2671,12 @@
         "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
+    "node_modules/china-division": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/china-division/-/china-division-2.7.0.tgz",
+      "integrity": "sha512-4uUPAT+1WfqDh5jytq7omdCmHNk3j+k76zEG/2IqaGcYB90c2SwcixttcypdsZ3T/9tN1TTpBDoeZn+Yw/qBEA==",
+      "license": "MIT"
+    },
     "node_modules/chokidar": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-4.0.3.tgz",
@@ -2989,6 +2996,15 @@
         "echarts": "^5.0.1"
       }
     },
+    "node_modules/element-china-area-data": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/element-china-area-data/-/element-china-area-data-6.1.0.tgz",
+      "integrity": "sha512-IkpcjwQv2A/2AxFiSoaISZ+oMw1rZCPUSOg5sOCwT5jKc96TaawmKZeY81xfxXsO0QbKxU5LLc6AirhG52hUmg==",
+      "license": "MIT",
+      "dependencies": {
+        "china-division": "^2.7.0"
+      }
+    },
     "node_modules/element-plus": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/element-plus/-/element-plus-2.11.8.tgz",
diff --git a/package.json b/package.json
index b071e93..5062853 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
     "echarts-wordcloud": "^2.1.0",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.10.7",
     "file-saver": "^2.0.5",
     "js-cookie": "^3.0.5",
diff --git a/src/api/system/tenant/index.ts b/src/api/system/tenant/index.ts
new file mode 100644
index 0000000..dae12d2
--- /dev/null
+++ b/src/api/system/tenant/index.ts
@@ -0,0 +1,46 @@
+import request from '/@/utils/request';
+
+// 获取租户列表
+export function getTenantList(query: Object) {
+	return request({
+		url: '/api/v1/system/tenant/list',
+		method: 'get',
+		params: query,
+	});
+}
+
+// 获取租户详情
+export function getTenant(id: number) {
+	return request({
+		url: '/api/v1/system/tenant/get',
+		method: 'get',
+		params: { id },
+	});
+}
+
+// 新增租户
+export function addTenant(data: object) {
+	return request({
+		url: '/api/v1/system/tenant/add',
+		method: 'post',
+		data: data,
+	});
+}
+
+// 修改租户
+export function editTenant(data: object) {
+	return request({
+		url: '/api/v1/system/tenant/edit',
+		method: 'put',
+		data: data,
+	});
+}
+
+// 删除租户
+export function deleteTenant(ids: number[]) {
+	return request({
+		url: '/api/v1/system/tenant/delete',
+		method: 'delete',
+		data: { ids },
+	});
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 36c5783..7265d38 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -21,7 +21,8 @@ const service: AxiosInstance = axios.create({
 // 配置新建第二个 axios 实例（新功能服务）
 const newService: AxiosInstance = axios.create({
 	// baseURL: 'http://192.168.3.95:8000/',
-	baseURL: 'http://192.168.3.49:8000/',
+	// baseURL: 'http://192.168.3.49:8000/',
+	baseURL: 'http://192.168.3.11:8000/',
 	timeout: 50000,
 	headers: { 'Content-Type': 'application/json' },
 	paramsSerializer: {
diff --git a/src/views/system/tenant/component/editTenant.vue b/src/views/system/tenant/component/editTenant.vue
new file mode 100644
index 0000000..feb24c9
--- /dev/null
+++ b/src/views/system/tenant/component/editTenant.vue
@@ -0,0 +1,363 @@
+<template>
+	<div class="system-edit-tenant-container">
+		<el-dialog :title="(ruleForm.id !== 0 ? '修改' : '添加') + '租户'" v-model="isShowDialog" width="769px">
+			<el-form ref="formRef" :model="ruleForm" :rules="rules" size="default" label-width="90px">
+				<el-row :gutter="35">
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="租户名称" prop="tenantName">
+							<el-input v-model="ruleForm.tenantName" placeholder="请输入租户名称" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="租户类型" prop="tenantType">
+							<el-select v-model="ruleForm.tenantType" placeholder="请选择租户类型" clearable class="w100">
+								<el-option label="普通类型" :value="1"></el-option>
+								<el-option label="代理类型" :value="2"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="联系人" prop="contactPerson">
+							<el-input v-model="ruleForm.contactPerson" placeholder="请输入联系人" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="电话" prop="phone">
+							<el-input v-model="ruleForm.phone" placeholder="请输入电话" clearable></el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="所属城市" prop="city">
+							<el-cascader
+								v-model="ruleForm.city"
+								:options="cityOptions"
+								placeholder="请选择省市"
+								clearable
+								class="w100"
+							></el-cascader>
+						</el-form-item>
+					</el-col>
+					
+					<!-- 新增时显示账号和密码 -->
+					<template v-if="ruleForm.id === 0">
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+							<el-form-item label="租户账号" prop="tenantAccount">
+								<el-input v-model="ruleForm.tenantAccount" placeholder="字母或数字，6位以上" clearable></el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+							<el-form-item label="密码" prop="password">
+								<el-input v-model="ruleForm.password" placeholder="请输入密码" type="password" show-password clearable @input="checkPasswordStrength"></el-input>
+								<div class="password-strength" v-if="ruleForm.password">
+									强度: <span :class="passwordStrengthClass">{{ passwordStrengthText }}</span>
+								</div>
+							</el-form-item>
+						</el-col>
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+							<el-form-item label="确认密码" prop="confirmPassword">
+								<el-input v-model="ruleForm.confirmPassword" placeholder="请再次输入密码" type="password" show-password clearable></el-input>
+							</el-form-item>
+						</el-col>
+					</template>
+
+					<!-- 修改时只显示账号（不可改） -->
+					<template v-else>
+						<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+							<el-form-item label="租户账号">
+								<el-input v-model="ruleForm.tenantAccount" disabled></el-input>
+							</el-form-item>
+						</el-col>
+					</template>
+
+					<el-col :span="24" class="mb20">
+						<el-form-item label="营业执照" prop="businessLicense">
+							<div class="upload-container">
+								<el-upload
+									class="avatar-uploader"
+									action="#"
+									:auto-upload="false"
+									:show-file-list="false"
+									:on-change="handleAvatarSuccess"
+									:before-upload="beforeAvatarUpload"
+								>
+									<img v-if="ruleForm.businessLicense" :src="ruleForm.businessLicense" class="avatar" />
+									<div v-else class="upload-placeholder">
+										<el-icon class="avatar-uploader-icon"><Plus /></el-icon>
+										<span class="upload-text">点击上传营业执照</span>
+									</div>
+								</el-upload>
+								<div class="upload-tip">支持 jpg、png 格式，文件大小不超过 2MB</div>
+							</div>
+						</el-form-item>
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="onCancel" size="default">取 消</el-button>
+					<el-button type="primary" @click="onSubmit" size="default">{{ ruleForm.id !== 0 ? '修 改' : '添 加' }}</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+
+<script lang="ts">
+import { reactive, toRefs, defineComponent, ref, unref, computed } from 'vue';
+import { ElMessage, UploadProps } from 'element-plus';
+import { Plus } from '@element-plus/icons-vue';
+import { addTenant, editTenant, getTenant } from '/@/api/system/tenant';
+import { pcTextArr } from 'element-china-area-data';
+
+export default defineComponent({
+	name: 'systemEditTenant',
+	components: { Plus },
+	setup(prop, { emit }) {
+		const formRef = ref<HTMLElement | null>(null);
+		
+		// 省市数据（使用 element-china-area-data）
+		const cityOptions = pcTextArr;
+
+		const state = reactive({
+			isShowDialog: false,
+			passwordStrength: 0,
+			ruleForm: {
+				id: 0,
+				tenantName: '',
+				tenantType: '' as number | '',
+				contactPerson: '',
+				phone: '',
+				city: [] as string[],
+				tenantAccount: '',
+				password: '',
+				confirmPassword: '',
+				businessLicense: '',
+			},
+			rules: {
+				tenantName: [{ required: true, message: '请输入租户名称', trigger: 'blur' }],
+				tenantType: [{ required: true, message: '请选择租户类型', trigger: 'change' }],
+				contactPerson: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+				phone: [
+					{ required: true, message: '请输入电话', trigger: 'blur' },
+					{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+				],
+				city: [{ required: true, message: '请选择所属城市', trigger: 'change' }],
+				tenantAccount: [
+					{ required: true, message: '请输入租户账号', trigger: 'blur' },
+					{ pattern: /^[a-zA-Z0-9]{6,}$/, message: '账号必须为字母或数字，且长度至少6位', trigger: 'blur' }
+				],
+				password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+				confirmPassword: [
+					{ required: true, message: '请再次输入密码', trigger: 'blur' },
+					{
+						validator: (rule: any, value: any, callback: any) => {
+							if (value !== state.ruleForm.password) {
+								callback(new Error('两次输入密码不一致'));
+							} else {
+								callback();
+							}
+						},
+						trigger: 'blur'
+					}
+				],
+				businessLicense: [{ required: true, message: '请上传营业执照', trigger: 'change' }]
+			},
+		});
+
+		// 密码强度检测
+		const checkPasswordStrength = () => {
+			const pwd = state.ruleForm.password;
+			let strength = 0;
+			if (pwd.length >= 6) strength++;
+			if (/[A-Z]/.test(pwd)) strength++;
+			if (/[a-z]/.test(pwd)) strength++;
+			if (/[0-9]/.test(pwd)) strength++;
+			if (/[^A-Za-z0-9]/.test(pwd)) strength++;
+			state.passwordStrength = strength;
+		};
+
+		const passwordStrengthText = computed(() => {
+			const s = state.passwordStrength;
+			if (s < 2) return '弱';
+			if (s < 4) return '中';
+			return '强';
+		});
+
+		const passwordStrengthClass = computed(() => {
+			const s = state.passwordStrength;
+			if (s < 2) return 'strength-weak';
+			if (s < 4) return 'strength-medium';
+			return 'strength-strong';
+		});
+
+		// 打开弹窗
+		const openDialog = (row?: any) => {
+			resetForm();
+			if (row) {
+				state.ruleForm = {
+					id: row.id,
+					tenantName: row.tenantName,
+					tenantType: row.tenantType,
+					contactPerson: row.contactPerson,
+					phone: row.phone,
+					city: row.city || [],
+					tenantAccount: row.tenantAccount,
+					password: '', // 修改时不显示密码
+					confirmPassword: '',
+					businessLicense: row.businessLicense,
+				};
+				// 获取详情接口（可选）
+				// getTenant(row.id).then(...)
+			}
+			state.isShowDialog = true;
+		};
+
+		const closeDialog = () => {
+			state.isShowDialog = false;
+		};
+
+		const onCancel = () => {
+			closeDialog();
+		};
+
+		const onSubmit = () => {
+			const formWrap = unref(formRef) as any;
+			if (!formWrap) return;
+			formWrap.validate((valid: boolean) => {
+				if (valid) {
+					if (state.ruleForm.id === 0) {
+						addTenant(state.ruleForm).then(() => {
+							ElMessage.success('添加成功');
+							closeDialog();
+							emit('getTenantList');
+						});
+					} else {
+						// 过滤掉密码字段，或者后端接口决定是否更新密码
+						// 根据需求，修改时不能修改密码
+						const { password, confirmPassword, tenantAccount, ...rest } = state.ruleForm;
+						editTenant({ ...rest, id: state.ruleForm.id }).then(() => {
+							ElMessage.success('修改成功');
+							closeDialog();
+							emit('getTenantList');
+						});
+					}
+				}
+			});
+		};
+
+		const resetForm = () => {
+			state.ruleForm = {
+				id: 0,
+				tenantName: '',
+				tenantType: '',
+				contactPerson: '',
+				phone: '',
+				city: [],
+				tenantAccount: '',
+				password: '',
+				confirmPassword: '',
+				businessLicense: '',
+			};
+			state.passwordStrength = 0;
+		};
+
+		// 模拟上传图片
+		const handleAvatarSuccess: UploadProps['onChange'] = (uploadFile) => {
+			state.ruleForm.businessLicense = URL.createObjectURL(uploadFile.raw!);
+		};
+
+		const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+			if (rawFile.type !== 'image/jpeg' && rawFile.type !== 'image/png') {
+				ElMessage.error('Avatar picture must be JPG/PNG format!');
+				return false;
+			} else if (rawFile.size / 1024 / 1024 > 2) {
+				ElMessage.error('Avatar picture size can not exceed 2MB!');
+				return false;
+			}
+			return true;
+		};
+
+		return {
+			openDialog,
+			closeDialog,
+			onCancel,
+			onSubmit,
+			formRef,
+			cityOptions,
+			checkPasswordStrength,
+			passwordStrengthText,
+			passwordStrengthClass,
+			handleAvatarSuccess,
+			beforeAvatarUpload,
+			...toRefs(state),
+		};
+	},
+});
+</script>
+
+<style scoped lang="scss">
+.system-edit-tenant-container {
+	.avatar-uploader .avatar {
+		width: 178px;
+		height: 178px;
+		display: block;
+		object-fit: cover;
+		border-radius: 6px;
+	}
+	.upload-container {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+	}
+	.upload-placeholder {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 178px;
+		height: 178px;
+		color: #8c939d;
+		background-color: #f5f7fa;
+		
+		.el-icon {
+			font-size: 28px;
+			margin-bottom: 8px;
+		}
+		
+		.upload-text {
+			font-size: 12px;
+			color: #8c939d;
+		}
+	}
+	.upload-tip {
+		margin-top: 8px;
+		font-size: 12px;
+		color: #909399;
+		line-height: 1.5;
+	}
+}
+.avatar-uploader .el-upload {
+	border: 1px dashed var(--el-border-color);
+	border-radius: 6px;
+	cursor: pointer;
+	position: relative;
+	overflow: hidden;
+	transition: var(--el-transition-duration-fast);
+}
+.avatar-uploader .el-upload:hover {
+	border-color: var(--el-color-primary);
+	.upload-placeholder {
+		color: var(--el-color-primary);
+		.upload-text {
+			color: var(--el-color-primary);
+		}
+	}
+}
+.password-strength {
+	font-size: 12px;
+	margin-top: 5px;
+	.strength-weak { color: #f56c6c; }
+	.strength-medium { color: #e6a23c; }
+	.strength-strong { color: #67c23a; }
+}
+</style>
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
new file mode 100644
index 0000000..162e4a7
--- /dev/null
+++ b/src/views/system/tenant/index.vue
@@ -0,0 +1,203 @@
+<template>
+	<div class="system-tenant-container">
+		<el-card shadow="hover">
+			<div class="system-tenant-search mb15">
+				<el-form :model="tableData.param" ref="queryRef" :inline="true" label-width="68px">
+					<el-form-item label="租户名称" prop="tenantName">
+						<el-input
+							v-model="tableData.param.tenantName"
+							placeholder="请输入租户名称"
+							clearable
+							size="default"
+							style="width: 240px"
+							@keyup.enter.native="tenantList"
+						/>
+					</el-form-item>
+					<el-form-item label="租户类型" prop="tenantType">
+						<el-select v-model="tableData.param.tenantType" placeholder="请选择租户类型" clearable size="default" style="width: 240px">
+							<el-option label="普通类型" :value="1" />
+							<el-option label="代理类型" :value="2" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="所属城市" prop="city">
+						<el-cascader
+							v-model="tableData.param.city"
+							:options="cityOptions"
+							placeholder="请选择城市"
+							clearable
+							size="default"
+							style="width: 240px"
+						/>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="tenantList">
+							<el-icon><ele-Search /></el-icon>
+							查询
+						</el-button>
+						<el-button size="default" @click="resetQuery(queryRef)">
+							<el-icon><ele-Refresh /></el-icon>
+							重置
+						</el-button>
+						<el-button size="default" type="success" class="ml10" @click="onOpenAddTenant">
+							<el-icon><ele-FolderAdd /></el-icon>
+							新增租户
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-table :data="tableData.data" style="width: 100%" v-loading="tableData.loading">
+				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column prop="tenantName" label="租户名称" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="tenantType" label="租户类型" show-overflow-tooltip>
+					<template #default="scope">
+						<el-tag v-if="scope.row.tenantType === 1">普通类型</el-tag>
+						<el-tag v-else-if="scope.row.tenantType === 2" type="warning">代理类型</el-tag>
+						<el-tag v-else type="info">未知</el-tag>
+					</template>
+				</el-table-column>
+				<el-table-column prop="city" label="所属城市" show-overflow-tooltip>
+					<template #default="scope">
+						{{ getCityName(scope.row.city) }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="contactPerson" label="联系人" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="phone" label="电话" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="businessLicense" label="营业执照" align="center">
+					<template #default="scope">
+						<el-image
+							style="width: 50px; height: 50px"
+							:src="scope.row.businessLicense"
+							:preview-src-list="[scope.row.businessLicense]"
+							fit="cover"
+							v-if="scope.row.businessLicense"
+						/>
+						<span v-else>无</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="操作" width="200">
+					<template #default="scope">
+						<el-button size="small" text type="primary" @click="onOpenEditTenant(scope.row)">修改</el-button>
+						<!-- <el-button size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button> -->
+					</template>
+				</el-table-column>
+			</el-table>
+			<pagination
+				v-show="tableData.total > 0"
+				:total="tableData.total"
+				v-model:page="tableData.param.pageNum"
+				v-model:limit="tableData.param.pageSize"
+				@pagination="tenantList"
+			/>
+		</el-card>
+		<EditTenant ref="editTenantRef" @getTenantList="tenantList" />
+	</div>
+</template>
+
+<script lang="ts">
+import { toRefs, reactive, onMounted, ref, defineComponent } from 'vue';
+import { ElMessageBox, ElMessage, FormInstance } from 'element-plus';
+import EditTenant from './component/editTenant.vue';
+import { getTenantList, deleteTenant } from '/@/api/system/tenant';
+import { pcTextArr } from 'element-china-area-data';
+
+export default defineComponent({
+	name: 'systemTenant',
+	components: { EditTenant },
+	setup() {
+		const editTenantRef = ref();
+		const queryRef = ref();
+		const state = reactive({
+			tableData: {
+				data: [],
+				total: 0,
+				loading: false,
+				param: {
+					pageNum: 1,
+					pageSize: 10,
+					tenantName: '',
+					tenantType: '',
+					city: [],
+				},
+			},
+		});
+
+		// 省市数据
+		const cityOptions = pcTextArr;
+
+		// 初始化表格数据
+		const tenantList = () => {
+			state.tableData.loading = true;
+			getTenantList(state.tableData.param)
+				.then((res: any) => {
+					state.tableData.data = res.data.list ?? [];
+					state.tableData.total = res.data.total;
+				})
+				.catch(() => {
+					// 模拟数据，防止报错影响演示
+					state.tableData.data = [];
+					state.tableData.total = 0;
+				})
+				.finally(() => {
+					state.tableData.loading = false;
+				});
+		};
+
+		// 打开新增弹窗
+		const onOpenAddTenant = () => {
+			editTenantRef.value.openDialog();
+		};
+
+		// 打开修改弹窗
+		const onOpenEditTenant = (row: any) => {
+			editTenantRef.value.openDialog(row);
+		};
+
+		// 删除
+		const onRowDel = (row: any) => {
+			ElMessageBox.confirm(`此操作将永久删除租户：“${row.tenantName}”，是否继续?`, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					deleteTenant([row.id]).then(() => {
+						ElMessage.success('删除成功');
+						tenantList();
+					});
+				})
+				.catch(() => {});
+		};
+
+		// 重置
+		const resetQuery = (formEl: FormInstance | undefined) => {
+			if (!formEl) return;
+			formEl.resetFields();
+			tenantList();
+		};
+
+		// 解析城市名称
+		const getCityName = (cityArr: string[]) => {
+			if (!cityArr || cityArr.length === 0) return '';
+			// 这里简单模拟，实际可以用 cityOptions 递归查找
+			return cityArr.join(' / ');
+		};
+
+		onMounted(() => {
+			tenantList();
+		});
+
+		return {
+			queryRef,
+			editTenantRef,
+			onOpenAddTenant,
+			onOpenEditTenant,
+			onRowDel,
+			tenantList,
+			resetQuery,
+			cityOptions,
+			getCityName,
+			...toRefs(state),
+		};
+	},
+});
+</script>