From efe44f4aded182f0a4f0a4ea3117dcc478aa0777 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Tue, 31 Mar 2026 21:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/store_user.ts                         |   2 +-
 src/api/tea_store.ts                          |   5 +
 src/api/teamaster_group_reservation.ts        |  26 ++++
 src/utils/cache.ts                            |   2 +-
 .../parten_bank/edit.vue                      |  38 ++++-
 .../parten_bank/index.vue                     |   3 +
 src/views/tea_store/index.vue                 |  25 +++-
 src/views/tea_store/store_user/edit.vue       |  88 +++++++++---
 src/views/tea_store_real/index.vue            |   6 -
 src/views/teamaster_real/edit.vue             | 103 ++++++++------
 .../teamaster_group_reservation/edit.vue      | 126 +++++++++++++++++
 .../teamaster_group_reservation/index.vue     | 133 ++++++++++++++++++
 src/views/withdraw/parten_reflect/index.vue   |   2 +-
 src/views/workbench/index.vue                 |   2 +-
 14 files changed, 481 insertions(+), 80 deletions(-)
 create mode 100644 src/api/teamaster_group_reservation.ts
 rename src/views/{withdraw => finance}/parten_bank/edit.vue (69%)
 rename src/views/{withdraw => finance}/parten_bank/index.vue (94%)
 create mode 100644 src/views/teamaster_user/teamaster_group_reservation/edit.vue
 create mode 100644 src/views/teamaster_user/teamaster_group_reservation/index.vue

diff --git a/src/api/store_user.ts b/src/api/store_user.ts
index 3d3046d..793fd3e 100644
--- a/src/api/store_user.ts
+++ b/src/api/store_user.ts
@@ -28,4 +28,4 @@ export function apiStoreUserDetail(params: any) {
 // 获取门店列表用于绑定
 export function apiUserLists(params?: any) {
     return request.get({ url: '/storeUser/storeLists', params })
-}
+}
\ No newline at end of file
diff --git a/src/api/tea_store.ts b/src/api/tea_store.ts
index 802856a..9cdd093 100644
--- a/src/api/tea_store.ts
+++ b/src/api/tea_store.ts
@@ -38,4 +38,9 @@ export function apiTeaStoreOwnerLists(params: any) {
 // 门店资质详情
 export function apiQualDetail(params: any) {
     return request.post({ url: '/teaStore/qualDetail', params })
+}
+
+// 创建二维码
+export function apiCreateWxcode(params: any) {
+    return request.post({ url: '/teaStore/createWXacode', params })
 }
\ No newline at end of file
diff --git a/src/api/teamaster_group_reservation.ts b/src/api/teamaster_group_reservation.ts
new file mode 100644
index 0000000..ddd785b
--- /dev/null
+++ b/src/api/teamaster_group_reservation.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 团体预约表列表
+export function apiTeamasterGroupReservationLists(params: any) {
+    return request.get({ url: '/teamaster_group_reservation/lists', params })
+}
+
+// 添加团体预约表
+export function apiTeamasterGroupReservationAdd(params: any) {
+    return request.post({ url: '/teamaster_group_reservation/add', params })
+}
+
+// 编辑团体预约表
+export function apiTeamasterGroupReservationEdit(params: any) {
+    return request.post({ url: '/teamaster_group_reservation/edit', params })
+}
+
+// 删除团体预约表
+export function apiTeamasterGroupReservationDelete(params: any) {
+    return request.post({ url: '/teamaster_group_reservation/delete', params })
+}
+
+// 团体预约表详情
+export function apiTeamasterGroupReservationDetail(params: any) {
+    return request.get({ url: '/teamaster_group_reservation/detail', params })
+}
\ No newline at end of file
diff --git a/src/utils/cache.ts b/src/utils/cache.ts
index e16973f..c46b08d 100644
--- a/src/utils/cache.ts
+++ b/src/utils/cache.ts
@@ -1,5 +1,5 @@
 const cache = {
-    key: 'like_admin_',
+    key: 'like_admin_parten_',
     //设置缓存(expire为缓存时效)
     set(key: string, value: any, expire?: string) {
         key = this.getKey(key)
diff --git a/src/views/withdraw/parten_bank/edit.vue b/src/views/finance/parten_bank/edit.vue
similarity index 69%
rename from src/views/withdraw/parten_bank/edit.vue
rename to src/views/finance/parten_bank/edit.vue
index 1e9d2d6..6adf499 100644
--- a/src/views/withdraw/parten_bank/edit.vue
+++ b/src/views/finance/parten_bank/edit.vue
@@ -2,9 +2,9 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
-                <el-form-item label="提现人名称" prop="name">
-                    <el-input v-model="formData.name" clearable placeholder="请输入提现人名称" />
+            <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
+                <el-form-item label="单位名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入单位名称" />
                 </el-form-item>
                 <el-form-item label="银行名称" prop="bank_name">
                     <el-input v-model="formData.bank_name" clearable placeholder="请输入银行名称" />
@@ -15,6 +15,12 @@
                 <el-form-item label="银行卡号" prop="bank_card">
                     <el-input v-model="formData.bank_card" clearable placeholder="请输入银行卡号" />
                 </el-form-item>
+                <el-form-item label="税务登记地址" prop="address">
+                    <el-input v-model="formData.address" clearable placeholder="请输入税务登记地址" />
+                </el-form-item>
+                <el-form-item label="纳税号" prop="ns">
+                    <el-input v-model="formData.ns" clearable placeholder="请输入纳税号" />
+                </el-form-item>
                 <el-form-item label="手机号码" prop="mobile">
                     <el-input v-model="formData.mobile" clearable placeholder="请输入银行卡绑定手机号码" />
                 </el-form-item>
@@ -53,13 +59,35 @@ const formData = reactive({
     bank_name: '',
     bank_card: '',
     bank_open_name: '',
+    address: '',
+    ns: '',
     mobile: '',
 })
 
-
 // 表单验证
 const formRules = reactive<any>({
-
+    name: [
+        { required: true, message: '请输入单位名称', trigger: 'blur' }
+    ],
+    bank_name: [
+        { required: true, message: '请输入银行名称', trigger: 'blur' }
+    ],
+    bank_open_name: [
+        { required: true, message: '请输入开户行名称', trigger: 'blur' }
+    ],
+    bank_card: [
+        { required: true, message: '请输入银行卡号', trigger: 'blur' }
+    ],
+    address: [
+        { required: true, message: '请输入税务登记地址', trigger: 'blur' }
+    ],
+    ns: [
+        { required: true, message: '请输入纳税号', trigger: 'blur' }
+    ],
+    mobile: [
+        { required: true, message: '请输入银行卡绑定手机号码', trigger: 'blur' },
+        { pattern: /^1\d{10}$/, message: '请输入正确的11位手机号码', trigger: 'blur' }
+    ]
 })
 
 
diff --git a/src/views/withdraw/parten_bank/index.vue b/src/views/finance/parten_bank/index.vue
similarity index 94%
rename from src/views/withdraw/parten_bank/index.vue
rename to src/views/finance/parten_bank/index.vue
index f4a3e61..dcf3144 100644
--- a/src/views/withdraw/parten_bank/index.vue
+++ b/src/views/finance/parten_bank/index.vue
@@ -34,9 +34,12 @@
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
+                    <el-table-column label="单位名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="银行名称" prop="bank_name" show-overflow-tooltip />
                     <el-table-column label="银行卡号" prop="bank_card" show-overflow-tooltip />
                     <el-table-column label="开户行名称" prop="bank_open_name" show-overflow-tooltip />
+                    <el-table-column label="税务登记地址" prop="address" show-overflow-tooltip />
+                    <el-table-column label="纳税号" prop="ns" show-overflow-tooltip />
                     <el-table-column label="绑定手机号码" prop="mobile" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
diff --git a/src/views/tea_store/index.vue b/src/views/tea_store/index.vue
index 768f734..50a3db6 100644
--- a/src/views/tea_store/index.vue
+++ b/src/views/tea_store/index.vue
@@ -44,7 +44,14 @@
                     <el-table-column label="名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="图片" prop="image">
                         <template #default="{ row }">
-                            <el-image style="width:50px;height:50px;" :src="row.image" />
+                            <el-image style="width:50px;height:50px;" :src="row.image" :preview-src-list="[row.image]"
+                                preview-teleported />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="推广二维码" prop="wxcode_url">
+                        <template #default="{ row }">
+                            <el-image style="width:50px;height:50px;" :src="row.wxcode_url"
+                                :preview-src-list="[row.wxcode_url]" preview-teleported />
                         </template>
                     </el-table-column>
                     <el-table-column label="店铺状态" prop="status">
@@ -61,6 +68,10 @@
                     <el-table-column label="操作" width="200" fixed="right">
                         <template #default="{ row }">
                             <div class="flex items-center">
+                                <el-button v-perms="['tea_store/create']" type="primary" link @click="handleCreate(row)"
+                                    v-if="!row.wxcode_url">
+                                    生成
+                                </el-button>
                                 <el-button v-perms="['tea_store/license']" type="primary" link @click="handleSee(row)">
                                     资质
                                 </el-button>
@@ -89,7 +100,7 @@
 <script lang="ts" setup name="teaStoreLists">
 import { usePaging } from '@/hooks/usePaging'
 import { useDictData } from '@/hooks/useDictOptions'
-import { apiTeaStoreLists, apiTeaStoreDelete } from '@/api/tea_store'
+import { apiTeaStoreLists, apiTeaStoreDelete, apiCreateWxcode } from '@/api/tea_store'
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
@@ -168,5 +179,15 @@ const handleSee = async (data: any) => {
     licenseRef.value?.setFormData(data)
 }
 
+const handleCreate = async (data: any) => {
+    feedback.loading('正在生成二维码...')
+    try {
+        await apiCreateWxcode({ id: data.id })
+        await getLists()
+    } finally {
+        feedback.closeLoading()
+    }
+}
+
 getLists()
 </script>
diff --git a/src/views/tea_store/store_user/edit.vue b/src/views/tea_store/store_user/edit.vue
index 1902bd8..ec47a94 100644
--- a/src/views/tea_store/store_user/edit.vue
+++ b/src/views/tea_store/store_user/edit.vue
@@ -2,35 +2,33 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
             @close="handleClose">
-            <el-form ref="formRef" :model="formData" label-width="90px">
-                <!-- <el-form-item label="编号" prop="sn">
-                    <el-input v-model="formData.sn" clearable placeholder="请输入编号" />
-                </el-form-item> -->
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="头像" prop="avatar">
                     <material-picker v-model="formData.avatar" />
                 </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="account">
-                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号" />
-                </el-form-item>
-                <el-form-item label="用户密码" prop="password">
-                    <el-input v-model="formData.password" 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="store_ids">
-                    <el-select v-model="formData.store_ids" multiple filterable clearable placeholder="请选择">
-                        <el-option :label="item.name" :value="item.id" v-for="item in storeList"
-                            :key="item.id"></el-option>
+                <el-form-item label="用户账号" prop="account">
+                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号" />
+                </el-form-item>
+                <el-form-item label="用户密码" prop="password" v-if="mode == 'add'">
+                    <el-input v-model="formData.password" clearable placeholder="请输入用户密码" />
+                </el-form-item>
+                <el-form-item label="选择门店" prop="store_ids">
+                    <el-select v-model="formData.store_ids" multiple filterable clearable placeholder="请选择门店">
+                        <el-option v-for="item in storeList" :key="item.id"
+                            :label="item.name || item.store_name || item.nickname || `门店${item.id}`"
+                            :value="item.id"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="是否禁用" prop="disable">
                     <el-select v-model="formData.disable" clearable placeholder="请选择">
-                        <el-option label="禁用" value="0"></el-option>
                         <el-option label="启用" value="1"></el-option>
+                        <el-option label="禁用" value="0"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -62,7 +60,7 @@ const storeList = ref<any[]>([])
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户表' : '新增用户表'
+    return mode.value == 'edit' ? '编辑门店管理员' : '新增门店管理员'
 })
 
 // 表单数据
@@ -78,7 +76,59 @@ const formData = reactive({
     login_time: '',
     disable: '',
     bind_user_id: '',
-    store_ids: '',
+    store_ids: [] as any[],
+})
+
+const formRules = reactive<any>({
+    avatar: [
+        {
+            required: true,
+            message: '请上传头像',
+            trigger: 'blur'
+        }
+    ],
+    nickname: [
+        {
+            required: true,
+            message: '请输入昵称',
+            trigger: 'blur'
+        }
+    ],
+    account: [
+        {
+            required: true,
+            message: '请输入账号',
+            trigger: 'blur'
+        }
+    ],
+    password: [
+        {
+            required: true,
+            message: '请输入密码',
+            trigger: 'blur'
+        }
+    ],
+    mobile: [
+        {
+            required: true,
+            message: '请输入电话',
+            trigger: 'blur'
+        }
+    ],
+    store_ids: [
+        {
+            required: true,
+            message: '请选择门店',
+            trigger: 'change'
+        }
+    ],
+    disable: [
+        {
+            required: true,
+            message: '请选择是否禁用',
+            trigger: 'change'
+        }
+    ]
 })
 
 // 获取要绑定的门店列表
@@ -118,7 +168,7 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    let data = { ...formData, }
+    const data: Record<string, any> = { ...formData }
     if (Array.isArray(data.store_ids)) {
         data.store_ids = data.store_ids.join(',')
     }
diff --git a/src/views/tea_store_real/index.vue b/src/views/tea_store_real/index.vue
index e310f2e..a4ed611 100644
--- a/src/views/tea_store_real/index.vue
+++ b/src/views/tea_store_real/index.vue
@@ -33,12 +33,6 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['tea_store_real/add']" type="primary" @click="handleAdd">
-                <template #icon>
-                    <icon name="el-icon-Plus" />
-                </template>
-                新增
-            </el-button>
             <el-button v-perms="['tea_store_real/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
                 删除
diff --git a/src/views/teamaster_real/edit.vue b/src/views/teamaster_real/edit.vue
index cdc5a64..0ed65bd 100644
--- a/src/views/teamaster_real/edit.vue
+++ b/src/views/teamaster_real/edit.vue
@@ -33,26 +33,37 @@
                 <el-form-item label="体重" prop="weight">
                     <el-input v-model="formData.weight" clearable placeholder="请输入体重" disabled />
                 </el-form-item>
+
+                <el-form-item label="专属圈子" prop="weight">
+                    <div>
+                        <span class="mr-2" v-for="(item, index) in labelMsg" :key="index"> {{ item.label_name
+                            }}</span>
+                    </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" />
-                    <!-- <material-picker v-model="formData.license_img" /> -->
                 </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" v-if="formData.health_certificate">
-                    <el-image 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" />
+                <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="avatar">
-                    <el-image v-for="(item, index) in formData.information" :key="index"
-                        style="width: 100px; height: 100px" :src="item" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
-                        :preview-src-list="formData.information" show-progress :initial-index="4" fit="cover" />
+                    <el-image v-if="formData.information.length > 0" v-for="(item, index) in formData.information"
+                        :key="index" style="width: 100px; height: 100px" :src="item" :zoom-rate="1.2" :max-scale="7"
+                        :min-scale="0.2" :preview-src-list="formData.information" show-progress :initial-index="4"
+                        fit="cover" />
+
+                    <div v-else>未上传</div>
                 </el-form-item>
 
                 <!-- <el-form-item label="兴趣爱好" prop="hobby_introduce">
@@ -87,10 +98,11 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
+const labelMsg = ref([])
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑茶艺师审核' : '新增茶艺师审核'
+    return mode.value = '茶艺师审核'
 })
 
 // 表单数据
@@ -112,46 +124,47 @@ const formData = reactive({
     license_img: '',
     hobby_introduce: '',
     status: '',
+    label_id: ''
 })
 
 
 // 表单验证
 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']
-    }]
+    // 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']
+    // }]
 })
 
 
@@ -171,6 +184,8 @@ const setFormData = async (data: Record<any, any>) => {
     formData.bohui_time = timeFormat(formData.bohui_time, 'yyyy-mm-dd hh:MM:ss')
     //@ts-ignore
     formData.create_time = timeFormat(formData.create_time, 'yyyy-mm-dd hh:MM:ss')
+
+    labelMsg.value = data.label_msg
 }
 
 const getDetail = async (row: Record<string, any>) => {
diff --git a/src/views/teamaster_user/teamaster_group_reservation/edit.vue b/src/views/teamaster_user/teamaster_group_reservation/edit.vue
new file mode 100644
index 0000000..446d8bd
--- /dev/null
+++ b/src/views/teamaster_user/teamaster_group_reservation/edit.vue
@@ -0,0 +1,126 @@
+<template>
+    <div class="edit-popup">
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+            @close="handleClose" cancel-button-text="">
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="人数" prop="numbers">
+                    <el-input v-model="formData.numbers" clearable placeholder="请输入人数" disabled />
+                </el-form-item>
+                <el-form-item label="其他要求" prop="other_requirements">
+                    <el-input v-model="formData.other_requirements" clearable placeholder="请输入预约时间" disabled />
+                </el-form-item>
+                <el-form-item label="预定日期" prop="res_time">
+                    <el-input v-model="formData.res_time" clearable placeholder="请输入预约时间" disabled />
+                </el-form-item>
+                <el-form-item label="联系人" prop="contact">
+                    <el-input v-model="formData.contact" clearable placeholder="请输入联系人" disabled />
+                </el-form-item>
+                <el-form-item label="联系电话" prop="phone">
+                    <el-input v-model="formData.phone" clearable placeholder="请输入联系电话" disabled />
+                </el-form-item>
+                <el-form-item label="详细地址" prop="address">
+                    <el-input v-model="formData.address" clearable placeholder="请输入详细地址" disabled />
+                </el-form-item>
+                <el-form-item label="订单信息" prop="content">
+                    <el-input v-model="formData.content" clearable placeholder="请输入订单信息" disabled />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="teamasterGroupReservationEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiTeamasterGroupReservationAdd, apiTeamasterGroupReservationEdit, apiTeamasterGroupReservationDetail } from '@/api/teamaster_group_reservation'
+import { timeFormat } 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>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value = '预约信息'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    numbers: '',
+    other_requirements: '',
+    res_time: '',
+    contact: '',
+    phone: '',
+    province: '',
+    city: '',
+    district: '',
+    address: '',
+    content: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiTeamasterGroupReservationDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    // await formRef.value?.validate()
+    // const data = { ...formData, }
+    // mode.value == 'edit'
+    //     ? await apiTeamasterGroupReservationEdit(data)
+    //     : await apiTeamasterGroupReservationAdd(data)
+    popupRef.value?.close()
+    // emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/teamaster_user/teamaster_group_reservation/index.vue b/src/views/teamaster_user/teamaster_group_reservation/index.vue
new file mode 100644
index 0000000..cdf42ab
--- /dev/null
+++ b/src/views/teamaster_user/teamaster_group_reservation/index.vue
@@ -0,0 +1,133 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="联系人" prop="contact">
+                    <el-input class="w-[280px]" v-model="queryParams.contact" clearable placeholder="请输入联系人" />
+                </el-form-item>
+                <el-form-item label="联系电话" prop="phone">
+                    <el-input class="w-[280px]" v-model="queryParams.phone" 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">
+            <el-button v-perms="['teamaster_group_reservation/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['teamaster_group_reservation/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" />
+                    <el-table-column label="用户信息" prop="avatar" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span>{{ row.nickname }}</span>
+                            <el-image v-if="row.avatar" style="width:100px;height:100px;" :src="row.avatar"
+                                :preview-src-list="[row.avatar]" preview-teleported fit="cover" />
+                        </template>
+                    </el-table-column>
+
+                    <el-table-column label="预约人数" prop="numbers" show-overflow-tooltip />
+                    <el-table-column label="其他要求" prop="other_requirements" show-overflow-tooltip />
+                    <el-table-column label="预约时间" prop="res_time" show-overflow-tooltip />
+                    <el-table-column label="联系人" prop="contact" show-overflow-tooltip />
+                    <el-table-column label="联系电话" prop="phone" show-overflow-tooltip />
+                    <el-table-column label="详细地址" prop="address" show-overflow-tooltip />
+                    <el-table-column label="订单信息" prop="content" show-overflow-tooltip />
+                    <el-table-column label="创建时间" prop="dtime" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['teamaster_group_reservation/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                查看
+                            </el-button>
+                            <el-button v-perms="['teamaster_group_reservation/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
+                                删除
+                            </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>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="teamasterGroupReservationLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiTeamasterGroupReservationLists, apiTeamasterGroupReservationDelete } from '@/api/teamaster_group_reservation'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    other_require: '',
+    res_time: '',
+    contact: '',
+    phone: '',
+    address: '',
+    content: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiTeamasterGroupReservationLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiTeamasterGroupReservationDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
diff --git a/src/views/withdraw/parten_reflect/index.vue b/src/views/withdraw/parten_reflect/index.vue
index 6ca8916..69cd600 100644
--- a/src/views/withdraw/parten_reflect/index.vue
+++ b/src/views/withdraw/parten_reflect/index.vue
@@ -31,7 +31,7 @@
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
-                新增
+                提现
             </el-button>
             <!-- <el-button v-perms="['parten_reflect/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
diff --git a/src/views/workbench/index.vue b/src/views/workbench/index.vue
index 1ed54f9..8f1bc0c 100644
--- a/src/views/workbench/index.vue
+++ b/src/views/workbench/index.vue
@@ -196,7 +196,7 @@ const workbenchData: any = reactive({
         },
         yAxis: {
             type: 'value',
-            name: '单位（万）'
+            name: '单位（元）'
         },
         tooltip: {
             trigger: 'axis'