From a0808685c36411ac448330a3db3f0bf8e7169a36 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Thu, 30 Apr 2026 17:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8C=B6=E8=89=BA=E5=B8=88?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/teamaster_order_split.ts              |  26 +
 .../finance/teamaster_order_split/edit.vue    |  81 +++
 .../finance/teamaster_order_split/index.vue   |  95 +++
 src/views/teamaster_real/edit.vue             | 394 +++++++----
 src/views/teamaster_user/edit.vue             | 638 +++++++++++++-----
 .../teamaster_user/teamaster_cert/edit.vue    |  10 +-
 .../teamaster_user/teamaster_cert/index.vue   |  10 +-
 7 files changed, 953 insertions(+), 301 deletions(-)
 create mode 100644 src/api/teamaster_order_split.ts
 create mode 100644 src/views/finance/teamaster_order_split/edit.vue
 create mode 100644 src/views/finance/teamaster_order_split/index.vue

diff --git a/src/api/teamaster_order_split.ts b/src/api/teamaster_order_split.ts
new file mode 100644
index 0000000..cf05a6f
--- /dev/null
+++ b/src/api/teamaster_order_split.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 茶艺师订单分账表列表
+export function apiTeamasterOrderSplitLists(params: any) {
+    return request.get({ url: '/teamaster_order_split/lists', params })
+}
+
+// 添加茶艺师订单分账表
+export function apiTeamasterOrderSplitAdd(params: any) {
+    return request.post({ url: '/teamaster_order_split/add', params })
+}
+
+// 编辑茶艺师订单分账表
+export function apiTeamasterOrderSplitEdit(params: any) {
+    return request.post({ url: '/teamaster_order_split/edit', params })
+}
+
+// 删除茶艺师订单分账表
+export function apiTeamasterOrderSplitDelete(params: any) {
+    return request.post({ url: '/teamaster_order_split/delete', params })
+}
+
+// 茶艺师订单分账表详情
+export function apiTeamasterOrderSplitDetail(params: any) {
+    return request.get({ url: '/teamaster_order_split/detail', params })
+}
\ No newline at end of file
diff --git a/src/views/finance/teamaster_order_split/edit.vue b/src/views/finance/teamaster_order_split/edit.vue
new file mode 100644
index 0000000..95f28a7
--- /dev/null
+++ b/src/views/finance/teamaster_order_split/edit.vue
@@ -0,0 +1,81 @@
+<template>
+    <div class="article-edit">
+        <el-card class="!border-none" shadow="never">
+            <el-page-header :content="$route.meta.title" @back="$router.back()" />
+        </el-card>
+
+        <el-form ref="formRef" label-width="120px">
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">订单</div>
+                <el-form-item label="订单编号"> {{ order.order_sn }} </el-form-item>
+                <el-form-item label="订单类型"> {{ order.type == 1 ? '完成订单' : '部分退款订单' }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">实际营收</div>
+                <el-form-item label="实际营收"> {{ order.platform_income }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">茶艺师</div>
+                <el-form-item label="名称"> {{ order.teamaster_user.nickname }} </el-form-item>
+                <el-form-item label="手机号"> {{ order.teamaster_user.mobile }} </el-form-item>
+                <el-form-item label="分佣金额"> {{ order.tea_master_commission }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">合伙人</div>
+                <el-form-item label="名称"> {{ order.parten.name }} </el-form-item>
+                <el-form-item label="账号"> {{ order.parten.account }} </el-form-item>
+                <el-form-item label="分佣金额"> {{ order.city_partner_commission }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">经济人</div>
+                <el-form-item label="名称"> {{ order.broker.name }} </el-form-item>
+                <el-form-item label="账号"> {{ order.broker.account }} </el-form-item>
+                <el-form-item label="分佣金额"> {{ order.tea_master_agent_commission }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">茶室</div>
+                <el-form-item label="名称"> {{ order.tea_store.name }} </el-form-item>
+                <el-form-item label="手机号"> {{ order.tea_store.contact_phone }} </el-form-item>
+                <el-form-item label="地址"> {{ order.tea_store.province }} {{ order.tea_store.city }} {{
+                    order.tea_store.district }} {{ order.tea_store.address }}</el-form-item>
+                <el-form-item label="分佣金额"> {{ order.tea_room_commission }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">平台</div>
+                <el-form-item label="分佣金额"> {{ order.platform_commission }} </el-form-item>
+            </el-card>
+
+            <el-card class="!border-none mt-4" shadow="never">
+                <div class="font-medium mb-7">用户信息</div>
+                <el-form-item label="昵称"> {{ order.user.nickname }} </el-form-item>
+                <el-form-item label="手机号"> {{ order.user.mobile }} </el-form-item>
+            </el-card>
+        </el-form>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { useDictData } from '@/hooks/useDictOptions'
+
+// 获取字典数据
+const { dictData } = useDictData('is_teacup,pay_way,order_status,pay_status')
+
+const route = useRoute()
+const order = JSON.parse(route.query.params as string)
+
+// 获取服务方式标签
+const getServerTypeLabel = (value: number | string) => {
+    const serverTypeMap: Record<number | string, string> = {
+        1: '到店服务',
+        2: '上门服务',
+        3: '全部'
+    }
+    return serverTypeMap[value] || value
+}
+</script>
diff --git a/src/views/finance/teamaster_order_split/index.vue b/src/views/finance/teamaster_order_split/index.vue
new file mode 100644
index 0000000..9c14cf2
--- /dev/null
+++ b/src/views/finance/teamaster_order_split/index.vue
@@ -0,0 +1,95 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="订单号" prop="order_sn">
+                    <el-input class="w-[280px]" v-model="queryParams.order_sn" clearable placeholder="请输入订单号" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card>
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <div class="mt-4">
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="订单号" prop="order_sn" show-overflow-tooltip />
+                    <el-table-column label="茶艺师姓名" prop="teamaster_user" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            {{ row.teamaster_user.nickname }}
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="茶艺师分佣" prop="tea_master_commission" show-overflow-tooltip />
+                    <el-table-column label="合伙人分佣" prop="city_partner_commission" show-overflow-tooltip />
+                    <el-table-column label="经纪人分佣" prop="tea_master_agent_commission" show-overflow-tooltip />
+                    <el-table-column label="茶室分佣" prop="tea_room_commission" show-overflow-tooltip />
+                    <el-table-column label="平台分佣" prop="platform_commission" show-overflow-tooltip />
+                    <el-table-column label="平台实际营收" prop="platform_income" show-overflow-tooltip />
+                    <el-table-column label="记录创建时间" prop="create_time" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['teamaster_order_split/edit']" type="primary" link>
+                                <router-link :to="{
+                                    path: getRoutePath('teamaster_order_split/edit'),
+                                    query: {
+                                        params: JSON.stringify(row)
+                                    }
+                                }">
+                                    查看
+                                </router-link>
+                            </el-button>
+                        </template>
+                    </el-table-column>
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+    </div>
+</template>
+
+<script lang="ts" setup name="teamasterOrderSplitLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiTeamasterOrderSplitLists, apiTeamasterOrderSplitDelete } from '@/api/teamaster_order_split'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+import { getRoutePath } from '@/router'
+
+// 查询条件
+const queryParams = reactive({
+    order_sn: '',
+    order_complete_time: '',
+    type: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiTeamasterOrderSplitLists,
+    params: queryParams
+})
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiTeamasterOrderSplitDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/src/views/teamaster_real/edit.vue b/src/views/teamaster_real/edit.vue
index bbc02d7..35ccd7c 100644
--- a/src/views/teamaster_real/edit.vue
+++ b/src/views/teamaster_real/edit.vue
@@ -1,93 +1,133 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="900px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="入驻城市" prop="city_name">
-                    <el-input v-model="formData.city_name" clearable disabled />
-                </el-form-item>
-                <!-- <el-form-item label="昵称" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable placeholder="请输入昵称" />
-                </el-form-item> -->
-                <el-form-item label="姓名" prop="username">
-                    <el-input v-model="formData.username" clearable placeholder="请输入姓名" disabled />
-                </el-form-item>
-                <el-form-item label="电话" prop="mobile">
-                    <el-input v-model="formData.mobile" clearable placeholder="请输入电话" disabled />
-                </el-form-item>
-                <el-form-item label="性别" prop="gender">
-                    <el-select v-model="formData.gender[0]" clearable placeholder="请选择" disabled>
-                        <el-option label="男" value="1"></el-option>
-                        <el-option label="女" value="2"></el-option>
-                    </el-select>
-                </el-form-item>
-                <!-- <el-form-item label="用户id" prop="user_id">
-                    <el-input v-model="formData.user_id" clearable placeholder="请输入用户id" />
-                </el-form-item> -->
-                <el-form-item label="出生年月" prop="both">
-                    <el-input v-model="formData.both" clearable placeholder="请输入出生年月" disabled />
-                </el-form-item>
-                <el-form-item label="身高" prop="height">
-                    <el-input v-model="formData.height" clearable placeholder="请输入身高" disabled />
-                </el-form-item>
-                <el-form-item label="体重" prop="weight">
-                    <el-input v-model="formData.weight" clearable placeholder="请输入体重" disabled />
-                </el-form-item>
+            <el-form ref="formRef" :model="formData" :rules="formRules">
+                <el-row :gutter="20">
+                    <el-col :span="12">
+                        <el-card shadow="never" class="mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <span class="card-title">基本信息</span>
+                                </div>
+                            </template>
+                            <el-form label-width="85px">
+                                <el-form-item label="入驻城市" prop="city_name">
+                                    <el-input v-model="formData.city_name" clearable disabled />
+                                </el-form-item>
+                                <el-form-item label="姓名" prop="username">
+                                    <el-input v-model="formData.username" clearable placeholder="请输入姓名" disabled />
+                                </el-form-item>
+                                <el-form-item label="电话" prop="mobile">
+                                    <el-input v-model="formData.mobile" clearable placeholder="请输入电话" disabled />
+                                </el-form-item>
+                                <el-form-item label="性别" prop="gender">
+                                    <el-select v-model="formData.gender[0]" clearable placeholder="请选择" disabled>
+                                        <el-option label="男" value="1"></el-option>
+                                        <el-option label="女" value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                                <el-form-item label="出生年月" prop="both">
+                                    <el-input v-model="formData.both" clearable placeholder="请输入出生年月" disabled />
+                                </el-form-item>
+                                <el-form-item label="身高" prop="height">
+                                    <el-input v-model="formData.height" clearable placeholder="请输入身高" disabled />
+                                </el-form-item>
+                                <el-form-item label="体重" prop="weight">
+                                    <el-input v-model="formData.weight" clearable placeholder="请输入体重" disabled />
+                                </el-form-item>
+                                <el-form-item label="专属圈子" prop="label">
+                                    <el-tag v-for="(item, index) in labelMsg" :key="index" type="success"
+                                        class="mr-2 mb-2">
+                                        {{ item.label_name }}
+                                    </el-tag>
+                                    <span v-if="!labelMsg.length" class="text-gray-400">暂无</span>
+                                </el-form-item>
+                                <el-form-item label="审核状态" prop="status">
+                                    <el-select v-model="formData.status" clearable placeholder="请选择">
+                                        <el-option label="未审核" :value="0"></el-option>
+                                        <el-option label="通过" :value="1"></el-option>
+                                        <el-option label="驳回" :value="2"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-form>
+                        </el-card>
+                    </el-col>
 
-                <el-form-item label="专属圈子" prop="weight">
-                    <div>
-                        <span class="mr-2" v-for="(item, index) in labelMsg" :key="index"> {{ item.label_name
-                        }}</span>
+                    <el-col :span="12">
+                        <el-card shadow="never" class="mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <span class="card-title">证件照片</span>
+                                </div>
+                            </template>
+                            <div class="image-grid">
+                                <div class="image-item">
+                                    <div class="image-label">个人头像</div>
+                                    <el-image v-if="formData.avatar"
+                                        style="width: 120px; height: 120px; border-radius: 8px" :src="formData.avatar"
+                                        :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                                        :preview-src-list="[formData.avatar]" preview-teleported fit="cover" />
+                                    <div v-else class="image-placeholder">未上传</div>
+                                </div>
+                            </div>
+                            <div class="image-grid mt-4">
+                                <div class="image-item">
+                                    <div class="image-label">身份证正面</div>
+                                    <el-image v-if="formData.front_card"
+                                        style="width: 120px; height: 120px; border-radius: 8px"
+                                        :src="formData.front_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                                        :preview-src-list="[formData.front_card]" preview-teleported fit="cover" />
+                                    <div v-else class="image-placeholder">未上传</div>
+                                </div>
+                                <div class="image-item">
+                                    <div class="image-label">身份证反面</div>
+                                    <el-image v-if="formData.back_card"
+                                        style="width: 120px; height: 120px; border-radius: 8px"
+                                        :src="formData.back_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                                        :preview-src-list="[formData.back_card]" preview-teleported fit="cover" />
+                                    <div v-else class="image-placeholder">未上传</div>
+                                </div>
+                            </div>
+                            <div class="image-grid mt-4">
+                                <div class="image-item">
+                                    <div class="image-label">茶艺师资格证书</div>
+                                    <el-image v-if="formData.license_img"
+                                        style="width: 120px; height: 120px; border-radius: 8px"
+                                        :src="formData.license_img" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                                        :preview-src-list="[formData.license_img]" preview-teleported fit="cover" />
+                                    <div v-else class="image-placeholder">未上传</div>
+                                </div>
+                                <div class="image-item">
+                                    <div class="image-label">健康证</div>
+                                    <el-image v-if="formData.health_certificate"
+                                        style="width: 120px; height: 120px; border-radius: 8px"
+                                        :src="formData.health_certificate" :zoom-rate="1.2" :max-scale="7"
+                                        :min-scale="0.2" :preview-src-list="[formData.health_certificate]"
+                                        preview-teleported fit="cover" />
+                                    <div v-else class="image-placeholder">未上传</div>
+                                </div>
+                            </div>
+                        </el-card>
+                    </el-col>
+                </el-row>
+
+                <el-card shadow="never" class="mb-4">
+                    <template #header>
+                        <div class="card-header">
+                            <span class="card-title">个人展示</span>
+                            <span class="text-gray-400 text-sm">（{{ formData.image.length }} 张照片）</span>
+                        </div>
+                    </template>
+                    <div v-if="formData.image.length > 0" class="gallery-grid">
+                        <div v-for="(item, index) in formData.image" :key="index" class="gallery-item">
+                            <el-image style="width: 150px; height: 150px; border-radius: 8px" :src="item"
+                                :zoom-rate="1.2" :max-scale="7" :min-scale="0.2" :preview-src-list="formData.image"
+                                :initial-index="index" fit="cover" class="gallery-image" preview-teleported />
+                        </div>
                     </div>
-                </el-form-item>
-                <el-form-item label="茶艺师资格证书" prop="license_img">
-                    <el-image style="width: 100px; height: 100px" :src="formData.license_img" :zoom-rate="1.2"
-                        :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.license_img]" show-progress
-                        :initial-index="4" fit="cover" />
-                </el-form-item>
-                <el-form-item label="个人头像照片" prop="avatar">
-                    <el-image style="width: 100px; height: 100px" :src="formData.avatar" :zoom-rate="1.2" :max-scale="7"
-                        :min-scale="0.2" :preview-src-list="[formData.avatar]" show-progress :initial-index="4"
-                        fit="cover" />
-                </el-form-item>
-                <el-form-item label="健康证" prop="health_certificate">
-                    <el-image v-if="formData.health_certificate" style="width: 100px; height: 100px"
-                        :src="formData.health_certificate" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="[formData.health_certificate]" show-progress :initial-index="4"
-                        fit="cover" />
-                    <div v-else>未上传</div>
-                </el-form-item>
-                <el-form-item label="个人展示" prop="image">
-                    <el-image v-if="formData.image.length > 0" v-for="(item, index) in formData.image" :key="index"
-                        style="width: 100px; height: 100px" :src="item" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="formData.image" show-progress :initial-index="4" fit="cover" />
-                    <div v-else>未上传</div>
-                </el-form-item>
-
-                <el-form-item label="身份证正面" prop="front_card">
-                    <el-image v-if="formData.front_card.length > 0" style="width: 100px; height: 100px"
-                        :src="formData.front_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="[formData.front_card]" show-progress :initial-index="4" fit="cover" />
-                    <div v-else>未上传</div>
-                </el-form-item>
-
-                <el-form-item label="身份证反面" prop="back_card">
-                    <el-image v-if="formData.back_card.length > 0" style="width: 100px; height: 100px"
-                        :src="formData.back_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="[formData.back_card]" show-progress :initial-index="4" fit="cover" />
-                    <div v-else>未上传</div>
-                </el-form-item>
-
-                <!-- <el-form-item label="兴趣爱好" prop="hobby_introduce">
-                    <editor class="flex-1" v-model="formData.hobby_introduce" :height="500" />
-                </el-form-item> -->
-                <el-form-item label="审核状态" prop="status">
-                    <el-select v-model="formData.status" clearable placeholder="请选择">
-                        <el-option label="未审核" :value="0"></el-option>
-                        <el-option label="通过" :value="1"></el-option>
-                        <el-option label="驳回" :value="2"></el-option>
-                    </el-select>
-                </el-form-item>
+                    <el-empty v-else description="暂无个人展示照片" :image-size="80" />
+                </el-card>
             </el-form>
         </popup>
     </div>
@@ -95,16 +135,19 @@
 
 <script lang="ts" setup name="teamasterRealEdit">
 import type { FormInstance } from 'element-plus'
+import { ZoomIn } from '@element-plus/icons-vue'
 import Popup from '@/components/popup/index.vue'
 import { apiTeamasterRealAdd, apiTeamasterRealEdit, apiTeamasterRealDetail } from '@/api/teamaster_real'
 import { timeFormat, removeImageUrlPrefix } from '@/utils/util'
 import type { PropType } from 'vue'
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
         default: () => ({})
     }
 })
+
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
@@ -112,12 +155,10 @@ const mode = ref('add')
 
 const labelMsg = ref([])
 
-// 弹窗标题
 const popupTitle = computed(() => {
     return mode.value = '茶艺师审核'
 })
 
-// 表单数据
 const formData = reactive({
     id: '',
     city_id: '',
@@ -142,48 +183,8 @@ const formData = reactive({
     back_card: '',
 })
 
+const formRules = reactive<any>({})
 
-// 表单验证
-const formRules = reactive<any>({
-    // city_id: [{
-    //     required: true,
-    //     message: '请输入城市id',
-    //     trigger: ['blur']
-    // }],
-    // nickname: [{
-    //     required: true,
-    //     message: '请输入昵称',
-    //     trigger: ['blur']
-    // }],
-    // gender: [{
-    //     required: true,
-    //     message: '请选择1男；2女',
-    //     trigger: ['blur']
-    // }],
-    // both: [{
-    //     required: true,
-    //     message: '请输入出生年月',
-    //     trigger: ['blur']
-    // }],
-    // height: [{
-    //     required: true,
-    //     message: '请输入身高',
-    //     trigger: ['blur']
-    // }],
-    // weight: [{
-    //     required: true,
-    //     message: '请输入体重',
-    //     trigger: ['blur']
-    // }],
-    // status: [{
-    //     required: true,
-    //     message: '请选择0待审核；1已通过；2已驳回',
-    //     trigger: ['blur']
-    // }]
-})
-
-
-// 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -210,8 +211,6 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
-
-// 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
     let data = { ...formData, gender: formData.gender.join(",") }
@@ -228,22 +227,149 @@ const handleSubmit = async () => {
     emit('success')
 }
 
-//打开弹窗
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
 }
 
-// 关闭回调
 const handleClose = () => {
     emit('close')
 }
 
-
-
 defineExpose({
     open,
     setFormData,
     getDetail
 })
 </script>
+
+<style scoped>
+.card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.card-title {
+    font-weight: 600;
+    font-size: 15px;
+    color: #303133;
+}
+
+.mb-4 {
+    margin-bottom: 16px;
+}
+
+.mr-2 {
+    margin-right: 8px;
+}
+
+.mb-2 {
+    margin-bottom: 8px;
+}
+
+.text-gray-400 {
+    color: #909399;
+    font-size: 12px;
+}
+
+.text-sm {
+    font-size: 12px;
+}
+
+.image-grid {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    gap: 16px;
+}
+
+.image-item {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.image-label {
+    font-size: 13px;
+    color: #606266;
+    font-weight: 500;
+}
+
+.image-placeholder {
+    width: 120px;
+    height: 120px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #f5f7fa;
+    border-radius: 8px;
+    color: #909399;
+    font-size: 13px;
+}
+
+.gallery-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+    gap: 16px;
+}
+
+.gallery-item {
+    position: relative;
+    width: 150px;
+    height: 150px;
+    border-radius: 8px;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.gallery-image {
+    width: 100%;
+    height: 100%;
+    transition: transform 0.3s ease;
+}
+
+.gallery-item:hover .gallery-image {
+    transform: scale(1.05);
+}
+
+.gallery-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.gallery-item:hover .gallery-overlay {
+    opacity: 1;
+}
+
+.gallery-overlay .el-icon {
+    font-size: 24px;
+    color: white;
+}
+
+:deep(.el-card__header) {
+    padding: 12px 20px;
+    border-bottom: 1px solid #ebeef5;
+}
+
+:deep(.el-card__body) {
+    padding: 20px;
+}
+
+:deep(.el-form-item) {
+    margin-bottom: 18px;
+}
+
+:deep(.el-form-item__label) {
+    font-weight: 500;
+    color: #606266;
+}
+</style>
diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue
index 6318af9..591e2c5 100644
--- a/src/views/teamaster_user/edit.vue
+++ b/src/views/teamaster_user/edit.vue
@@ -1,133 +1,309 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="1000px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="头像" prop="avatar">
-                    <material-picker v-model="formData.avatar" :limit="1" />
-                </el-form-item>
-                <el-form-item label="本人照片" prop="image">
-                    <material-picker v-model="formData.image" :limit="9" />
-                </el-form-item>
-                <el-form-item label="茶艺师资格证书" prop="license_img">
-                    <material-picker v-model="formData.license_img" :limit="1" />
-                </el-form-item>
-                <el-form-item label="健康证" prop="health_certificate">
-                    <material-picker v-model="formData.health_certificate" :limit="1" />
-                </el-form-item>
-                <el-form-item label="身份证正面" prop="front_card">
-                    <material-picker v-model="formData.front_card" :limit="1" />
-                </el-form-item>
-                <el-form-item label="身份证反面" prop="back_card">
-                    <material-picker v-model="formData.back_card" :limit="1" />
-                </el-form-item>
-                <el-form-item label="专属圈子" prop="label_id">
-                    <el-select v-model="formData.label_id" multiple placeholder="请选择" style="width: 240px">
-                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="经纪人" prop="broker_user_id">
-                    <el-select v-model="formData.broker_user_id" placeholder="请选择" style="width: 240px"
-                        :disabled="Number(formData.broker_user_id) > 0 ? true : false">
-                        <el-option v-for="item in brokerOptions" :key="item.value" :label="item.label"
-                            :value="item.value" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="名称" prop="nickname">
-                    <el-input v-model="formData.nickname" clearable placeholder="请输入名称" />
-                </el-form-item>
-                <el-form-item label="昵称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入昵称" />
-                </el-form-item>
-                <el-form-item label="出生日期" prop="both">
-                    <el-date-picker v-model="formData.both" type="date" placeholder="请选择" format="YYYY-MM-DD"
-                        value-format="YYYY-MM-DD" />
-                </el-form-item>
-                <el-form-item label="体重" prop="weight">
-                    <el-input v-model="formData.weight" clearable placeholder="请输入体重" />
-                </el-form-item>
-                <el-form-item label="身高" prop="height">
-                    <el-input v-model="formData.height" clearable placeholder="请输入身高" />
-                </el-form-item>
-                <el-form-item label="性别" prop="sex">
-                    <el-select v-model="formData.sex" clearable placeholder="请选择">
-                        <el-option label="女" :value="2"></el-option>
-                        <el-option label="男" :value="1"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="用户账号" prop="account">
-                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号，需填手机号" />
-                </el-form-item>
-                <el-form-item label="用户电话" prop="mobile">
-                    <el-input v-model="formData.mobile" clearable placeholder="请输入用户电话" />
-                </el-form-item>
-                <el-form-item label="茶艺师等级" prop="level">
-                    <el-select class="flex-1" v-model="formData.level" clearable placeholder="请选择茶艺师等级">
-                        <el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
-                            :value="parseInt(item.value)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="星级" prop="star">
-                    <el-input v-model="formData.star" clearable placeholder="请输入星级" />
-                </el-form-item>
-                <el-form-item label="服务单价" prop="price">
-                    <el-input v-model="formData.price" clearable placeholder="请输入茶艺服务单价" />
-                </el-form-item>
-                <el-form-item label="车马费" prop="mileage_price">
-                    <el-input v-model="formData.mileage_price" clearable placeholder="请输入车马费/每公里" />
-                </el-form-item>
-                <el-form-item label="是否免费出行" prop="is_mileage">
-                    <el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择">
-                        <el-option label="免费" :value="1"></el-option>
-                        <el-option label="收费" :value="0"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="服务次数" prop="sold">
-                    <el-input v-model="formData.sold" clearable placeholder="请输入服务次数" />
-                </el-form-item>
-                <el-form-item label="服务方式" prop="server_type">
-                    <el-select class="flex-1" v-model="formData.server_type" clearable placeholder="请选择服务方式">
-                        <el-option v-for="(item, index) in dictData.server_type" :key="index" :label="item.name"
-                            :value="parseInt(item.value)" />
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="所属城市" prop="city_id">
-                    <el-select v-model="formData.city_id" clearable placeholder="请选择">
-                        <el-option :label="item.name" :value="item.id" v-for="item in cityList"
-                            :key="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="地址" prop="longitude">
-                    <el-input v-model="formData.address" clearable placeholder="请输入地址"
-                        :disabled="mode == 'edit' ? true : false" />
-                </el-form-item>
-                <el-form-item label="经度" prop="longitude">
-                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度"
-                        :disabled="mode == 'edit' ? true : false" />
-                </el-form-item>
-                <el-form-item label="纬度" prop="latitude">
-                    <div class="flex items-center w-full">
-                        <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" class="flex-1 min-w-0"
-                            :disabled="mode == 'edit' ? true : false" />
-                        <a href="http://jingweidu.757dy.com/" target="open" class="ml-2 flex items-center">
-                            <el-icon>
-                                <Location />
-                            </el-icon>
-                        </a>
+            <el-form ref="formRef" :model="formData" label-width="100px" :rules="formRules">
+                <div class="two-column-layout">
+                    <!-- 左侧 -->
+                    <div class="left-column">
+                        <!-- 基本信息卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <User />
+                                    </el-icon>
+                                    <span class="font-medium">基本信息</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="名称" prop="nickname">
+                                <el-input v-model="formData.nickname" clearable placeholder="请输入名称" />
+                            </el-form-item>
+
+                            <el-form-item label="昵称" prop="name">
+                                <el-input v-model="formData.name" clearable placeholder="请输入昵称" />
+                            </el-form-item>
+
+                            <el-form-item label="性别" prop="sex">
+                                <el-select v-model="formData.sex" clearable placeholder="请选择" class="w-full">
+                                    <el-option label="男" :value="1"></el-option>
+                                    <el-option label="女" :value="2"></el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="出生日期" prop="both">
+                                <el-date-picker v-model="formData.both" type="date" placeholder="请选择"
+                                    format="YYYY-MM-DD" value-format="YYYY-MM-DD" class="w-full" />
+                            </el-form-item>
+
+                            <el-form-item label="身高/体重">
+                                <div class="input-with-unit">
+                                    <el-input v-model="formData.height" clearable placeholder="身高" style="flex: 1;">
+                                        <template #append>cm</template>
+                                    </el-input>
+                                    <span class="unit-separator">/</span>
+                                    <el-input v-model="formData.weight" clearable placeholder="体重" style="flex: 1;">
+                                        <template #append>kg</template>
+                                    </el-input>
+                                </div>
+                            </el-form-item>
+                        </el-card>
+
+                        <!-- 联系信息卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Message />
+                                    </el-icon>
+                                    <span class="font-medium">联系信息</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="用户账号" prop="account">
+                                <el-input v-model="formData.account" clearable placeholder="请输入用户账号（手机号）" />
+                            </el-form-item>
+
+                            <el-form-item label="用户电话" prop="mobile">
+                                <el-input v-model="formData.mobile" clearable placeholder="请输入用户电话" />
+                            </el-form-item>
+                        </el-card>
+
+                        <!-- 服务信息卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Service />
+                                    </el-icon>
+                                    <span class="font-medium">服务配置</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="茶艺师等级" prop="level">
+                                <el-select class="w-full" v-model="formData.level" clearable placeholder="请选择茶艺师等级">
+                                    <el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
+                                        :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="星级" prop="star">
+                                <el-input v-model="formData.star" clearable placeholder="请输入星级">
+                                    <template #append>星</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item label="服务单价" prop="price">
+                                <el-input v-model="formData.price" clearable placeholder="请输入服务单价">
+                                    <template #append>元/小时</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item label="车马费" prop="mileage_price">
+                                <el-input v-model="formData.mileage_price" clearable placeholder="请输入车马费">
+                                    <template #append>元/公里</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item label="是否免费出行" prop="is_mileage">
+                                <el-select class="w-full" v-model="formData.is_mileage" clearable placeholder="请选择">
+                                    <el-option label="免费出行" :value="1"></el-option>
+                                    <el-option label="收费出行" :value="0"></el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="服务次数" prop="sold">
+                                <el-input v-model="formData.sold" clearable placeholder="请输入服务次数">
+                                    <template #append>次</template>
+                                </el-input>
+                            </el-form-item>
+
+                            <el-form-item label="服务方式" prop="server_type">
+                                <el-select class="w-full" v-model="formData.server_type" clearable
+                                    placeholder="请选择服务方式">
+                                    <el-option v-for="(item, index) in dictData.server_type" :key="index"
+                                        :label="item.name" :value="parseInt(item.value)" />
+                                </el-select>
+                            </el-form-item>
+                        </el-card>
+
+                        <!-- 位置信息卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Location />
+                                    </el-icon>
+                                    <span class="font-medium">位置信息</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="所属城市" prop="city_id">
+                                <el-select v-model="formData.city_id" clearable placeholder="请选择" class="w-full"
+                                    @change="handleCityChange" disabled>
+                                    <el-option :label="item.name" :value="item.id" v-for="item in cityList"
+                                        :key="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="经纪人" prop="broker_user_id">
+                                <el-select v-model="formData.broker_user_id" clearable placeholder="请选择" class="w-full">
+                                    <el-option :label="item.name" :value="item.id" v-for="item in brokerList"
+                                        :key="item.id">
+                                    </el-option>
+                                </el-select>
+                            </el-form-item>
+
+                            <el-form-item label="地址" prop="address">
+                                <el-input v-model="formData.address" clearable placeholder="请输入地址"
+                                    :disabled="mode == 'edit'" />
+                            </el-form-item>
+
+                            <div class="grid grid-cols-2 gap-4">
+                                <el-form-item label="经度" prop="longitude">
+                                    <el-input v-model="formData.longitude" clearable placeholder="经度" class="w-full"
+                                        :disabled="mode == 'edit'" />
+                                </el-form-item>
+                                <el-form-item label="纬度" prop="latitude">
+                                    <div class="flex items-center">
+                                        <el-input v-model="formData.latitude" clearable placeholder="纬度"
+                                            class="flex-1 w-full" :disabled="mode == 'edit'" />
+                                        <a href="http://jingweidu.757dy.com/" target="open"
+                                            class="ml-2 text-primary cursor-pointer">
+                                            <el-icon>
+                                                <MapLocation />
+                                            </el-icon>
+                                        </a>
+                                    </div>
+                                </el-form-item>
+                            </div>
+                        </el-card>
+
+                        <!-- 状态设置卡片 -->
+                        <el-card shadow="never" class="!border-none">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Setting />
+                                    </el-icon>
+                                    <span class="font-medium">状态设置</span>
+                                </div>
+                            </template>
+
+                            <div class="grid grid-cols-2 gap-4">
+                                <el-form-item label="预约状态" prop="state">
+                                    <el-select class="w-full" v-model="formData.state" clearable placeholder="请选择">
+                                        <el-option label="可预约" :value="0">
+                                            <div class="flex items-center">
+                                                <span>可预约</span>
+                                            </div>
+                                        </el-option>
+                                        <el-option label="不可预约" :value="1">
+                                            <div class="flex items-center">
+                                                <span>不可预约</span>
+                                            </div>
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+
+                                <el-form-item label="是否禁用" prop="disable">
+                                    <el-select class="w-full" v-model="formData.disable" clearable placeholder="请选择">
+                                        <el-option label="启用" :value="0">
+                                            <div class="flex items-center">
+                                                <span>启用</span>
+                                            </div>
+                                        </el-option>
+                                        <el-option label="禁用" :value="1">
+                                            <div class="flex items-center">
+                                                <span>禁用</span>
+                                            </div>
+                                        </el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </div>
+                        </el-card>
                     </div>
-                </el-form-item>
-                <el-form-item label="状态" prop="state">
-                    <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择">
-                        <el-option label="可约" :value="0"></el-option>
-                        <el-option label="不可约" :value="1"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="是否禁用" prop="disable">
-                    <el-select class="flex-1" v-model="formData.disable" clearable placeholder="请选择">
-                        <el-option label="否" :value="0"></el-option>
-                        <el-option label="是" :value="1"></el-option>
-                    </el-select>
-                </el-form-item>
+
+                    <!-- 右侧 -->
+                    <div class="right-column">
+                        <!-- 照片资料卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Picture />
+                                    </el-icon>
+                                    <span class="font-medium">照片资料</span>
+                                </div>
+                            </template>
+
+                            <div class="photos-grid">
+                                <div class="photo-item">
+                                    <el-form-item label="头像" prop="avatar" label-width="70px">
+                                        <material-picker v-model="formData.avatar" :limit="1" />
+                                    </el-form-item>
+                                </div>
+
+                                <div class="photo-item full-width">
+                                    <el-form-item label="本人照片" prop="image" label-width="70px">
+                                        <material-picker v-model="formData.image" :limit="9" />
+                                    </el-form-item>
+                                </div>
+                            </div>
+                        </el-card>
+
+                        <!-- 证件资料卡片 -->
+                        <el-card shadow="never" class="!border-none mb-4">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Document />
+                                    </el-icon>
+                                    <span class="font-medium">证件资料</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="资格证书" prop="license_img" label-width="90px">
+                                <material-picker v-model="formData.license_img" :limit="1" />
+                            </el-form-item>
+
+                            <el-form-item label="健康证" prop="health_certificate" label-width="90px">
+                                <material-picker v-model="formData.health_certificate" :limit="1" />
+                            </el-form-item>
+
+                            <div class="grid grid-cols-2 gap-4">
+                                <el-form-item label="身份证正面" prop="front_card" label-width="90px">
+                                    <material-picker v-model="formData.front_card" :limit="1" />
+                                </el-form-item>
+
+                                <el-form-item label="身份证反面" prop="back_card" label-width="90px">
+                                    <material-picker v-model="formData.back_card" :limit="1" />
+                                </el-form-item>
+                            </div>
+                        </el-card>
+
+                        <!-- 专属圈子卡片 -->
+                        <el-card shadow="never" class="!border-none">
+                            <template #header>
+                                <div class="card-header">
+                                    <el-icon>
+                                        <Collection />
+                                    </el-icon>
+                                    <span class="font-medium">专属圈子</span>
+                                </div>
+                            </template>
+
+                            <el-form-item label="选择圈子" prop="label_id">
+                                <el-select v-model="formData.label_id" multiple placeholder="请选择专属圈子" class="w-full">
+                                    <el-option v-for="item in options" :key="item.value" :label="item.label"
+                                        :value="item.value" />
+                                </el-select>
+                            </el-form-item>
+                        </el-card>
+                    </div>
+                </div>
             </el-form>
         </popup>
     </div>
@@ -141,7 +317,7 @@ import type { PropType } from 'vue'
 import { apiTeaStoreCityLists } from '@/api/tea_store'
 import type { FormInstance } from 'element-plus'
 import { isArray } from 'lodash'
-
+import { User, Message, Service, Location, Picture, Document, Collection, Setting, MapLocation } from '@element-plus/icons-vue'
 
 defineProps({
     dictData: {
@@ -149,12 +325,12 @@ defineProps({
         default: () => ({})
     }
 })
+
 const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
-// 获取专属圈子
 const options = ref<{ label: string; value: string }[]>([])
 const getLabel = async () => {
     try {
@@ -166,24 +342,10 @@ const getLabel = async () => {
 }
 getLabel()
 
-// 获取经纪人列表
-const brokerOptions = ref<{ label: string; value: string }[]>([])
-const getBrokerList = async () => {
-    try {
-        const res = await apiBrokerList()
-        brokerOptions.value = res.map((item: any) => ({ label: item.name, value: item.id }))
-    } catch (e) {
-        brokerOptions.value = []
-    }
-}
-getBrokerList()
-
-// 弹窗标题
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑茶艺师' : '新增茶艺师'
 })
 
-// 表单数据
 const formData = reactive({
     id: '',
     avatar: '',
@@ -221,7 +383,6 @@ const formData = reactive({
     back_card: '',
 })
 
-// 城市列表
 const cityList = ref<any[]>([])
 
 onMounted(async () => {
@@ -233,12 +394,8 @@ onMounted(async () => {
     }
 })
 
-
-// 表单验证
 const formRules = reactive<any>({})
 
-
-// 获取详情
 const setFormData = async (data: Record<any, any>) => {
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
@@ -247,14 +404,14 @@ const setFormData = async (data: Record<any, any>) => {
         }
     }
 
-    //@ts-ignore
-    // formData.avatar = normalizeImageUrl(formData.avatar)
+    const broker_user_id = formData.broker_user_id
+    await handleCityChange(formData.city_id)
+    formData.broker_user_id = broker_user_id
     formData.label_id = formData.label_id ? formData.label_id.split(',') : []
     if (isArray(formData.label_id)) {
         //@ts-ignore
         formData.label_id = formData.label_id.map((item: string) => Number(item))
     }
-    console.log("🚀 ~ setFormData ~ formData.label_id:", formData.label_id)
     //@ts-ignore
     formData.information = formData.information ? formData.information.split(',') : ''
 }
@@ -266,8 +423,6 @@ const getDetail = async (row: Record<string, any>) => {
     setFormData(data)
 }
 
-
-// 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
     let data = { ...formData, }
@@ -281,15 +436,12 @@ const handleSubmit = async () => {
     data.front_card = removeImageUrlPrefix(data.front_card)
     data.back_card = removeImageUrlPrefix(data.back_card)
     data.label_id = Array.isArray(data.label_id) ? data.label_id.join(',') : ''
-    // console.log("🚀 ~ handleSubmit ~ data:", data)
-    // return
 
     if (mode.value == 'edit') {
         delete data.address
         delete data.longitude
         delete data.latitude
     }
-
     mode.value == 'edit'
         ? await apiTeamasterUserEdit(data)
         : await apiTeamasterUserAdd(data)
@@ -297,17 +449,25 @@ const handleSubmit = async () => {
     emit('success')
 }
 
-//打开弹窗
 const open = (type = 'add') => {
     mode.value = type
     popupRef.value?.open()
 }
 
-// 关闭回调
 const handleClose = () => {
     emit('close')
 }
 
+const brokerList = ref<any[]>([])
+const handleCityChange = async (cityId: string | number) => {
+    try {
+        const res = await apiBrokerList({ city_id: cityId })
+        brokerList.value = res
+        formData.broker_user_id = ''
+    } catch (e) {
+        // handle error
+    }
+}
 
 defineExpose({
     open,
@@ -315,3 +475,167 @@ defineExpose({
     getDetail
 })
 </script>
+
+<style scoped>
+.two-column-layout {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+    gap: 20px;
+}
+
+.left-column,
+.right-column {
+    min-height: 400px;
+}
+
+.card-header {
+    display: flex;
+    align-items: center;
+    font-weight: 500;
+}
+
+.card-header .el-icon {
+    margin-right: 8px;
+    font-size: 18px;
+}
+
+.w-full {
+    width: 100%;
+}
+
+.input-with-unit {
+    display: flex;
+    align-items: center;
+    width: 100%;
+}
+
+.input-with-unit :deep(.el-input) {
+    flex: 1;
+}
+
+.unit-separator {
+    padding: 0 10px;
+    color: #909399;
+    font-weight: 500;
+}
+
+.grid {
+    display: grid;
+}
+
+.grid-cols-2 {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+}
+
+.gap-4 {
+    gap: 1rem;
+}
+
+.photos-grid {
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+}
+
+.photo-item {
+    width: 100%;
+}
+
+.full-width {
+    width: 100%;
+}
+
+.mb-4 {
+    margin-bottom: 1rem;
+}
+
+.mt-4 {
+    margin-top: 1rem;
+}
+
+.mr-2 {
+    margin-right: 0.5rem;
+}
+
+.ml-2 {
+    margin-left: 0.5rem;
+}
+
+.text-primary {
+    color: #409eff;
+}
+
+.cursor-pointer {
+    cursor: pointer;
+}
+
+.flex {
+    display: flex;
+}
+
+.items-center {
+    align-items: center;
+}
+
+.flex-1 {
+    flex: 1;
+}
+
+:deep(.el-card) {
+    border-radius: 8px;
+}
+
+:deep(.el-card__header) {
+    padding: 16px 20px;
+    border-bottom: 1px solid #f0f0f0;
+    background: linear-gradient(135deg, #f8f9fa 0%, #ffffff 100%);
+}
+
+:deep(.el-card__body) {
+    padding: 20px;
+}
+
+:deep(.el-form-item__label) {
+    font-weight: 500;
+    color: #606266;
+}
+
+:deep(.el-input.is-disabled .el-input__inner) {
+    color: #909399;
+}
+
+:deep(.el-select.is-disabled .el-input__wrapper) {
+    cursor: not-allowed;
+}
+
+:deep(.el-tag) {
+    font-weight: 500;
+}
+
+:deep(.el-tag--success) {
+    background-color: #f0f9eb;
+    border-color: #e1f3d8;
+    color: #67c23a;
+}
+
+:deep(.el-tag--danger) {
+    background-color: #fef0f0;
+    border-color: #fde2e2;
+    color: #f56c6c;
+}
+
+@media (max-width: 768px) {
+    .two-column-layout {
+        grid-template-columns: 1fr;
+    }
+
+    .left-column,
+    .right-column {
+        min-height: auto;
+    }
+
+    .grid-cols-2 {
+        grid-template-columns: 1fr;
+    }
+}
+</style>
diff --git a/src/views/teamaster_user/teamaster_cert/edit.vue b/src/views/teamaster_user/teamaster_cert/edit.vue
index 1969043..c758097 100644
--- a/src/views/teamaster_user/teamaster_cert/edit.vue
+++ b/src/views/teamaster_user/teamaster_cert/edit.vue
@@ -10,10 +10,10 @@
                     </div>
                     <div v-else>未上传</div>
                 </el-form-item>
-                <el-form-item label="茶艺师执照" prop="license_img">
-                    <div v-if="formData.license_img">
-                        <el-image style="width:50px;height:50px;" :src="formData.license_img"
-                            :preview-src-list="[formData.license_img]" preview-teleported />
+                <el-form-item label="茶艺师执照" prop="cert_img">
+                    <div v-if="formData.cert_img">
+                        <el-image style="width:50px;height:50px;" :src="formData.cert_img"
+                            :preview-src-list="[formData.cert_img]" preview-teleported />
                     </div>
                     <div v-else>未上传</div>
                 </el-form-item>
@@ -22,7 +22,7 @@
                 </el-form-item>
                 <el-form-item class="w-[280px]" label="审核状态" prop="status">
                     <el-select v-model="formData.status" clearable placeholder="请选择审核状态">
-                        <el-option label="未审核" :value="0"></el-option>
+                        <el-option label="待审核" :value="0"></el-option>
                         <el-option label="已通过" :value="1"></el-option>
                         <el-option label="未通过" :value="2"></el-option>
                     </el-select>
diff --git a/src/views/teamaster_user/teamaster_cert/index.vue b/src/views/teamaster_user/teamaster_cert/index.vue
index c691a97..2e4df54 100644
--- a/src/views/teamaster_user/teamaster_cert/index.vue
+++ b/src/views/teamaster_user/teamaster_cert/index.vue
@@ -45,11 +45,11 @@
                             <div v-else>—</div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="茶艺师执照" prop="license_img">
+                    <el-table-column label="茶艺师执照" prop="cert_img">
                         <template #default="{ row }">
-                            <div v-if="row.license_img">
-                                <el-image v-if="row.license_img" style="width:50px;height:50px;" :src="row.license_img"
-                                    :preview-src-list="[row.license_img]" preview-teleported />
+                            <div v-if="row.cert_img">
+                                <el-image v-if="row.cert_img" style="width:50px;height:50px;" :src="row.cert_img"
+                                    :preview-src-list="[row.cert_img]" preview-teleported />
                             </div>
                             <div v-else>—</div>
                         </template>
@@ -62,7 +62,7 @@
                     <el-table-column label="审核状态" prop="status">
                         <template #default="{ row }">
                             <el-tag :type="row.status === 1 ? 'success' : row.status === 2 ? 'danger' : 'info'">
-                                {{ row.status === 0 ? '未审核' : row.status === 1 ? '已通过' : '未通过' }}
+                                {{ row.status === 0 ? '待审核' : row.status === 1 ? '已通过' : '未通过' }}
                             </el-tag>
                         </template>
                     </el-table-column>