完善经纪人、茶叶管理

.env.development.example

@@ -1,4 +1,4 @@
 NODE_ENV = 'development'
 
 # Base API
-VITE_APP_BASE_URL='https://76458.com'
+VITE_APP_BASE_URL='https://test1.stnav.com'

.env.production.example

@@ -1,3 +1,3 @@
 NODE_ENV = 'production'
 # Base API
-VITE_APP_BASE_URL='https://76458.com'
+VITE_APP_BASE_URL='https://test1.stnav.com'

src/api/broker.ts

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

src/api/teamaster_leaf.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 茶叶表列表
+export function apiTeamasterLeafLists(params: any) {
+    return request.get({ url: '/teamaster_leaf/lists', params })
+}
+
+// 添加茶叶表
+export function apiTeamasterLeafAdd(params: any) {
+    return request.post({ url: '/teamaster_leaf/add', params })
+}
+
+// 编辑茶叶表
+export function apiTeamasterLeafEdit(params: any) {
+    return request.post({ url: '/teamaster_leaf/edit', params })
+}
+
+// 删除茶叶表
+export function apiTeamasterLeafDelete(params: any) {
+    return request.post({ url: '/teamaster_leaf/delete', params })
+}
+
+// 茶叶表详情
+export function apiTeamasterLeafDetail(params: any) {
+    return request.get({ url: '/teamaster_leaf/detail', params })
+}

src/config/index.ts

@@ -3,10 +3,10 @@ const config = {
     title: '后台管理系统', //网站默认标题
     version: '1.9.4', //版本号
     // 开发环境使用相对路径（通过代理），生产环境使用完整URL
-    baseUrl: import.meta.env.DEV 
+    baseUrl: import.meta.env.DEV
-        ? '/' 
+        ? '/'
-        : `${import.meta.env.VITE_APP_BASE_URL || 'https://76458.com'}/`, //请求接口域名
+        : `${import.meta.env.VITE_APP_BASE_URL || 'https://test1.stnav.com'}/`, //请求接口域名
-    urlPrefix: 'adminapi', //请求默认前缀
+    urlPrefix: 'partenapi', //请求默认前缀
     timeout: 10 * 1000 //请求超时时长
 }
 

src/utils/util.ts

@@ -27,10 +27,12 @@ export const isEmpty = (value: unknown) => {
 
 export const treeToArray = (data: any[], props = { children: 'children' }) => {
     data = cloneDeep(data)
+    // console.log("🚀 ~ treeToArray ~ data:", data)
     const { children } = props
     const newData = []
     const queue: any[] = []
     data.forEach((child: any) => queue.push(child))
+    // console.log("🚀 ~ treeToArray ~ data:", data)
     while (queue.length) {
         const item: any = queue.shift()
         if (item[children]) {

src/views/permission/menu/index.vue

@@ -10,21 +10,9 @@
                 </el-button>
                 <el-button @click="handleExpand"> 展开/折叠 </el-button>
             </div>
-            <el-table
+            <el-table ref="tableRef" class="mt-4" size="large" v-loading="pager.loading" :data="pager.lists"
-                ref="tableRef"
+                row-key="id" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-                class="mt-4"
+                <el-table-column label="菜单名称" prop="name" min-width="150" show-overflow-tooltip />
-                size="large"
-                v-loading="pager.loading"
-                :data="pager.lists"
-                row-key="id"
-                :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-            >
-                <el-table-column
-                    label="菜单名称"
-                    prop="name"
-                    min-width="150"
-                    show-overflow-tooltip
-                />
                 <el-table-column label="类型" prop="type" min-width="80">
                     <template #default="{ row }">
                         <div v-if="row.type == MenuEnum.CATALOGUE">目录</div>
@@ -39,12 +27,7 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column
+                <el-table-column label="权限标识" prop="perms" min-width="150" show-overflow-tooltip />
-                    label="权限标识"
-                    prop="perms"
-                    min-width="150"
-                    show-overflow-tooltip
-                />
                 <el-table-column label="状态" prop="is_disable" min-width="100">
                     <template #default="{ row }">
                         <el-tag v-if="row.is_disable == 0">正常</el-tag>
@@ -52,36 +35,17 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="排序" prop="sort" min-width="100" />
-                <el-table-column
+                <el-table-column label="更新时间" prop="update_time" min-width="180"></el-table-column>
-                    label="更新时间"
-                    prop="update_time"
-                    min-width="180"
-                ></el-table-column>
                 <el-table-column label="操作" width="160" fixed="right">
                     <template #default="{ row }">
-                        <el-button
+                        <el-button v-if="row.type !== MenuEnum.BUTTON" v-perms="['auth.menu/add']" type="primary" link
-                            v-if="row.type !== MenuEnum.BUTTON"
+                            @click="handleAdd(row.id)">
-                            v-perms="['auth.menu/add']"
-                            type="primary"
-                            link
-                            @click="handleAdd(row.id)"
-                        >
                             新增
                         </el-button>
-                        <el-button
+                        <el-button v-perms="['auth.menu/edit']" type="primary" link @click="handleEdit(row)">
-                            v-perms="['auth.menu/edit']"
-                            type="primary"
-                            link
-                            @click="handleEdit(row)"
-                        >
                             编辑
                         </el-button>
-                        <el-button
+                        <el-button v-perms="['auth.menu/delete']" type="danger" link @click="handleDelete(row.id)">
-                            v-perms="['auth.menu/delete']"
-                            type="danger"
-                            link
-                            @click="handleDelete(row.id)"
-                        >
                             删除
                         </el-button>
                     </template>
@@ -111,6 +75,7 @@ const { pager, getLists } = usePaging({
         page_type: 0
     }
 })
+console.log("🚀 ~ pager:", pager)
 
 const handleAdd = async (id?: number) => {
     showEdit.value = true

src/views/permission/role/auth.vue

@@ -1,21 +1,8 @@
 <template>
     <div class="edit-popup">
-        <popup
+        <popup ref="popupRef" title="分配权限" :async="true" width="550px" @confirm="handleSubmit" @close="handleClose">
-            ref="popupRef"
+            <el-form class="ls-form" ref="formRef" :rules="rules" :model="formData" label-width="60px"
-            title="分配权限"
+                v-loading="loading">
-            :async="true"
-            width="550px"
-            @confirm="handleSubmit"
-            @close="handleClose"
-        >
-            <el-form
-                class="ls-form"
-                ref="formRef"
-                :rules="rules"
-                :model="formData"
-                label-width="60px"
-                v-loading="loading"
-            >
                 <el-scrollbar class="h-[400px] sm:h-[600px]">
                     <el-form-item label="权限" prop="menu_id">
                         <div>
@@ -23,18 +10,11 @@
                             <el-checkbox label="全选/不全选" @change="handleSelectAll" />
                             <el-checkbox v-model="checkStrictly" label="父子联动" />
                             <div>
-                                <el-tree
+                                <el-tree ref="treeRef" :data="menuTree" :props="{
-                                    ref="treeRef"
+                                    label: 'name',
-                                    :data="menuTree"
+                                    children: 'children'
-                                    :props="{
+                                }" :check-strictly="!checkStrictly" node-key="id" :default-expand-all="isExpand"
-                                        label: 'name',
+                                    show-checkbox />
-                                        children: 'children'
-                                    }"
-                                    :check-strictly="!checkStrictly"
-                                    node-key="id"
-                                    :default-expand-all="isExpand"
-                                    show-checkbox
-                                />
                             </div>
                         </div>
                     </el-form-item>

src/views/tea_store/teamaster_leaf/edit.vue

@@ -0,0 +1,103 @@
+<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="price">
+                    <el-input v-model="formData.price" clearable placeholder="请输入茶叶价格" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="teamasterLeafEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiTeamasterLeafAdd, apiTeamasterLeafEdit, apiTeamasterLeafDetail } from '@/api/teamaster_leaf'
+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: '',
+    price: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+
+
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiTeamasterLeafDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiTeamasterLeafEdit(data)
+        : await apiTeamasterLeafAdd(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/teamaster_leaf/index.vue

@@ -0,0 +1,111 @@
+<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/teamaster_leaf/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['tea-store/teamaster_leaf/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="name" show-overflow-tooltip />
+                    <el-table-column label="茶叶价格" prop="price" show-overflow-tooltip />
+                    <!-- <el-table-column label="创建时间" prop="dtime" show-overflow-tooltip /> -->
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['tea-store/teamaster_leaf/edit']" type="primary" link
+                                @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['tea-store/teamaster_leaf/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="teamasterLeafLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiTeamasterLeafLists, apiTeamasterLeafDelete } from '@/api/teamaster_leaf'
+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: apiTeamasterLeafLists,
+    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 apiTeamasterLeafDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>

src/views/teamaster_user/broker/edit.vue

@@ -0,0 +1,125 @@
+<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" required>
+                    <el-input v-model="formData.name" clearable placeholder="请输入名称" />
+                </el-form-item>
+                <el-form-item label="账号" prop="account" required>
+                    <el-input v-model="formData.account" clearable placeholder="请输入账号" />
+                </el-form-item>
+                <el-form-item label="手机号码" prop="mobile" required>
+                    <el-input v-model="formData.mobile" clearable placeholder="请输入手机号码" />
+                </el-form-item>
+                <el-form-item label="状态" prop="status">
+                    <el-select v-model="formData.status" clearable 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="brokerEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiBrokerAdd, apiBrokerEdit, apiBrokerDetail } from '@/api/broker'
+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: '',
+    account: '',
+    mobile: '',
+    status: ''
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [
+        { required: true, message: '请输入名称', trigger: 'blur' }
+    ],
+    account: [
+        { required: true, message: '请输入账号', trigger: 'blur' }
+    ],
+    mobile: [
+        { 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 apiBrokerDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData, }
+    mode.value == 'edit'
+        ? await apiBrokerEdit(data)
+        : await apiBrokerAdd(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/teamaster_user/broker/index.vue

@@ -0,0 +1,133 @@
+<template>
+    <div>
+        <el-card class="!border-none mb-4" shadow="never">
+            <el-form class="mb-[-16px]" :model="queryParams" inline>
+                <el-form-item label="名称" prop="name">
+                    <el-input class="w-[280px]" v-model="queryParams.name" clearable placeholder="请输入名称" />
+                </el-form-item>
+                <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-input class="w-[280px]" v-model="queryParams.mobile" 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>
+                    <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="['broker/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['broker/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="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="status" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <span v-if="row.status == 0">禁用</span>
+                            <span v-if="row.status == 1">启用</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['broker/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['broker/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="brokerLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiBrokerLists, apiBrokerDelete } from '@/api/broker'
+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: '',
+    account: '',
+    mobile: '',
+    status: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiBrokerLists,
+    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 apiBrokerDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>

vite.config.ts

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