完善功能

src/api/broker.ts

@@ -2,25 +2,25 @@ import request from '@/utils/request'
 
 // 茶艺师经纪人表列表
 export function apiBrokerLists(params: any) {
-    return request.get({ url: '/broker/lists', params })
+    return request.get({ url: '/brokerAdmin/lists', params })
 }
 
 // 添加茶艺师经纪人表
 export function apiBrokerAdd(params: any) {
-    return request.post({ url: '/broker/add', params })
+    return request.post({ url: '/brokerAdmin/add', params })
 }
 
 // 编辑茶艺师经纪人表
 export function apiBrokerEdit(params: any) {
-    return request.post({ url: '/broker/edit', params })
+    return request.post({ url: '/brokerAdmin/edit', params })
 }
 
 // 删除茶艺师经纪人表
 export function apiBrokerDelete(params: any) {
-    return request.post({ url: '/broker/delete', params })
+    return request.post({ url: '/brokerAdmin/delete', params })
 }
 
 // 茶艺师经纪人表详情
 export function apiBrokerDetail(params: any) {
-    return request.get({ url: '/broker/detail', params })
+    return request.get({ url: '/brokerAdmin/detail', params })
 }

src/views/tea_store/edit.vue

@@ -166,7 +166,7 @@ onMounted(async () => {
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑门店表' : '新增门店表'
+    return mode.value == 'edit' ? '编辑门店' : '新增门店'
 })
 
 // 表单数据

src/views/teamaster_real/edit.vue

@@ -50,12 +50,12 @@
                         :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.certificate[1]]" show-progress
                         :initial-index="4" fit="cover" />
                 </el-form-item>
-                <el-form-item label="营业执照" prop="license_img">
+                <!-- <el-form-item label="营业执照" prop="license_img">
                     <el-image style="width: 100px; height: 100px" :src="formData.license_img" :zoom-rate="1.2"
                         :max-scale="7" :min-scale="0.2" :preview-src-list="[formData.license_img]" show-progress
                         :initial-index="4" fit="cover" />
-                    <!-- <material-picker v-model="formData.license_img" /> -->
+                    <material-picker v-model="formData.license_img" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="兴趣爱好" prop="hobby_introduce">
                     <editor class="flex-1" v-model="formData.hobby_introduce" :height="500" />
 
@@ -93,7 +93,7 @@ const mode = ref('add')
 
 // 弹窗标题
 const popupTitle = computed(() => {
-    return mode.value == 'edit' ? '编辑茶艺师审核表' : '新增茶艺师审核表'
+    return mode.value == 'edit' ? '审核茶艺师' : '新增茶艺师审核'
 })
 
 // 表单数据
@@ -220,8 +220,6 @@ const handleClose = () => {
     emit('close')
 }
 
-
-
 defineExpose({
     open,
     setFormData,

src/views/teamaster_real/index.vue

@@ -2,9 +2,6 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form 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="username">
                     <el-input class="w-[280px]" v-model="queryParams.username" clearable placeholder="请输入姓名" />
                 </el-form-item>
@@ -115,7 +112,9 @@ import { apiTeamasterRealLists, apiTeamasterRealDelete } from '@/api/teamaster_r
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import useUserStore from '@/stores/modules/user'
 
+const userStore = useUserStore()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
@@ -126,7 +125,8 @@ const queryParams = reactive({
     nickname: '',
     username: '',
     mobile: '',
-    gender: ''
+    gender: '',
+    city_id: userStore.userInfo.city_id,
 })
 
 // 选中数据

src/views/teamaster_user/broker/edit.vue

@@ -6,16 +6,19 @@
                 <el-form-item label="名称" prop="name" required>
                     <el-input v-model="formData.name" clearable placeholder="请输入名称" />
                 </el-form-item>
-                <el-form-item label="账号" prop="account" required>
+                <el-form-item label="用户头像" prop="avatar">
+                    <material-picker v-model="formData.avatar" :limit="1" />
+                </el-form-item>
+                <el-form-item label="账号" prop="account">
                     <el-input v-model="formData.account" clearable placeholder="请输入账号" />
                 </el-form-item>
-                <el-form-item label="手机号码" prop="mobile" required>
+                <el-form-item label="密码" prop="password">
-                    <el-input v-model="formData.mobile" clearable placeholder="请输入手机号码" />
+                    <el-input v-model="formData.password" clearable placeholder="请输入密码" />
                 </el-form-item>
-                <el-form-item label="状态" prop="status">
+                <el-form-item label="状态" prop="disable">
-                    <el-select v-model="formData.status" clearable placeholder="请选择">
+                    <el-select v-model="formData.disable" clearable placeholder="请选择">
-                        <el-option label="启用" :value="1"></el-option>
+                        <el-option label="启用" :value="0"></el-option>
-                        <el-option label="禁用" :value="0"></el-option>
+                        <el-option label="禁用" :value="1"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -29,6 +32,10 @@ import Popup from '@/components/popup/index.vue'
 import { apiBrokerAdd, apiBrokerEdit, apiBrokerDetail } from '@/api/broker'
 import { timeFormat } from '@/utils/util'
 import type { PropType } from 'vue'
+import useUserStore from '@/stores/modules/user'
+
+const userStore = useUserStore()
+
 defineProps({
     dictData: {
         type: Object as PropType<Record<string, any[]>>,
@@ -50,26 +57,36 @@ const popupTitle = computed(() => {
 const formData = reactive({
     id: '',
     name: '',
+    avatar: '',
     account: '',
-    mobile: '',
+    password: '',
-    status: ''
+    disable: 0,
+    city_id: '',
 })
 
 
 // 表单验证
 const formRules = reactive<any>({
-    name: [
+    name: [{
-        { required: true, message: '请输入名称', trigger: 'blur' }
+        required: true,
-    ],
+        message: '请输入名称',
-    account: [
+        trigger: ['blur']
-        { required: true, message: '请输入账号', trigger: 'blur' }
+    }],
-    ],
+    avatar: [{
-    mobile: [
+        required: true,
-        { required: true, message: '请输入手机号码', trigger: 'blur' }
+        message: '请选择头像',
-    ],
+        trigger: ['blur']
-    status: [
+    }],
-        { required: true, message: '请选择状态', trigger: 'blur' }
+    account: [{
-    ]
+        required: true,
+        message: '请输入账号',
+        trigger: ['blur']
+    }],
+    password: [{
+        required: true,
+        message: '请输入密码',
+        trigger: ['blur']
+    }]
 })
 
 
@@ -81,8 +98,6 @@ const setFormData = async (data: Record<any, any>) => {
             formData[key] = data[key]
         }
     }
-
-
 }
 
 const getDetail = async (row: Record<string, any>) => {
@@ -97,6 +112,8 @@ const getDetail = async (row: Record<string, any>) => {
 const handleSubmit = async () => {
     await formRef.value?.validate()
     const data = { ...formData, }
+    data.city_id = userStore.userInfo.city_id
+
     mode.value == 'edit'
         ? await apiBrokerEdit(data)
         : await apiBrokerAdd(data)

src/views/teamaster_user/broker/index.vue

@@ -8,11 +8,8 @@
                 <el-form-item label="账号" prop="account">
                     <el-input class="w-[280px]" v-model="queryParams.account" clearable placeholder="请输入账号" />
                 </el-form-item>
-                <el-form-item label="手机号码" prop="mobile">
+                <el-form-item label="状态" prop="disable">
-                    <el-input class="w-[280px]" v-model="queryParams.mobile" clearable placeholder="请输入手机号码" />
+                    <el-input class="w-[280px]" v-model="queryParams.disable" clearable placeholder="请输入状态" />
-                </el-form-item>
-                <el-form-item label="状态" prop="status">
-                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
                 </el-form-item>
                 <el-form-item>
                     <el-button type="primary" @click="resetPage">查询</el-button>
@@ -35,18 +32,16 @@
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="名称" prop="name" show-overflow-tooltip />
                     <el-table-column label="账号" prop="account" show-overflow-tooltip />
-                    <el-table-column label="手机号码" prop="mobile" show-overflow-tooltip />
                     <el-table-column label="二维码" prop="image" show-overflow-tooltip>
                         <template #default="{ row }">
                             <el-image v-if="row.url" style="width:50px;height:50px;" :src="row.url"
                                 :preview-src-list="[row.url]" preview-teleported />
                         </template>
                     </el-table-column>
-                    <!-- <el-table-column label="创建时间" prop="dtime" show-overflow-tooltip /> -->
+                    <el-table-column label="状态" prop="disable" show-overflow-tooltip>
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip>
                         <template #default="{ row }">
-                            <span v-if="row.status == 0">禁用</span>
+                            <span v-if="row.disable == 0">启用</span>
-                            <span v-if="row.status == 1">启用</span>
+                            <span v-if="row.disable == 1">禁用</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
@@ -87,7 +82,7 @@ const queryParams = reactive({
     name: '',
     account: '',
     mobile: '',
-    status: ''
+    disable: ''
 })
 
 // 选中数据

src/views/teamaster_user/index.vue

@@ -131,7 +131,9 @@ import { apiTeamasterUserLists, apiTeamasterUserDelete } from '@/api/teamaster_u
 import { timeFormat } from '@/utils/util'
 import feedback from '@/utils/feedback'
 import EditPopup from './edit.vue'
+import useUserStore from '@/stores/modules/user'
 
+const userStore = useUserStore()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
 const showEdit = ref(false)
@@ -146,7 +148,8 @@ const queryParams = reactive({
     is_mileage: '',
     server_type: '',
     disable: '',
-    state: ''
+    state: '',
+    city_id: userStore.userInfo.city_id,
 })
 
 // 选中数据

vite.config.ts

@@ -44,7 +44,7 @@ export default defineConfig({
         hmr: true,
         open: true,
         proxy: {
-            '/partenapi': {
+            '/partenapi/': {
                 target: 'https://test1.stnav.com',
                 changeOrigin: true,
                 secure: true,