完善功能

src/api/consumer.ts

@@ -19,3 +19,8 @@ export function userEdit(params: any) {
 export function adjustMoney(params: any) {
     return request.post({ url: '/user.user/adjustMoney', params })
 }
+
+// 用户门店余额列表
+export function storeMoneyList(params: any) {
+    return request.post({ url: '/user.user/storeMoneyList', params })
+}

src/api/tea_store_city.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 开通城市表列表
+export function apiTeaStoreCityLists(params: any) {
+    return request.get({ url: '/tea_store_city/lists', params })
+}
+
+// 添加开通城市表
+export function apiTeaStoreCityAdd(params: any) {
+    return request.post({ url: '/tea_store_city/add', params })
+}
+
+// 编辑开通城市表
+export function apiTeaStoreCityEdit(params: any) {
+    return request.post({ url: '/tea_store_city/edit', params })
+}
+
+// 删除开通城市表
+export function apiTeaStoreCityDelete(params: any) {
+    return request.post({ url: '/tea_store_city/delete', params })
+}
+
+// 开通城市表详情
+export function apiTeaStoreCityDetail(params: any) {
+    return request.get({ url: '/tea_store_city/detail', params })
+}

src/config/index.ts

@@ -6,6 +6,7 @@ const config = {
     baseUrl: import.meta.env.DEV
         ? '/'
         : `${import.meta.env.VITE_APP_BASE_URL || 'https://test1.stnav.com'}/`, //请求接口域名
+    // : `${import.meta.env.VITE_APP_BASE_URL || 'https://76458.com'}/`, //请求接口域名
     urlPrefix: 'adminapi', //请求默认前缀
     timeout: 10 * 1000 //请求超时时长
 }

src/views/consumer/lists/index.vue

@@ -42,7 +42,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="注册时间" prop="create_time" min-width="120" />
-                <el-table-column label="操作" width="120" fixed="right">
+                <el-table-column label="操作" width="180" fixed="right">
                     <template #default="{ row }">
                         <el-button v-perms="['user.user/detail']" type="primary" link>
                             <router-link :to="{
@@ -54,6 +54,17 @@
                                 详情
                             </router-link>
                         </el-button>
+
+                        <el-button v-perms="['user.user/store_balance']" type="primary" link>
+                            <router-link :to="{
+                                path: getRoutePath('user.user/store_balance'),
+                                query: {
+                                    id: row.id
+                                }
+                            }">
+                                门店余额
+                            </router-link>
+                        </el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -80,9 +91,6 @@ const { pager, getLists, resetPage, resetParams } = usePaging({
     fetchFun: getUserList,
     params: queryParams
 })
-onActivated(() => {
-    getLists()
-})
 
 getLists()
 </script>

src/views/consumer/lists/store_balance.vue

@@ -0,0 +1,35 @@
+<template>
+    <div>
+        <el-card class="!border-none mt-4" shadow="never">
+            <el-table size="large" :data="lists">
+                <el-table-column label="门店名称" prop="name" min-width="100" />
+                <el-table-column label="门店余额" prop="money" min-width="100" />
+            </el-table>
+        </el-card>
+    </div>
+</template>
+<script lang="ts" setup name="consumerLists">
+import { storeMoneyList } from '@/api/consumer'
+import { ClientMap } from '@/enums/appEnums'
+import { usePaging } from '@/hooks/usePaging'
+import { getRoutePath } from '@/router'
+
+const route = useRoute()
+const queryParams = reactive({
+    id: ''
+})
+
+const lists = ref([])
+
+const getLists = async () => {
+    const res = await storeMoneyList(queryParams)
+    lists.value = res
+}
+
+onActivated(() => {
+    if (route.query.id) {
+        queryParams.id = route.query.id as string
+        getLists()
+    }
+})
+</script>

src/views/parten_admin/edit.vue

@@ -16,7 +16,8 @@
                     <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-input v-model="formData.password" clearable
+                        :placeholder="mode === 'add' ? '请输入密码' : '不修改密码请留空'" />
                 </el-form-item>
                 <el-form-item label="公司名称" prop="company_name">
                     <el-input v-model="formData.company_name" clearable placeholder="请输入公司名称" />
@@ -109,7 +110,7 @@ const formData = reactive({
 
 
 // 表单验证
-const formRules = reactive<any>({
+const formRules = computed<any>(() => ({
     name: [{
         required: true,
         message: '请输入名称',
@@ -126,7 +127,7 @@ const formRules = reactive<any>({
         trigger: ['blur']
     }],
     password: [{
-        required: true,
+        required: mode.value === 'add',
         message: '请输入密码',
         trigger: ['blur']
     }],
@@ -155,7 +156,7 @@ const formRules = reactive<any>({
         message: '请选择所属城市',
         trigger: ['blur']
     }]
-})
+}))
 
 
 // 获取详情
@@ -187,6 +188,9 @@ const getDetail = async (row: Record<string, any>) => {
 const handleSubmit = async () => {
     await formRef.value?.validate()
     const data = { ...formData }
+    if (mode.value == 'edit' && !data.password) {
+        delete data.password
+    }
     mode.value == 'edit'
         ? await apiPartenAdminEdit(data)
         : await apiPartenAdminAdd(data)

src/views/tea_store_city/edit.vue

@@ -0,0 +1,122 @@
+<template>
+    <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-item>
+                <el-form-item label="城市编码" prop="city_id">
+                    <el-input v-model="formData.city_id" clearable placeholder="请输入城市编码" />
+                </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="status">
+                    <el-select v-model="formData.status" placeholder="">
+                        <el-option label="启用" :value="1"></el-option>
+                        <el-option label="禁用" :value="0"></el-option>
+                    </el-select>
+                </el-form-item> -->
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="teaStoreCityEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiTeaStoreCityAdd, apiTeaStoreCityEdit, apiTeaStoreCityDetail } from '@/api/tea_store_city'
+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 == 'edit' ? '编辑城市' : '新增城市'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    name: '',
+    city_id: '',
+    longitude: '',
+    latitude: '',
+    status: 1,
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+    city_id: [{ required: true, message: '请输入城市编码', trigger: 'blur' }],
+    longitude: [{ required: true, message: '请输入经度', trigger: 'blur' }],
+    latitude: [{ required: true, message: '请输入纬度', trigger: 'blur' }],
+    status: [{ required: true, message: '请输入状态', trigger: 'blur' }]
+})
+
+
+// 获取详情
+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 apiTeaStoreCityDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiTeaStoreCityEdit(data)
+        : await apiTeaStoreCityAdd(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>

src/views/tea_store_city/index.vue

@@ -0,0 +1,113 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" 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="['tea_store_city/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['tea_store_city/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="id" show-overflow-tooltip />
+                    <el-table-column label="名称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="城市编码" prop="city_id" show-overflow-tooltip />
+                    <el-table-column label="经度" prop="longitude" show-overflow-tooltip />
+                    <el-table-column label="纬度" prop="latitude" show-overflow-tooltip />
+                    <!-- <el-table-column label="状态" prop="status" show-overflow-tooltip /> -->
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['tea_store_city/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['tea_store_city/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="teaStoreCityLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiTeaStoreCityLists, apiTeaStoreCityDelete } from '@/api/tea_store_city'
+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({
+    name: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiTeaStoreCityLists,
+    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 apiTeaStoreCityDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>

src/views/teamaster_package/teamaster_group/edit.vue

@@ -7,7 +7,7 @@
                     <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-option label="云华" :value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="套餐名称" prop="title">

src/views/teamaster_package/teamaster_group/index.vue

@@ -7,7 +7,7 @@
                         <el-option label="全部" value=""></el-option>
                         <el-option label="清风" value="1"></el-option>
                         <el-option label="明月" value="2"></el-option>
-                        <el-option label="鹤鸣" value="3"></el-option>
+                        <el-option label="云华" value="3"></el-option>
                     </el-select>
                 </el-form-item>
                 <el-form-item label="套餐名称" prop="title">
@@ -37,7 +37,7 @@
                         <template #default="{ row }">
                             <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>
+                            <el-tag type="danger" v-if="row.type == 3">云华</el-tag>
                         </template>
                     </el-table-column>
                     <el-table-column label="套餐名称" prop="title" show-overflow-tooltip />

src/views/teamaster_real/edit.vue

@@ -37,7 +37,6 @@
                     <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"
@@ -52,10 +51,23 @@
                     <div v-else>未上传</div>
                 </el-form-item>
                 <el-form-item label="个人展示" prop="avatar">
-                    <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" />
+                    <el-image v-if="formData.image.length > 0" v-for="(item, index) in formData.image" :key="index"
+                        style="width: 100px; height: 100px" :src="item" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                        :preview-src-list="formData.image" show-progress :initial-index="4" fit="cover" />
+                    <div v-else>未上传</div>
+                </el-form-item>
+
+                <el-form-item label="身份证正面" prop="front_card">
+                    <el-image v-if="formData.front_card.length > 0" style="width: 100px; height: 100px"
+                        :src="formData.front_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                        :preview-src-list="[formData.front_card]" show-progress :initial-index="4" fit="cover" />
+                    <div v-else>未上传</div>
+                </el-form-item>
+
+                <el-form-item label="身份证反面" prop="back_card">
+                    <el-image v-if="formData.back_card.length > 0" style="width: 100px; height: 100px"
+                        :src="formData.back_card" :zoom-rate="1.2" :max-scale="7" :min-scale="0.2"
+                        :preview-src-list="[formData.back_card]" show-progress :initial-index="4" fit="cover" />
                     <div v-else>未上传</div>
                 </el-form-item>
 
@@ -114,10 +126,13 @@ const formData = reactive({
     avatar: '',
     health_certificate: '',
     information: [],
+    image: [],
     license_img: '',
     hobby_introduce: '',
     status: '',
-    label_id: ''
+    label_id: '',
+    front_card: '',
+    back_card: '',
 })
 
 
@@ -195,10 +210,6 @@ const handleSubmit = async () => {
     let data = { ...formData, gender: formData.gender.join(",") }
     data.avatar = removeImageUrlPrefix(data.avatar)
 
-    if (data.license_img) {
-        data.license_img = removeImageUrlPrefix(data.license_img)
-    }
-
     mode.value == 'edit'
         ? await apiTeamasterRealEdit(data)
         : await apiTeamasterRealAdd(data)

src/views/teamaster_user/edit.vue

@@ -7,17 +7,23 @@
                     <material-picker v-model="formData.avatar" :limit="1" />
                 </el-form-item>
                 <el-form-item label="本人照片" prop="image">
-                    <material-picker v-model="formData.image" :limit="1" />
+                    <material-picker v-model="formData.image" :limit="9" />
                 </el-form-item>
                 <el-form-item label="茶艺师资格证书" prop="license_img">
                     <material-picker v-model="formData.license_img" :limit="1" />
                 </el-form-item>
-                <el-form-item label="个人展示" prop="information">
+                <!-- <el-form-item label="个人展示" prop="information">
                     <material-picker v-model="formData.information" :limit="9" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="健康证" prop="health_certificate">
                     <material-picker v-model="formData.health_certificate" :limit="1" />
                 </el-form-item>
+                <el-form-item label="身份证正面" prop="front_card">
+                    <material-picker v-model="formData.front_card" :limit="1" />
+                </el-form-item>
+                <el-form-item label="身份证反面" prop="back_card">
+                    <material-picker v-model="formData.back_card" :limit="1" />
+                </el-form-item>
                 <el-form-item label="专属圈子" prop="label_id">
                     <el-select v-model="formData.label_id" multiple placeholder="请选择" style="width: 240px">
                         <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
@@ -46,7 +52,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="用户账号" prop="account">
-                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号" />
+                    <el-input v-model="formData.account" clearable placeholder="请输入用户账号，需填手机号" />
                 </el-form-item>
                 <el-form-item label="用户电话" prop="mobile">
                     <el-input v-model="formData.mobile" clearable placeholder="请输入用户电话" />
@@ -95,14 +101,17 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="地址" prop="longitude">
-                    <el-input v-model="formData.address" clearable placeholder="请输入地址" />
+                    <el-input v-model="formData.address" clearable placeholder="请输入地址"
+                        :disabled="mode == 'edit' ? true : false" />
                 </el-form-item>
                 <el-form-item label="经度" prop="longitude">
-                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度" />
+                    <el-input v-model="formData.longitude" clearable placeholder="请输入经度"
+                        :disabled="mode == 'edit' ? true : false" />
                 </el-form-item>
                 <el-form-item label="纬度" prop="latitude">
                     <div class="flex items-center w-full">
-                        <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" class="flex-1 min-w-0" />
+                        <el-input v-model="formData.latitude" clearable placeholder="请输入纬度" class="flex-1 min-w-0"
+                            :disabled="mode == 'edit' ? true : false" />
                         <a href="http://jingweidu.757dy.com/" target="open" class="ml-2 flex items-center">
                             <el-icon>
                                 <Location />
@@ -201,6 +210,8 @@ const formData = reactive({
     health_certificate: '',
     label_id: '',
     broker_user_id: '',
+    front_card: '',
+    back_card: '',
 })
 
 // 城市列表
@@ -215,12 +226,8 @@ onMounted(async () => {
     }
 })
 
-
-
 // 表单验证
-const formRules = reactive<any>({
-
-})
+const formRules = reactive<any>({})
 
 
 // 获取详情
@@ -261,13 +268,22 @@ const handleSubmit = async () => {
     let data = { ...formData, }
     data.avatar = removeImageUrlPrefix(data.avatar)
     data.image = removeImageUrlPrefix(data.image)
+    data.image = Array.isArray(data.image) ? data.image.join(',') : ''
     data.license_img = removeImageUrlPrefix(data.license_img)
     data.information = removeImageUrlPrefix(data.information)
     data.information = Array.isArray(data.information) ? data.information.join(',') : ''
     data.health_certificate = removeImageUrlPrefix(data.health_certificate)
+    data.front_card = removeImageUrlPrefix(data.front_card)
+    data.back_card = removeImageUrlPrefix(data.back_card)
     data.label_id = Array.isArray(data.label_id) ? data.label_id.join(',') : ''
     // console.log("🚀 ~ handleSubmit ~ data:", data)
     // return
+
+    if (mode.value == 'edit') {
+        delete data.address
+        delete data.longitude
+        delete data.latitude
+    }
     mode.value == 'edit'
         ? await apiTeamasterUserEdit(data)
         : await apiTeamasterUserAdd(data)

src/views/teamaster_user/index.vue

@@ -46,13 +46,13 @@
                             :key="item.id"></el-option>
                     </el-select>
                 </el-form-item>
-                <!-- <el-form-item label="状态" prop="state">
-                    <el-select class="w-[280px]" v-model="queryParams.state" clearable placeholder="请选择状态">
+                <el-form-item class="w-[280px]" label="状态" prop="state">
+                    <el-select v-model="queryParams.state" clearable placeholder="请选择状态">
                         <el-option label="全部" value=""></el-option>
                         <el-option v-for="(item, index) in dictData.state" :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>
@@ -82,29 +82,67 @@
 
                     <el-table-column label="本人照片" prop="image" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <el-image v-if="row.image.length > 0" style="width:50px;height:50px;" :src="row.image[0]"
-                                :preview-src-list="[row.image[0]]" preview-teleported />
+                            <div v-if="row.image.length > 0">
+                                <el-image v-if="row.image.length > 0" style="width:50px;height:50px;"
+                                    :src="row.image[0]" :preview-src-list="[row.image[0]]" preview-teleported />
+                            </div>
+                            <div v-else>
+                                —
+                            </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="姓名" prop="nickname" show-overflow-tooltip />
-                    <el-table-column label="昵称" prop="name" show-overflow-tooltip />
+                    <el-table-column label="姓名" prop="nickname" show-overflow-tooltip width="100" />
+                    <el-table-column label="昵称" prop="name" show-overflow-tooltip width="100" />
                     <el-table-column label="茶艺师等级" prop="level">
                         <template #default="{ row }">
                             <dict-value :options="dictData.level" :value="row.level" />
                         </template>
                     </el-table-column>
-                    <el-table-column label="茶艺服务单价" prop="price" show-overflow-tooltip />
-                    <el-table-column label="车马费/每公里" prop="mileage_price" show-overflow-tooltip />
-                    <el-table-column label="服务次数" prop="sold" show-overflow-tooltip />
-                    <el-table-column label="服务方式" prop="server_type">
+                    <el-table-column label="所属城市" prop="city_name" show-overflow-tooltip />
+                    <el-table-column label="服务" prop="server_type" width="200">
                         <template #default="{ row }">
-                            <dict-value :options="dictData.server_type" :value="row.server_type" />
+                            <div class="flex flex-col gap-1.5 text-sm">
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">茶艺服务单价: </span>
+                                    <span>{{ row.price }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">车马费/公里: </span>
+                                    <span>{{ row.mileage_price }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">服务方式: </span>
+                                    <span><dict-value :options="dictData.server_type" :value="row.server_type" /></span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">服务次数: </span>
+                                    <span>{{ row.sold }}</span>
+                                </div>
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="账户" prop="user_money" width="200">
+                        <template #default="{ row }">
+                            <div class="flex flex-col gap-1.5 text-sm">
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">账户余额: </span>
+                                    <span>{{ row.user_money }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">不可提现金额: </span>
+                                    <span>{{ row.no_reflect_amount }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">累计额度: </span>
+                                    <span>{{ row.total_amount }}</span>
+                                </div>
+                                <div class="flex justify-between items-center">
+                                    <span class="text-gray-500">累计提现: </span>
+                                    <span>{{ row.total_reflect_amount }}</span>
+                                </div>
+                            </div>
                         </template>
                     </el-table-column>
-                    <el-table-column label="账户余额" prop="user_money" 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="状态" prop="state">
                         <template #default="{ row }">
                             <dict-value :options="dictData.state" :value="row.state" />

src/views/teamaster_user/teamaster_cert/edit.vue

@@ -4,10 +4,18 @@
             @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
                 <el-form-item label="健康证明" prop="fitness_img">
-                    <material-picker v-model="formData.fitness_img" :limit="1" />
+                    <div v-if="formData.fitness_img">
+                        <el-image v-if="formData.fitness_img" style="width:50px;height:50px;"
+                            :src="formData.fitness_img" :preview-src-list="[formData.fitness_img]" preview-teleported />
+                    </div>
+                    <div v-else>未上传</div>
                 </el-form-item>
                 <el-form-item label="茶艺师执照" prop="cert_img">
-                    <material-picker v-model="formData.cert_img" :limit="1" />
+                    <div v-if="formData.cert_img">
+                        <el-image style="width:50px;height:50px;" :src="formData.cert_img"
+                            :preview-src-list="[formData.cert_img]" preview-teleported />
+                    </div>
+                    <div v-else>未上传</div>
                 </el-form-item>
                 <el-form-item label="审核说明" prop="remark">
                     <el-input v-model="formData.remark" clearable placeholder="请输入审核说明" />

src/views/teamaster_user/teamaster_cert/index.vue

@@ -38,14 +38,20 @@
                     </el-table-column>
                     <el-table-column label="健康证明" prop="fitness_img">
                         <template #default="{ row }">
-                            <el-image style="width: 100px; height: 100px" :src="row.fitness_img" fit="cover"
-                                :preview-src-list="[row.fitness_img]" preview-teleported />
+                            <div v-if="row.fitness_img">
+                                <el-image v-if="row.fitness_img" style="width:50px;height:50px;" :src="row.fitness_img"
+                                    :preview-src-list="[row.fitness_img]" preview-teleported />
+                            </div>
+                            <div v-else>—</div>
                         </template>
                     </el-table-column>
                     <el-table-column label="茶艺师执照" prop="cert_img">
                         <template #default="{ row }">
-                            <el-image style="width: 100px; height: 100px" :src="row.cert_img" fit="cover"
-                                :preview-src-list="[row.cert_img]" preview-teleported />
+                            <div v-if="row.cert_img">
+                                <el-image v-if="row.cert_img" style="width:50px;height:50px;" :src="row.cert_img"
+                                    :preview-src-list="[row.cert_img]" preview-teleported />
+                            </div>
+                            <div v-else>—</div>
                         </template>
                     </el-table-column>
                     <el-table-column label="备注信息" prop="remark" show-overflow-tooltip>

src/views/teamaster_user/teamaster_group_reservation/index.vue

@@ -15,12 +15,12 @@
             </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">
+            <!-- <el-button v-perms="['teamaster_group_reservation/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
-                新增
-            </el-button>
+新增
+</el-button> -->
             <el-button v-perms="['teamaster_group_reservation/delete']" :disabled="!selectData.length"
                 @click="handleDelete(selectData)">
                 删除

src/views/withdraw/store_user_reflect/edit.vue

@@ -12,13 +12,16 @@
                 <el-form-item label="联系方式" prop="mobile">
                     <el-input v-model="formData.mobile" clearable disabled />
                 </el-form-item>
-                <el-form-item label="银行卡" prop="bank_card">
+                <el-form-item label="名称" prop="bank_user_name">
+                    <el-input v-model="formData.bank_user_name" clearable disabled />
+                </el-form-item>
+                <el-form-item label="银行卡卡号" prop="bank_card">
                     <el-input v-model="formData.bank_card" clearable disabled />
                 </el-form-item>
-                <el-form-item label="开户行" prop="bank_name">
+                <el-form-item label="银行卡名称" prop="bank_name">
                     <el-input v-model="formData.bank_name" clearable disabled />
                 </el-form-item>
-                <el-form-item label="开户行-分行" prop="bank_open_name">
+                <el-form-item label="开户行" prop="bank_open_name">
                     <el-input v-model="formData.bank_open_name" clearable disabled />
                 </el-form-item>
                 <el-form-item label="店铺名称" prop="name">
@@ -75,6 +78,7 @@ const formData = reactive({
     mobile: '',
     bank_card: '',
     bank_name: '',
+    bank_user_name: '',
     bank_open_name: '',
     name: ''
 })

src/views/withdraw/store_user_reflect/index.vue

@@ -37,8 +37,10 @@
                     <el-table-column label="店铺名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="银行卡" prop="bank_card" show-overflow-tooltip width="350">
                         <template #default="{ row }">
+                            <div>名称：{{ row.bank_user_name }}</div>
                             <div>卡号：{{ row.bank_card }}</div>
-                            <div>开户行：{{ row.bank_name }} {{ row.bank_open_name }}</div>
+                            <div>银行卡：{{ row.bank_name }}</div>
+                            <div>开户行：{{ row.bank_open_name }}</div>
                         </template>
                     </el-table-column>
                     <el-table-column label="提现金额" prop="amount" show-overflow-tooltip />

vite.config.ts

@@ -46,6 +46,7 @@ export default defineConfig({
         proxy: {
             '/adminapi': {
                 target: 'https://test1.stnav.com',
+                // target: 'https://76458.com',
                 changeOrigin: true,
                 secure: true,
                 rewrite: (path) => path