From a709a35a71495eec4aa2ca5f6bc12f4b1e58a5ce Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 28 Mar 2026 19:05:17 +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/views/teamaster_group/edit.vue  | 48 ++++++++++-----------
 src/views/teamaster_group/index.vue | 65 ++++++++++-------------------
 src/views/teamaster_user/edit.vue   |  2 -
 3 files changed, 42 insertions(+), 73 deletions(-)

diff --git a/src/views/teamaster_group/edit.vue b/src/views/teamaster_group/edit.vue
index 05f3e35..b2efea6 100644
--- a/src/views/teamaster_group/edit.vue
+++ b/src/views/teamaster_group/edit.vue
@@ -1,32 +1,23 @@
 <template>
     <div class="edit-popup">
-        <popup
-            ref="popupRef"
-            :title="popupTitle"
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
+        <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="套餐类型 1清风 2明月 3鹤鸣" prop="type">
-                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择套餐类型 1清风 2明月 3鹤鸣">
-                        <el-option 
-                            v-for="(item, index) in dictData."
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
+                <el-form-item label="套餐类型" prop="type">
+                    <el-select class="flex-1" v-model="formData.type" clearable placeholder="请选择套餐类型">
+                        <el-option label="清风" :value="1"></el-option>
+                        <el-option label="明月" :value="2"></el-option>
+                        <el-option label="鹤鸣" :value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="套餐名称" prop="title">
                     <el-input v-model="formData.title" clearable placeholder="请输入套餐名称" />
                 </el-form-item>
                 <el-form-item label="套餐首图" prop="img">
-                    <el-input v-model="formData.img" clearable placeholder="请输入套餐首图" />
+                    <material-picker v-model="formData.img" :limit="1" />
                 </el-form-item>
-                <el-form-item label="套餐图片多图" prop="img_arr">
-                    <el-input v-model="formData.img_arr" clearable placeholder="请输入套餐图片多图" />
+                <el-form-item label="套餐轮播图" prop="img_arr">
+                    <material-picker v-model="formData.img_arr" :limit="9" />
                 </el-form-item>
                 <el-form-item label="套餐可用时长" prop="hour">
                     <el-input v-model="formData.hour" clearable placeholder="请输入套餐可用时长" />
@@ -44,7 +35,7 @@
                     <el-input v-model="formData.sold" clearable placeholder="请输入销售额" />
                 </el-form-item>
                 <el-form-item label="套餐介绍" prop="introduce_details">
-                    <el-input v-model="formData.introduce_details" clearable placeholder="请输入套餐介绍" />
+                    <editor class="mb-10" v-model="formData.introduce_details" height="500"></editor>
                 </el-form-item>
                 <el-form-item label="其他说明" prop="other_description">
                     <el-input v-model="formData.other_description" clearable placeholder="请输入其他说明" />
@@ -56,7 +47,7 @@
                     <el-input v-model="formData.pl_number" clearable placeholder="请输入使用人数说明" />
                 </el-form-item>
                 <el-form-item label="退改说明" prop="returd_details">
-                    <el-input v-model="formData.returd_details" clearable placeholder="请输入退改说明" />
+                    <editor class="mb-10" v-model="formData.returd_details" height="500"></editor>
                 </el-form-item>
             </el-form>
         </popup>
@@ -67,7 +58,7 @@
 import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiTeamasterGroupAdd, apiTeamasterGroupEdit, apiTeamasterGroupDetail } from '@/api/teamaster_group'
-import { timeFormat } from '@/utils/util'
+import { timeFormat, removeImageUrlPrefix } from '@/utils/util'
 import type { PropType } from 'vue'
 defineProps({
     dictData: {
@@ -120,8 +111,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
-    
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -135,9 +124,14 @@ const getDetail = async (row: Record<string, any>) => {
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { ...formData,  }
-    mode.value == 'edit' 
-        ? await apiTeamasterGroupEdit(data) 
+    const data = { ...formData, }
+
+    data.img = removeImageUrlPrefix(data.img)
+    data.img_arr = removeImageUrlPrefix(data.img_arr)
+    data.img_arr = Array.isArray(data.img_arr) ? data.img_arr.join(',') : ''
+
+    mode.value == 'edit'
+        ? await apiTeamasterGroupEdit(data)
         : await apiTeamasterGroupAdd(data)
     popupRef.value?.close()
     emit('success')
diff --git a/src/views/teamaster_group/index.vue b/src/views/teamaster_group/index.vue
index bded0bd..acdb23c 100644
--- a/src/views/teamaster_group/index.vue
+++ b/src/views/teamaster_group/index.vue
@@ -1,20 +1,13 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
-                <el-form-item label="套餐类型 1清风 2明月 3鹤鸣" prop="type">
-                    <el-select class="w-[280px]" v-model="queryParams.type" clearable placeholder="请选择套餐类型 1清风 2明月 3鹤鸣">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item class="w-[280px]" label="套餐类型" prop="type">
+                    <el-select v-model="queryParams.type" clearable placeholder="请选择套餐类型">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
-                            v-for="(item, index) in dictData."
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
+                        <el-option label="清风" value="1"></el-option>
+                        <el-option label="明月" value="2"></el-option>
+                        <el-option label="鹤鸣" value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="套餐名称" prop="title">
@@ -33,51 +26,36 @@
                 </template>
                 新增
             </el-button>
-            <el-button
-                v-perms="['teamaster_group/delete']"
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
+            <el-button v-perms="['teamaster_group/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="套餐类型 1清风 2明月 3鹤鸣" prop="type">
+                    <el-table-column label="套餐类型" prop="type">
                         <template #default="{ row }">
-                            <dict-value :options="dictData." :value="row.type" />
+                            <el-tag type="primary" v-if="row.type == 1">清风</el-tag>
+                            <el-tag type="success" v-if="row.type == 2">明月</el-tag>
+                            <el-tag type="danger" v-if="row.type == 3">鹤鸣</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="套餐名称" prop="title" show-overflow-tooltip />
-                    <el-table-column label="套餐首图" prop="img" show-overflow-tooltip />
-                    <el-table-column label="套餐图片多图" prop="img_arr" show-overflow-tooltip />
+                    <el-table-column label="套餐首图" prop="img" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <el-image v-if="row.img" style="width:50px;height:50px;" :src="row.img"
+                                :preview-src-list="[row.img]" preview-teleported />
+                        </template>
+                    </el-table-column />
                     <el-table-column label="套餐可用时长" prop="hour" show-overflow-tooltip />
-                    <el-table-column label="折扣" prop="discount" show-overflow-tooltip />
-                    <el-table-column label="折扣价" prop="discount_price" show-overflow-tooltip />
-                    <el-table-column label="原价、划线价" prop="price" show-overflow-tooltip />
                     <el-table-column label="销售额" prop="sold" show-overflow-tooltip />
-                    <el-table-column label="套餐介绍" prop="introduce_details" show-overflow-tooltip />
-                    <el-table-column label="其他说明" prop="other_description" show-overflow-tooltip />
-                    <el-table-column label="适用场景" prop="description" show-overflow-tooltip />
-                    <el-table-column label="使用人数说明" prop="pl_number" show-overflow-tooltip />
-                    <el-table-column label="退改说明" prop="returd_details" 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/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
+                            <el-button v-perms="['teamaster_group/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
                             </el-button>
-                            <el-button
-                                v-perms="['teamaster_group/delete']"
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
+                            <el-button v-perms="['teamaster_group/delete']" type="danger" link
+                                @click="handleDelete(row.id)">
                                 删除
                             </el-button>
                         </template>
@@ -152,4 +130,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-
diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue
index ff6b1f4..84acf68 100644
--- a/src/views/teamaster_user/edit.vue
+++ b/src/views/teamaster_user/edit.vue
@@ -12,14 +12,12 @@
                 <el-form-item label="茶艺师资格证书" prop="license_img">
                     <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-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="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" />