完善列表

src/api/tea_store.ts

@@ -23,4 +23,14 @@ export function apiTeaStoreDelete(params: any) {
 // 门店表详情
 export function apiTeaStoreDetail(params: any) {
     return request.get({ url: '/tea_store/detail', params })
+}
+
+// 门店城市列表
+export function apiTeaStoreCityLists() {
+    return request.get({ url: '/teaStore/teaStoreCity' })
+}
+
+// 归属人
+export function apiTeaStoreOwnerLists(params: any) {
+    return request.get({ url: '/teaStore/storeUser', params })
 }

src/utils/util.ts

@@ -185,9 +185,9 @@ export const calcColor = (color: string, opacity: number): string => {
         const fullHex =
             hex.length === 3
                 ? hex
-                      .split('')
+                    .split('')
-                      .map((h) => h + h)
+                    .map((h) => h + h)
-                      .join('')
+                    .join('')
                 : hex
 
         // 转换为 RGB
@@ -217,3 +217,29 @@ export const calcColor = (color: string, opacity: number): string => {
     // 返回转换后的 rgba 颜色值
     return `rgba(${r}, ${g}, ${b}, ${opacity})`
 }
+
+const OSS_PREFIX = 'https://chaz.oss-cn-shanghai.aliyuncs.com/'
+
+
+export const removeImageUrlPrefix = (file: any) => {
+    if (Array.isArray(file)) {
+        const fileList = file.map((item) => {
+            return item.replace(OSS_PREFIX, '')
+        })
+        return fileList
+    } else {
+        return file.replace(OSS_PREFIX, '')
+    }
+}
+
+export const normalizeImageUrl = (file: any) => {
+    if (Array.isArray(file)) {
+        const fileList = file.map((item) => {
+            return OSS_PREFIX + item
+        })
+        console.log("🚀 ~ normalizeImageUrl ~ fileList:", fileList)
+        return fileList
+    } else {
+        return OSS_PREFIX + file
+    }
+}

src/views/article/lists/edit.vue

@@ -4,66 +4,31 @@
             <el-page-header :content="$route.meta.title" @back="$router.back()" />
         </el-card>
         <el-card class="mt-4 !border-none" shadow="never">
-            <el-form
+            <el-form ref="formRef" class="ls-form" :model="formData" label-width="85px" :rules="rules">
-                ref="formRef"
-                class="ls-form"
-                :model="formData"
-                label-width="85px"
-                :rules="rules"
-            >
                 <div class="xl:flex">
                     <div>
-                        <el-form-item label="文章标题" prop="title">
+                        <el-form-item label="文章标题123" prop="title">
                             <div class="w-80">
-                                <el-input
+                                <el-input v-model="formData.title" placeholder="请输入文章标题" type="textarea"
-                                    v-model="formData.title"
+                                    :autosize="{ minRows: 3, maxRows: 3 }" maxlength="64" show-word-limit clearable />
-                                    placeholder="请输入文章标题"
-                                    type="textarea"
-                                    :autosize="{ minRows: 3, maxRows: 3 }"
-                                    maxlength="64"
-                                    show-word-limit
-                                    clearable
-                                />
                             </div>
                         </el-form-item>
                         <el-form-item label="文章栏目" prop="cid">
-                            <el-select
+                            <el-select class="w-80" v-model="formData.cid" placeholder="请选择文章栏目" clearable>
-                                class="w-80"
+                                <el-option v-for="item in optionsData.article_cate" :key="item.id" :label="item.name"
-                                v-model="formData.cid"
+                                    :value="item.id" />
-                                placeholder="请选择文章栏目"
-                                clearable
-                            >
-                                <el-option
-                                    v-for="item in optionsData.article_cate"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                />
                             </el-select>
                         </el-form-item>
                         <el-form-item label="文章简介" prop="desc">
                             <div class="w-80">
-                                <el-input
+                                <el-input v-model="formData.desc" placeholder="请输入文章简介" type="textarea"
-                                    v-model="formData.desc"
+                                    :autosize="{ minRows: 3, maxRows: 6 }" :maxlength="200" show-word-limit clearable />
-                                    placeholder="请输入文章简介"
-                                    type="textarea"
-                                    :autosize="{ minRows: 3, maxRows: 6 }"
-                                    :maxlength="200"
-                                    show-word-limit
-                                    clearable
-                                />
                             </div>
                         </el-form-item>
                         <el-form-item label="摘要" prop="abstract">
                             <div class="w-80">
-                                <el-input
+                                <el-input type="textarea" :autosize="{ minRows: 6, maxRows: 6 }"
-                                    type="textarea"
+                                    v-model="formData.abstract" maxlength="200" show-word-limit clearable />
-                                    :autosize="{ minRows: 6, maxRows: 6 }"
-                                    v-model="formData.abstract"
-                                    maxlength="200"
-                                    show-word-limit
-                                    clearable
-                                />
                             </div>
                         </el-form-item>
                         <el-form-item label="文章封面" prop="image">

src/views/tea_store/edit.vue

@@ -1,25 +1,25 @@
 <template>
     <div class="edit-popup">
-        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="600px" @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-item>
-                <el-form-item label="抖音UID" prop="name">
+                <el-form-item label="抖音UID" prop="pro_id">
-                    <el-input v-model="formData.name" clearable placeholder="抖音UID" />
+                    <el-input v-model="formData.pro_id" clearable placeholder="抖音UID" />
                 </el-form-item>
                 <el-form-item label="门店图片" prop="image">
-                    <material-picker v-model="formData.image" :limit="9" />
+                    <material-picker v-model="formData.image" :limit="1" />
                 </el-form-item>
-                <!-- <el-form-item label="轮播图" prop="image_arr">
+                <el-form-item label="轮播图" prop="image_arr">
-                    <material-picker v-model="formData.image_arr" />
+                    <material-picker v-model="formData.image_arr" :limit="9" />
                 </el-form-item>
-                <el-form-item label="视频" prop="video">
+                <!-- <el-form-item label="视频" prop="video">
                     <material-picker v-model="formData.video" />
                 </el-form-item> -->
                 <el-form-item label="星级" prop="star">
-                    <el-input v-model="formData.star" clearable placeholder="请输入星级" />
+                    <el-input v-model="formData.star" clearable placeholder="请输入星级(最大值为5)" />
                 </el-form-item>
                 <el-form-item label="门店类型" prop="operation_type">
                     <el-radio-group v-model="formData.operation_type" placeholder="请选择门店类型">
@@ -33,31 +33,38 @@
                     <el-input v-model="formData.day_time" clearable placeholder="请输入周营业时间" />
                 </el-form-item> -->
                 <el-form-item label="开始时间" prop="start_time">
-                    <el-time-picker v-model="formData.start_time" placeholder="请选择开始时间" format="HH:mm" />
+                    <el-time-picker v-model="formData.start_time" placeholder="请选择开始时间" format="HH:mm"
+                        value-format="HH:mm" />
                 </el-form-item>
                 <el-form-item label="结束时间" prop="end_time">
-                    <el-time-picker v-model="formData.end_time" placeholder="请选择结束时间" format="HH:mm" />
+                    <el-time-picker v-model="formData.end_time" placeholder="请选择结束时间" format="HH:mm"
+                        value-format="HH:mm" />
                 </el-form-item>
                 <el-form-item label="门店电话" prop="contact_phone">
                     <el-input v-model="formData.contact_phone" clearable placeholder="请输入门店联系电话" />
                 </el-form-item>
-                <el-form-item label="省名称" prop="province">
+                <el-form-item label="省市区" prop="province">
                     <el-cascader :options="regionData" :disabled="false" style="width: 95%" v-model="addressSelections"
-                        placeholder="请选择省市区"></el-cascader>
+                        placeholder="请选择省市区" @change="handleRegionChange"></el-cascader>
                 </el-form-item>
+
                 <el-form-item label="详细地址" prop="address">
                     <el-input v-model="formData.address" clearable placeholder="请输入详细地址" />
                 </el-form-item>
-                <el-form-item label="所属开通城市id" prop="city_area_id">
+                <el-form-item label="所属城市" prop="city_area_id">
-                    <el-input v-model="formData.city_area_id" clearable placeholder="请输入所属开通城市id" />
+                    <el-select v-model="formData.city_area_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.longitude" clearable placeholder="请输入经度" />
                 </el-form-item>
                 <el-form-item label="纬度" prop="latitude">
                     <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" />
                 </el-form-item>
-                <el-form-item label="使用说明" prop="textarea1">
+                <!-- <el-form-item label="使用说明" prop="textarea1">
                     <editor class="flex-1" v-model="formData.textarea1" :height="500" />
                 </el-form-item>
                 <el-form-item label="其他说明" prop="textarea2">
@@ -65,48 +72,34 @@
                 </el-form-item>
                 <el-form-item label="退改说明" prop="textarea3">
                     <editor class="flex-1" v-model="formData.textarea3" :height="500" />
+                </el-form-item> -->
+                <el-form-item label="门锁" prop="is_lock">
+                    <el-select v-model="formData.is_lock" 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="lock_no">
                     <el-input v-model="formData.lock_no" clearable placeholder="请输入门锁编号" />
+                    <div class="text-[#ccc]">门锁不存在则不用填写编号</div>
                 </el-form-item>
-                <el-form-item label="是否存在门锁 0:不存在 1:存在" prop="is_lock">
+                <el-form-item label="营业状态" prop="shop_status">
-                    <el-input v-model="formData.is_lock" clearable placeholder="请输入是否存在门锁 0:不存在 1:存在" />
+                    <el-select v-model="formData.shop_status" clearable placeholder="请选择">
-                </el-form-item>
+                        <el-option label="打烊" value="0"></el-option>
-                <el-form-item label="" prop="dtime">
+                        <el-option label="开店" value="1"></el-option>
-                    <el-input v-model="formData.dtime" clearable placeholder="请输入" />
+                    </el-select>
-                </el-form-item>
-                <el-form-item label="" prop="update_dtime">
-                    <el-input v-model="formData.update_dtime" clearable placeholder="请输入" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input v-model="formData.status" clearable placeholder="请输入状态" />
-                </el-form-item>
-                <el-form-item label="0打烊 1开店" prop="shop_status">
-                    <el-input v-model="formData.shop_status" clearable placeholder="请输入0打烊 1开店" />
-                </el-form-item>
-                <el-form-item label="1为删除" prop="del">
-                    <el-input v-model="formData.del" clearable placeholder="请输入1为删除" />
-                </el-form-item>
-                <el-form-item label="抖音pro_id" prop="pro_id">
-                    <el-input v-model="formData.pro_id" clearable placeholder="请输入抖音pro_id" />
                 </el-form-item>
                 <el-form-item label="归属人" prop="store_user_id">
-                    <el-input v-model="formData.store_user_id" clearable placeholder="请输入归属人" />
+                    <el-select v-model="formData.store_user_id" multiple filterable clearable placeholder="请选择">
+                        <el-option :label="item.nickname" :value="item.id" v-for="item in ownerList"
+                            :key="item.id"></el-option>
+                    </el-select>
                 </el-form-item>
-                <el-form-item label="累计提现" prop="total_reflect_amount">
+                <el-form-item label="充值套餐状态" prop="recharge_state">
-                    <el-input v-model="formData.total_reflect_amount" clearable placeholder="请输入累计提现" />
+                    <el-select v-model="formData.recharge_state" clearable placeholder="请选择">
-                </el-form-item>
+                        <el-option label="关闭" value="0"></el-option>
-                <el-form-item label="累计额度" prop="total_amount">
+                        <el-option label="打开" value="1"></el-option>
-                    <el-input v-model="formData.total_amount" clearable placeholder="请输入累计额度" />
+                    </el-select>
-                </el-form-item>
-                <el-form-item label="门店余额" prop="balance">
-                    <el-input v-model="formData.balance" clearable placeholder="请输入门店余额" />
-                </el-form-item>
-                <el-form-item label="充值套餐状态 0关闭 1打开" prop="recharge_state">
-                    <el-input v-model="formData.recharge_state" clearable placeholder="请输入充值套餐状态 0关闭 1打开" />
-                </el-form-item>
-                <el-form-item label="1为选中" prop="default">
-                    <el-input v-model="formData.default" clearable placeholder="请输入1为选中" />
                 </el-form-item>
             </el-form>
         </popup>
@@ -124,8 +117,9 @@ import {
     pcaTextArr,
     codeToText,
 } from "element-china-area-data";
-import { timeFormat } from '@/utils/util'
+import { timeFormat, removeImageUrlPrefix } from '@/utils/util'
 import type { PropType } from 'vue'
+import { apiTeaStoreCityLists, apiTeaStoreOwnerLists } from '@/api/tea_store'
 
 defineProps({
     dictData: {
@@ -138,8 +132,27 @@ const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 
+
 const addressSelections = ref<Array<string | number>>([])
 
+// 城市列表
+const cityList = ref<any[]>([])
+
+// 归属人
+const ownerList = ref<any[]>([])
+
+onMounted(async () => {
+    try {
+        const res = await apiTeaStoreCityLists()
+        cityList.value = res || []
+
+        const ownerRes = await apiTeaStoreOwnerLists({})
+        ownerList.value = ownerRes || []
+    } catch (e) {
+        cityList.value = []
+    }
+})
+
 
 // 弹窗标题
 const popupTitle = computed(() => {
@@ -152,14 +165,12 @@ const formData = reactive({
     name: '',
     image: '',
     image_arr: '',
-    video: '',
     star: '',
     operation_type: '',
     day_time: '',
     start_time: '',
     end_time: '',
     contact_phone: '',
-    customer_service: '',
     province: '',
     province_id: '',
     city: '',
@@ -170,31 +181,136 @@ const formData = reactive({
     city_area_id: '',
     longitude: '',
     latitude: '',
-    textarea1: '',
-    textarea2: '',
-    textarea3: '',
     lock_no: '',
     is_lock: '',
-    dtime: '',
-    update_dtime: '',
-    status: '',
     shop_status: '',
-    del: '',
     pro_id: '',
     store_user_id: '',
-    total_reflect_amount: '',
-    total_amount: '',
-    balance: '',
     recharge_state: '',
-    default: '',
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
-
+    name: [
+        {
+            required: true,
+            message: '请输入名称',
+            trigger: ['blur']
+        }
+    ],
+    image: [
+        {
+            required: true,
+            message: '请上传门店图片',
+        }
+    ],
+    image_arr: [
+        {
+            required: true,
+            message: '请上传轮播图',
+        }
+    ],
+    operation_type: [
+        {
+            required: true,
+            message: '请选择门店类型',
+        }
+    ],
+    start_time: [
+        {
+            required: true,
+            message: '请选择开始时间',
+        }
+    ],
+    end_time: [
+        {
+            required: true,
+            message: '请选择结束时间',
+        }
+    ],
+    contact_phone: [
+        {
+            required: true,
+            message: '请输入门店电话',
+        }
+    ],
+    province: [
+        {
+            required: true,
+            message: '请选择省市区',
+        }
+    ],
+    address: [
+        {
+            required: true,
+            message: '请输入详细地址',
+        }
+    ],
+    city_area_id: [
+        {
+            required: true,
+            message: '请输入所属城市',
+        }
+    ],
+    longitude: [
+        {
+            required: true,
+            message: '请输入经度',
+        }
+    ],
+    latitude: [
+        {
+            required: true,
+            message: '请输入纬度',
+        }
+    ],
+    is_lock: [
+        {
+            required: true,
+            message: '请选择门锁',
+        }
+    ],
+    shop_status: [
+        {
+            required: true,
+            message: '请选择营业状态',
+        }
+    ],
+    store_user_id: [
+        {
+            required: true,
+            message: '请输入归属人',
+        }
+    ],
+    lock_no: [
+        {
+            required: true,
+            message: '请输入门锁编号',
+            validator: (rule: any, value: any, callback: any) => {
+                // 只有当门锁存在时才校验必填
+                if (Number(formData.is_lock) === 1) {
+                    if (!value) {
+                        callback(new Error('请输入门锁编号'))
+                        return
+                    }
+                }
+                callback()
+            },
+            trigger: ['blur', 'change']
+        }
+    ],
 })
 
+// 省市区选择回调，获取省市区名称和地区ID
+const handleRegionChange = (val: any[], selectedData: any[]) => {
+    formData.province_id = val[0] || ''
+    formData.city_id = val[1] || ''
+    formData.district_id = val[2] || ''
+    formData.province = codeToText[val[0]]
+    formData.city = codeToText[val[1]]
+    formData.district = codeToText[val[2]]
+}
 
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
@@ -204,8 +320,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -218,8 +332,16 @@ const getDetail = async (row: Record<string, any>) => {
 
 // 提交按钮
 const handleSubmit = async () => {
-    await formRef.value?.validate()
+    // await formRef.value?.validate()
-    const data = { ...formData, }
+    let data = { ...formData }
+    if (Array.isArray(data.store_user_id)) {
+        data.store_user_id = data.store_user_id.join(',')
+    }
+    data.image = removeImageUrlPrefix(data.image)
+    data.image_arr = removeImageUrlPrefix(data.image_arr)
+    if (Array.isArray(data.image_arr)) {
+        data.image_arr = data.image_arr.join(',')
+    }
     mode.value == 'edit'
         ? await apiTeaStoreEdit(data)
         : await apiTeaStoreAdd(data)
@@ -238,8 +360,6 @@ const handleClose = () => {
     emit('close')
 }
 
-
-
 defineExpose({
     open,
     setFormData,

src/views/tea_store/index.vue

@@ -47,29 +47,45 @@
                             <el-image style="width:50px;height:50px;" :src="row.image" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="星级" prop="star" show-overflow-tooltip />
+                    <el-table-column label="门店类型" prop="operation_type">
-                    <el-table-column label="1直营 2加盟" prop="operation_type">
                         <template #default="{ row }">
                             <dict-value :options="dictData.operation_type" :value="row.operation_type" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="周营业时间" prop="day_time" show-overflow-tooltip />
+                    <!-- <el-table-column label="周营业时间" prop="day_time" show-overflow-tooltip /> -->
                     <el-table-column label="营业开始时间" prop="start_time" show-overflow-tooltip />
                     <el-table-column label="营业结束时间" prop="end_time" show-overflow-tooltip />
                     <el-table-column label="联系电话" prop="contact_phone" show-overflow-tooltip />
                     <el-table-column label="详细地址" prop="address" show-overflow-tooltip />
-                    <el-table-column label="" prop="dtime" show-overflow-tooltip />
+                    <!-- <el-table-column label="" prop="dtime" show-overflow-tooltip /> -->
                     <el-table-column label="累计提现" prop="total_reflect_amount" show-overflow-tooltip />
                     <el-table-column label="累计额度" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="门店余额" prop="balance" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button v-perms="['tea_store/edit']" type="primary" link @click="handleEdit(row)">
+                            <div v-if="row.operation_type == 1">
-                                编辑
+                                <el-button type="primary" link>
-                            </el-button>
+                                    <router-link :to="{
-                            <el-button v-perms="['tea_store/delete']" type="danger" link @click="handleDelete(row.id)">
+                                        path: getRoutePath('tea_room/lists'),
-                                删除
+                                        query: {
-                            </el-button>
+                                            id: row.id
+                                        }
+                                    }">
+                                        包间
+                                    </router-link>
+                                </el-button>
+                            </div>
+
+                            <div class="flex items-center">
+                                <el-button v-perms="['tea_store/edit']" type="primary" link @click="handleEdit(row)">
+                                    编辑
+                                </el-button>
+                                <el-button v-perms="['tea_store/delete']" type="danger" link
+                                    @click="handleDelete(row.id)">
+                                    删除
+                                </el-button>
+                            </div>
+
                         </template>
                     </el-table-column>
                 </el-table>
@@ -90,6 +106,7 @@ import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
 import { useDictOptions } from '@/hooks/useDictOptions'
+import { getRoutePath } from '@/router'
 
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框

src/views/teamaster_user/edit.vue

@@ -1,21 +1,10 @@
 <template>
     <div class="edit-popup">
-        <popup
+        <popup ref="popupRef" :title="popupTitle" :async="true" width="550px" @confirm="handleSubmit"
-            ref="popupRef"
+            @close="handleClose">
-            :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="avatar">
-                    <div>
+                    <material-picker v-model="formData.avatar" :limit="1" />
-                        <div>
-                            <material-picker v-model="formData.avatar" :limit="1" />
-                        </div>
-                        <div class="form-tips">建议尺寸：100*100px，支持jpg，jpeg，png格式</div>
-                    </div>
                 </el-form-item>
                 <el-form-item label="用户昵称" prop="nickname">
                     <el-input v-model="formData.nickname" clearable placeholder="请输入用户昵称" />
@@ -28,31 +17,23 @@
                 </el-form-item>
                 <el-form-item label="茶艺师等级" prop="level">
                     <el-select class="flex-1" v-model="formData.level" clearable placeholder="请选择茶艺师等级">
-                        <el-option 
+                        <el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
-                            v-for="(item, index) in dictData.level"
+                            :value="parseInt(item.value)" />
-                            :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-form-item label="服务单价" prop="price">
                     <el-input v-model="formData.price" clearable placeholder="请输入茶艺服务单价" />
                 </el-form-item>
-                <el-form-item label="车马费/每公里" prop="mileage_price">
+                <el-form-item label="车马费" prop="mileage_price">
                     <el-input v-model="formData.mileage_price" clearable placeholder="请输入车马费/每公里" />
                 </el-form-item>
-                <el-form-item label="是否免费出行0免费" prop="is_mileage">
+                <el-form-item label="是否免费出行" prop="is_mileage">
-                    <el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择是否免费出行0免费">
+                    <el-select class="flex-1" v-model="formData.is_mileage" clearable placeholder="请选择">
-                        <el-option 
+                        <el-option label="免费" value="0"></el-option>
-                            v-for="(item, index) in dictData.is_mileage"
+                        <el-option label="收费" value="1"></el-option>
-                            :key="index" 
-                            :label="item.name"
-                            :value="parseInt(item.value)"
-                        />
                     </el-select>
                 </el-form-item>
                 <el-form-item label="服务次数" prop="sold">
@@ -60,38 +41,38 @@
                 </el-form-item>
                 <el-form-item label="服务方式" prop="server_type">
                     <el-select class="flex-1" v-model="formData.server_type" clearable placeholder="请选择服务方式">
-                        <el-option label="全部" :value="3"></el-option>
+                        <el-option v-for="(item, index) in dictData.server_type" :key="index" :label="item.name"
-                        <el-option 
+                            :value="parseInt(item.value)" />
-                            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-form-item label="服务区域" prop="address_id">
-                    <el-input v-model="formData.address_id" clearable placeholder="请输入地址位置" />
+                    <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-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="是否禁用: [0=否, 1=是]" prop="disable">
+                <el-form-item label="地址" prop="longitude">
-                    <el-input v-model="formData.disable" clearable placeholder="请输入是否禁用: [0=否, 1=是]" />
+                    <el-input v-model="formData.address" clearable placeholder="请输入经度" />
                 </el-form-item>
-                <el-form-item label="不可提现金额" prop="no_reflect_amount">
+                <el-form-item label="经度" prop="longitude">
-                    <el-input v-model="formData.no_reflect_amount" clearable placeholder="请输入不可提现金额" />
+                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度" />
                 </el-form-item>
-                <el-form-item label="累计额度" prop="total_amount">
+                <el-form-item label="纬度" prop="latitude">
-                    <el-input v-model="formData.total_amount" clearable placeholder="请输入累计额度" />
+                    <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" />
-                </el-form-item>
-                <el-form-item label="累计提现" prop="total_reflect_amount">
-                    <el-input v-model="formData.total_reflect_amount" clearable placeholder="请输入累计提现" />
                 </el-form-item>
                 <el-form-item label="状态" prop="state">
-                    <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择状态">
+                    <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择">
-                        <el-option 
+                        <el-option label="可约" :value="0"></el-option>
-                            v-for="(item, index) in dictData.state"
+                        <el-option label="不可约" :value="1"></el-option>
-                            :key="index" 
+                    </el-select>
-                            :label="item.name"
+                </el-form-item>
-                            :value="parseInt(item.value)"
+                <el-form-item label="是否禁用" prop="is_disable">
-                        />
+                    <el-select class="flex-1" v-model="formData.is_disable" clearable placeholder="请选择">
+                        <el-option label="否" :value="0"></el-option>
+                        <el-option label="是" :value="1"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -100,11 +81,14 @@
 </template>
 
 <script lang="ts" setup name="teamasterUserEdit">
-import type { FormInstance } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
 import { apiTeamasterUserAdd, apiTeamasterUserEdit, apiTeamasterUserDetail } from '@/api/teamaster_user'
-import { timeFormat } from '@/utils/util'
+import { timeFormat, removeImageUrlPrefix, normalizeImageUrl } from '@/utils/util'
 import type { PropType } from 'vue'
+import { apiTeaStoreCityLists } from '@/api/tea_store'
+import type { FormInstance } from 'element-plus'
+
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -119,7 +103,7 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑用户表' : '新增用户表'
+    return mode.value == 'edit' ? '编辑茶艺师' : '新增茶艺师'
 })
 
 // 表单数据
@@ -136,14 +120,28 @@ const formData = reactive({
     is_mileage: '',
     sold: '',
     server_type: '',
-    address_id: '',
+    address_id: 0,
-    disable: '',
+    city_id: '',
-    no_reflect_amount: '',
+    address: '',
-    total_amount: '',
+    longitude: '',
-    total_reflect_amount: '',
+    latitude: '',
+    is_disable: '',
     state: '',
 })
 
+// 城市列表
+const cityList = ref<any[]>([])
+
+onMounted(async () => {
+    try {
+        const res = await apiTeaStoreCityLists()
+        cityList.value = res || []
+    } catch (e) {
+        cityList.value = []
+    }
+})
+
+
 
 // 表单验证
 const formRules = reactive<any>({
@@ -159,8 +157,9 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-    
+
-    
+    //@ts-ignore
+    // formData.avatar = normalizeImageUrl(formData.avatar)
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -171,32 +170,14 @@ const getDetail = async (row: Record<string, any>) => {
 }
 
 
-// 将完整URL转换为相对路径
-const getRelativePath = (url: string) => {
-    if (!url) return url
-    // 如果是完整URL，提取相对路径
-    if (url.startsWith('http://') || url.startsWith('https://')) {
-        try {
-            const urlObj = new URL(url)
-            return urlObj.pathname
-        } catch {
-            // 如果URL解析失败，尝试手动提取
-            const match = url.match(/https?:\/\/[^\/]+(\/.*)/)
-            return match ? match[1] : url
-        }
-    }
-    return url
-}
-
 // 提交按钮
 const handleSubmit = async () => {
     await formRef.value?.validate()
-    const data = { 
+    let data = { ...formData, }
-        ...formData,
+    data.avatar = removeImageUrlPrefix(data.avatar)
-        avatar: getRelativePath(formData.avatar)
+
-    }
+    mode.value == 'edit'
-    mode.value == 'edit' 
+        ? await apiTeamasterUserEdit(data)
-        ? await apiTeamasterUserEdit(data) 
         : await apiTeamasterUserAdd(data)
     popupRef.value?.close()
     emit('success')

src/views/teamaster_user/index.vue

@@ -1,72 +1,48 @@
 <template>
     <div>
         <el-card class="!border-none mb-4" shadow="never">
-            <el-form
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
-                class="mb-[-16px]"
-                :model="queryParams"
-                inline
-            >
                 <el-form-item label="用户昵称" prop="nickname">
                     <el-input class="w-[280px]" v-model="queryParams.nickname" clearable placeholder="请输入用户昵称" />
                 </el-form-item>
                 <el-form-item label="用户电话" prop="mobile">
                     <el-input class="w-[280px]" v-model="queryParams.mobile" clearable placeholder="请输入用户电话" />
                 </el-form-item>
-                <el-form-item label="茶艺师等级" prop="level">
+                <el-form-item class="w-[280px]" label="茶艺师等级" prop="level">
-                    <el-select class="w-[280px]" v-model="queryParams.level" clearable placeholder="请选择茶艺师等级">
+                    <el-select v-model="queryParams.level" clearable placeholder="请选择茶艺师等级">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
+                        <el-option v-for="(item, index) in dictData.level" :key="index" :label="item.name"
-                            v-for="(item, index) in dictData.level"
+                            :value="item.value" />
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="是否免费出行0免费" prop="is_mileage">
+                <el-form-item class="w-[280px]" label="是否免费出行" prop="is_mileage">
-                    <el-select class="w-[280px]" v-model="queryParams.is_mileage" clearable placeholder="请选择是否免费出行0免费">
+                    <el-select v-model="queryParams.is_mileage" clearable placeholder="请选择">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
+                        <el-option label="免费" value="0"></el-option>
-                            v-for="(item, index) in dictData.is_mileage"
+                        <el-option label="收费" value="1"></el-option>
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="服务方式" prop="server_type">
+                <el-form-item class="w-[280px]" label="服务方式" prop="server_type">
-                    <el-select class="w-[280px]" v-model="queryParams.server_type" clearable placeholder="请选择服务方式">
+                    <el-select v-model="queryParams.server_type" clearable placeholder="请选择">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
+                        <el-option label="上门服务" value="0"></el-option>
-                            v-for="(item, index) in dictData.server_type"
+                        <el-option label="到店服务" value="1"></el-option>
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="是否禁用：0-否；1-是；" prop="disable">
+                <el-form-item class="w-[280px]" label="是否禁用" prop="disable">
-                    <el-select class="w-[280px]" v-model="queryParams.disable" clearable placeholder="请选择是否禁用：0-否；1-是；">
+                    <el-select v-model="queryParams.disable" clearable placeholder="请选择">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
+                        <el-option label="否" value="0"></el-option>
-                            v-for="(item, index) in dictData.disable"
+                        <el-option label="是" value="1"></el-option>
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
                     </el-select>
                 </el-form-item>
-                <el-form-item label="状态" prop="state">
+                <!-- <el-form-item label="状态" prop="state">
                     <el-select class="w-[280px]" v-model="queryParams.state" clearable placeholder="请选择状态">
                         <el-option label="全部" value=""></el-option>
-                        <el-option 
+                        <el-option v-for="(item, index) in dictData.state" :key="index" :label="item.name"
-                            v-for="(item, index) in dictData.state"
+                            :value="item.value" />
-                            :key="index" 
-                            :label="item.name"
-                            :value="item.value"
-                        />
                     </el-select>
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
@@ -74,32 +50,23 @@
             </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>
-            <!-- <el-button
+            <el-button v-perms="['teamaster_user/delete']" :disabled="!selectData.length"
-                v-perms="['teamaster_user/delete']"
+                @click="handleDelete(selectData)">
-                :disabled="!selectData.length"
-                @click="handleDelete(selectData)"
-            >
                 删除
-            </el-button> -->
+            </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" ><template #default="{ row }">
+                    <el-table-column label="头像" prop="avatar" show-overflow-tooltip>
-                        <el-image
+                        <template #default="{ row }">
-                            v-if="row.avatar"
+                            <el-image style="width:50px;height:50px;" :src="row.avatar" />
-                            style="width: 60px; height: 60px"
+                        </template>
-                            :src="row.avatar"
-                            :preview-src-list="[row.avatar]"
-                            fit="cover"
-                        />
-                        <span v-else class="text-gray-400">无图片</span>
-                    </template>
                     </el-table-column>
                     <el-table-column label="用户昵称" prop="nickname" show-overflow-tooltip />
                     <el-table-column label="用户账号" prop="account" show-overflow-tooltip />
@@ -112,11 +79,11 @@
                     <el-table-column label="星级" prop="star" show-overflow-tooltip />
                     <el-table-column label="茶艺服务单价" prop="price" show-overflow-tooltip />
                     <el-table-column label="车马费/每公里" prop="mileage_price" show-overflow-tooltip />
-                    <el-table-column label="是否免费出行0免费" prop="is_mileage">
+                    <!-- <el-table-column label="是否免费出行0免费" prop="is_mileage">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.is_mileage" :value="row.is_mileage" />
+                            <dict-value :options="dictData." :value="row.is_mileage" />
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <el-table-column label="服务次数" prop="sold" show-overflow-tooltip />
                     <el-table-column label="服务方式" prop="server_type">
                         <template #default="{ row }">
@@ -124,13 +91,13 @@
                         </template>
                     </el-table-column>
                     <el-table-column label="地址位置" prop="address_id" show-overflow-tooltip />
-                    <el-table-column label="是否禁用: [0=否, 1=是]" prop="is_disable" show-overflow-tooltip />
                     <el-table-column label="不可提现金额" prop="no_reflect_amount" show-overflow-tooltip />
                     <el-table-column label="累计额度" prop="total_amount" show-overflow-tooltip />
                     <el-table-column label="累计提现" prop="total_reflect_amount" show-overflow-tooltip />
-                    <el-table-column label="是否禁用：0-否；1-是；" prop="disable">
+                    <el-table-column label="是否禁用" prop="disable">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.disable" :value="row.disable" />
+                            <span v-if="row.disable == 0">否</span>
+                            <span v-if="row.disable == 1">是</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="状态" prop="state">
@@ -140,22 +107,13 @@
                     </el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                             <el-button
+                            <el-button v-perms="['teamaster_user/edit']" type="primary" link @click="handleEdit(row)">
-                                v-perms="['teamaster_user/edit']"
-                                type="primary"
-                                link
-                                @click="handleEdit(row)"
-                            >
                                 编辑
                             </el-button>
-                            <!-- <el-button
+                            <el-button v-perms="['teamaster_user/delete']" type="danger" link
-                                v-perms="['teamaster_user/delete']"
+                                @click="handleDelete(row.id)">
-                                type="danger"
-                                link
-                                @click="handleDelete(row.id)"
-                            >
                                 删除
-                            </el-button> -->
+                            </el-button>
                         </template>
                     </el-table-column>
                 </el-table>
@@ -201,7 +159,7 @@ const handleSelectionChange = (val: any[]) => {
 }
 
 // 获取字典数据
-const { dictData } = useDictData('level,is_mileage,server_type,disable,state')
+const { dictData } = useDictData('level,server_type,state')
 
 // 分页相关
 const { pager, getLists, resetParams, resetPage } = usePaging({
@@ -233,4 +191,3 @@ const handleDelete = async (id: number | any[]) => {
 
 getLists()
 </script>
-

vite.config.ts

@@ -40,6 +40,7 @@ export default defineConfig({
     base: '/admin/',
     server: {
         host: '0.0.0.0',
+        port: 5174, // 修改端口号，如有需要可调整
         hmr: true,
         open: true,
         proxy: {