diff --git a/src/api/teamaster_user.ts b/src/api/teamaster_user.ts
index 514fe03..cf699f8 100644
--- a/src/api/teamaster_user.ts
+++ b/src/api/teamaster_user.ts
@@ -23,4 +23,9 @@ export function apiTeamasterUserDelete(params: any) {
 // 用户表详情
 export function apiTeamasterUserDetail(params: any) {
     return request.get({ url: '/teamaster_user/detail', params })
-}
\ No newline at end of file
+}
+
+// 专属圈子
+export function apiLabel(params: any) {
+    return request.get({ url: '/teamasterReal/label', params })
+}
diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue
index d6c8306..9fb547a 100644
--- a/src/views/teamaster_user/edit.vue
+++ b/src/views/teamaster_user/edit.vue
@@ -1,107 +1,131 @@
 <template>
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            @close="handleClose">
+            @close="handleClose" cancel-button-text="" confirm-button-text="">
             <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="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="user_money">
-                    <el-input v-model="formData.user_money" disabled clearable />
+                    <!-- <material-picker v-model="formData.avatar" :limit="1" /> -->
+                    <el-image style="width: 100px; height: 100px" :src="formData.avatar" fit="cover"
+                        :preview-src-list="[formData.avatar]" preview-teleported></el-image>
                 </el-form-item>
                 <el-form-item label="本人照片" prop="image">
-                    <material-picker v-model="formData.image" :limit="1" />
+                    <el-image style="width: 100px; height: 100px" :src="formData.image" fit="cover"
+                        :preview-src-list="[formData.image]" preview-teleported></el-image>
+                    <!-- <material-picker v-model="formData.image" :limit="1" /> -->
+                </el-form-item>
+                <el-form-item label="茶艺师资格证书" prop="license_img">
+                    <el-image style="width: 100px; height: 100px" :src="formData.license_img" fit="cover"
+                        :preview-src-list="[formData.license_img]" preview-teleported></el-image>
+                    <!-- <material-picker v-model="formData.license_img" :limit="1" /> -->
+                </el-form-item>
+                <el-form-item label="个人展示" prop="information">
+                    <!-- <material-picker v-model="formData.information" :limit="9" /> -->
+                    <el-image style="width: 100px; height: 100px" v-for="(item, index) in formData.information"
+                        :key="index" :src="item" fit="cover" :preview-src-list="formData.information"
+                        preview-teleported></el-image>
+                </el-form-item>
+                <el-form-item label="健康证" prop="health_certificate">
+                    <el-image style="width: 100px; height: 100px" :src="formData.health_certificate" fit="cover"
+                        :preview-src-list="[formData.license_img]" preview-teleported></el-image>
+                    <!-- <material-picker v-model="formData.health_certificate" :limit="1" /> -->
+                </el-form-item>
+                <el-form-item label="专属圈子" prop="label_id">
+                    <el-select v-model="formData.label_id" multiple placeholder="请选择" style="width: 240px" disabled>
+                        <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="nickname">
+                    <el-input v-model="formData.nickname" clearable placeholder="请输入名称" disabled />
+                </el-form-item>
+                <el-form-item label="昵称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入昵称" disabled />
                 </el-form-item>
                 <el-form-item label="出生日期" prop="both">
-                    <el-date-picker v-model="formData.both" type="date" placeholder="请选择" />
+                    <el-date-picker v-model="formData.both" type="date" placeholder="请选择" format="YYYY-MM-DD"
+                        value-format="YYYY-MM-DD" disabled />
                 </el-form-item>
                 <el-form-item label="体重" prop="weight">
-                    <el-input v-model="formData.weight" clearable placeholder="请输入体重" />
+                    <el-input v-model="formData.weight" clearable placeholder="请输入体重" disabled />
                 </el-form-item>
                 <el-form-item label="身高" prop="height">
-                    <el-input v-model="formData.height" clearable placeholder="请输入身高" />
+                    <el-input v-model="formData.height" clearable placeholder="请输入身高" disabled />
                 </el-form-item>
-                <el-form-item label="性别" prop="height">
-                    <el-select v-model="formData.sex" clearable placeholder="请选择">
+                <el-form-item label="性别" prop="sex">
+                    <el-select v-model="formData.sex" clearable placeholder="请选择" disabled>
                         <el-option label="女" :value="2"></el-option>
                         <el-option label="男" :value="1"></el-option>
                     </el-select>
                 </el-form-item>
-                <el-form-item label="兴趣爱好" prop="hobby_introduce">
-                    <editor class="flex-1" v-model="formData.hobby_introduce" :height="300" />
-                </el-form-item>
                 <el-form-item label="用户账号" prop="account">
-                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号" />
+                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号" disabled />
                 </el-form-item>
                 <el-form-item label="用户电话" prop="mobile">
-                    <el-input v-model="formData.mobile" clearable placeholder="请输入用户电话" />
+                    <el-input v-model="formData.mobile" clearable placeholder="请输入用户电话" disabled />
                 </el-form-item>
-                <!-- <el-form-item label="茶艺师等级" prop="level">
-                    <el-select class="flex-1" v-model="formData.level" clearable placeholder="请选择茶艺师等级">
+                <el-form-item label="茶艺师等级" prop="level">
+                    <el-select class="flex-1" v-model="formData.level" clearable placeholder="请选择茶艺师等级" disabled>
                         <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 label="星级" prop="star">
+                    <el-input v-model="formData.star" clearable placeholder="请输入星级" disabled />
+                </el-form-item>
+                <el-form-item label="服务单价" prop="price">
+                    <el-input v-model="formData.price" clearable placeholder="请输入茶艺服务单价" disabled />
                 </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-input v-model="formData.mileage_price" clearable placeholder="请输入车马费/每公里" disabled />
+                </el-form-item>
+                <el-form-item label="是否免费出行" prop="is_mileage">
+                    <el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择" disabled>
                         <el-option label="免费" :value="1"></el-option>
                         <el-option label="收费" :value="0"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="服务次数" prop="sold">
-                    <el-input v-model="formData.sold" clearable placeholder="请输入服务次数" />
+                    <el-input v-model="formData.sold" clearable placeholder="请输入服务次数" disabled />
                 </el-form-item>
                 <el-form-item label="服务方式" prop="server_type">
-                    <el-select class="flex-1" v-model="formData.server_type" clearable placeholder="请选择服务方式">
+                    <el-select class="flex-1" v-model="formData.server_type" clearable placeholder="请选择服务方式" disabled>
                         <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="address_id">
-                    <el-input v-model="formData.address_id" clearable placeholder="请输入服务区域" />
-                </el-form-item> -->
                 <el-form-item label="所属城市" prop="city_id">
-                    <el-select v-model="formData.city_id" clearable placeholder="请选择">
+                    <el-select v-model="formData.city_id" clearable placeholder="请选择" 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="longitude">
-                    <el-input v-model="formData.address" clearable placeholder="请输入地址" />
+                    <el-input v-model="formData.address" clearable placeholder="请输入地址" disabled />
                 </el-form-item>
                 <el-form-item label="经度" prop="longitude">
-                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度" />
+                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度" disabled />
                 </el-form-item>
-                <el-form-item label="纬度" prop="latitude">
-                    <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" />
+                <el-form-item label="纬度" prop="latitude" disabled>
+                    <div class="flex items-center w-full">
+                        <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" class="flex-1 min-w-0" />
+                        <a href="http://jingweidu.757dy.com/" target="open" class="ml-2 flex items-center">
+                            <el-icon>
+                                <Location />
+                            </el-icon>
+                        </a>
+                    </div>
                 </el-form-item>
-                <!-- <el-form-item label="状态" prop="state">
-                    <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择">
+                <el-form-item label="状态" prop="state">
+                    <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择" disabled>
                         <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-form-item>
+                <el-form-item label="是否禁用" prop="disable">
+                    <el-select class="flex-1" v-model="formData.disable" clearable placeholder="请选择" disabled>
                         <el-option label="否" :value="0"></el-option>
                         <el-option label="是" :value="1"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
             </el-form>
         </popup>
     </div>
@@ -109,11 +133,12 @@
 
 <script lang="ts" setup name="teamasterUserEdit">
 import Popup from '@/components/popup/index.vue'
-import { apiTeamasterUserAdd, apiTeamasterUserEdit, apiTeamasterUserDetail } from '@/api/teamaster_user'
+import { apiTeamasterUserAdd, apiTeamasterUserEdit, apiTeamasterUserDetail, apiLabel } from '@/api/teamaster_user'
 import { timeFormat, removeImageUrlPrefix, normalizeImageUrl } from '@/utils/util'
 import type { PropType } from 'vue'
 import { apiTeaStoreCityLists } from '@/api/tea_store'
 import type { FormInstance } from 'element-plus'
+import { isArray } from 'lodash'
 
 
 defineProps({
@@ -127,6 +152,17 @@ 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 {
+        const res = await apiLabel({})
+        options.value = res.map((item: any) => ({ label: item.label_name, value: item.id }))
+    } catch (e) {
+        options.value = []
+    }
+}
+getLabel()
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -137,9 +173,9 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     avatar: '',
+    image: '',
     nickname: '',
     name: '',
-    image: '',
     both: '',
     weight: '',
     height: '',
@@ -147,11 +183,11 @@ const formData = reactive({
     hobby_introduce: '',
     account: '',
     mobile: '',
-    // level: '',
+    level: '',
     star: '',
-    // price: '',
-    // mileage_price: '',
-    // is_mileage: '',
+    price: '',
+    mileage_price: '',
+    is_mileage: '',
     sold: '',
     server_type: '',
     address_id: 0,
@@ -159,9 +195,14 @@ const formData = reactive({
     address: '',
     longitude: '',
     latitude: '',
-    // disable: '',
-    // state: '',
-    // user_money: ''
+    disable: '',
+    state: '',
+    user_money: '',
+    license_img: '',
+    information: '',
+    health_certificate: '',
+    label_id: '',
+    broker_user_id: '',
 })
 
 // 城市列表
@@ -177,11 +218,8 @@ onMounted(async () => {
 })
 
 
-
 // 表单验证
-const formRules = reactive<any>({
-
-})
+const formRules = reactive<any>({})
 
 
 // 获取详情
@@ -195,6 +233,14 @@ const setFormData = async (data: Record<any, any>) => {
 
     //@ts-ignore
     // formData.avatar = normalizeImageUrl(formData.avatar)
+    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(',') : ''
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -205,18 +251,24 @@ const getDetail = async (row: Record<string, any>) => {
 }
 
 
-// 提交按钮
+// // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate()
-    let data = { ...formData, }
-    data.avatar = removeImageUrlPrefix(data.avatar)
-    data.image = removeImageUrlPrefix(data.image)
-
-    mode.value == 'edit'
-        ? await apiTeamasterUserEdit(data)
-        : await apiTeamasterUserAdd(data)
-    popupRef.value?.close()
-    emit('success')
+    //     await formRef.value?.validate()
+    //     let data = { ...formData, }
+    //     data.avatar = removeImageUrlPrefix(data.avatar)
+    //     data.image = removeImageUrlPrefix(data.image)
+    //     data.license_img = removeImageUrlPrefix(data.license_img)
+    //     data.information = removeImageUrlPrefix(data.information)
+    //     data.information = Array.isArray(data.information) ? data.information.join(',') : ''
+    //     data.health_certificate = removeImageUrlPrefix(data.health_certificate)
+    //     data.label_id = Array.isArray(data.label_id) ? data.label_id.join(',') : ''
+    //     // console.log("🚀 ~ handleSubmit ~ data:", data)
+    //     // return
+    //     mode.value == 'edit'
+    //         ? await apiTeamasterUserEdit(data)
+    //         : await apiTeamasterUserAdd(data)
+    //     popupRef.value?.close()
+    //     emit('success')
 }
 
 //打开弹窗
diff --git a/src/views/teamaster_user/index.vue b/src/views/teamaster_user/index.vue
index 020f66b..5d02199 100644
--- a/src/views/teamaster_user/index.vue
+++ b/src/views/teamaster_user/index.vue
@@ -53,16 +53,15 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['teamaster_user/add']" type="primary" @click="handleAdd">
+            <!-- <el-button v-perms="['teamaster_user/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
-                新增
-            </el-button>
-            <el-button v-perms="['teamaster_user/delete']" :disabled="!selectData.length"
-                @click="handleDelete(selectData)">
-                删除
-            </el-button>
+新增
+</el-button>
+<el-button v-perms="['teamaster_user/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
+    删除
+</el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -106,12 +105,12 @@
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['teamaster_user/edit']" type="primary" link @click="handleEdit(row)">
-                                编辑
+                                查看
                             </el-button>
-                            <el-button v-perms="['teamaster_user/delete']" type="danger" link
+                            <!-- <el-button v-perms="['teamaster_user/delete']" type="danger" link
                                 @click="handleDelete(row.id)">
                                 删除
-                            </el-button>
+                            </el-button> -->
                         </template>
                     </el-table-column>
                 </el-table>