完善功能

src/api/parten_admin.ts

@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 城市合伙人表列表
+export function apiPartenAdminLists(params: any) {
+    return request.get({ url: '/parten_admin/lists', params })
+}
+
+// 添加城市合伙人表
+export function apiPartenAdminAdd(params: any) {
+    return request.post({ url: '/parten_admin/add', params })
+}
+
+// 编辑城市合伙人表
+export function apiPartenAdminEdit(params: any) {
+    return request.post({ url: '/parten_admin/edit', params })
+}
+
+// 删除城市合伙人表
+export function apiPartenAdminDelete(params: any) {
+    return request.post({ url: '/parten_admin/delete', params })
+}
+
+// 城市合伙人表详情
+export function apiPartenAdminDetail(params: any) {
+    return request.get({ url: '/parten_admin/detail', params })
+}

src/main.ts

@@ -29,3 +29,6 @@ getConfig().then((res) => {
     )
     console.log(`%c ${likeadminArt}`, 'color: #4A5DFF')
 })
+
+console.log(import.meta.env.VITE_APP_BASE_URL)
+console.log('VITE_NODE_ENV:', import.meta.env.VITE_NODE_ENV)

src/views/parten_admin/edit.vue

@@ -0,0 +1,179 @@
+<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="是否超级管理员 0-否 1-是" prop="root">
+                    <el-input v-model="formData.root" clearable placeholder="请输入是否超级管理员 0-否 1-是" />
+                </el-form-item> -->
+                <el-form-item label="名称" prop="name">
+                    <el-input v-model="formData.name" clearable placeholder="请输入名称" />
+                </el-form-item>
+                <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="password">
+                    <el-input v-model="formData.password" clearable placeholder="请输入密码" />
+                </el-form-item>
+                <!-- <el-form-item label="最后登录时间" prop="login_time">
+                    <el-input v-model="formData.login_time" clearable placeholder="请输入最后登录时间" />
+                </el-form-item>
+                <el-form-item label="最后登录ip" prop="login_ip">
+                    <el-input v-model="formData.login_ip" clearable placeholder="请输入最后登录ip" />
+                </el-form-item> -->
+                <!-- <el-form-item label="是否支持多处登录：1-是；0-否；" prop="multipoint_login">
+                    <el-input v-model="formData.multipoint_login" clearable placeholder="请输入是否支持多处登录：1-是；0-否；" />
+                </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="状态" prop="disable">
+                    <el-select class="flex-1" v-model="formData.disable" clearable placeholder="请选择">
+                        <el-option label="启用" :value="0"></el-option>
+                        <el-option label="禁用" :value="1"></el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="partenAdminEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiPartenAdminAdd, apiPartenAdminEdit, apiPartenAdminDetail } from '@/api/parten_admin'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+import { apiTeaStoreCityLists } from '@/api/tea_store'
+
+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 cityList = ref<any[]>([])
+
+onMounted(async () => {
+    try {
+        const res = await apiTeaStoreCityLists()
+        cityList.value = res || []
+    } catch (e) {
+        cityList.value = []
+    }
+})
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑城市合伙人' : '新增城市合伙人'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    name: '',
+    avatar: '',
+    account: '',
+    password: '',
+    disable: 0,
+    city_id: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    name: [{
+        required: true,
+        message: '请输入名称',
+        trigger: ['blur']
+    }],
+    avatar: [{
+        required: true,
+        message: '请选择头像',
+        trigger: ['blur']
+    }],
+    account: [{
+        required: true,
+        message: '请输入账号',
+        trigger: ['blur']
+    }],
+    password: [{
+        required: true,
+        message: '请输入密码',
+        trigger: ['blur']
+    }],
+    city_id: [{
+        required: true,
+        message: '请选择所属城市',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (key === 'password') {
+            continue
+        }
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    formData.password = ''
+    //@ts-ignore
+    data.disable && (formData.disable = String(data.disable).split(","))
+    formData.disable = Number(formData.disable)
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiPartenAdminDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData }
+    mode.value == 'edit'
+        ? await apiPartenAdminEdit(data)
+        : await apiPartenAdminAdd(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/parten_admin/index.vue

@@ -0,0 +1,141 @@
+<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="是否支持多处登录：1-是；0-否；" prop="multipoint_login">
+                    <el-input class="w-[280px]" v-model="queryParams.multipoint_login" clearable
+                        placeholder="请输入是否支持多处登录：1-是；0-否；" />
+                </el-form-item>
+                <el-form-item label="城市id" prop="city_id">
+                    <el-input class="w-[280px]" v-model="queryParams.city_id" clearable placeholder="请输入城市id" />
+                </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="['parten_admin/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button v-perms="['parten_admin/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="avatar" show-overflow-tooltip>
+                        <template #default="{ row }">
+                            <el-image style="width:50px;height:50px;" :src="row.avatar" :preview-src-list="[row.avatar]"
+                                preview-teleported />
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="账号" prop="account" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="disable">
+                        <template #default="{ row }">
+                            <el-tag type="success" v-if="row.disable == 0">
+                                正常
+                            </el-tag>
+                            <el-tag type="warning" v-if="row.disable == 1">
+                                禁用
+                            </el-tag>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="城市id" prop="city_name" show-overflow-tooltip />
+                    <el-table-column label="操作" width="120" fixed="right">
+                        <template #default="{ row }">
+                            <el-button v-perms="['parten_admin/edit']" type="primary" link @click="handleEdit(row)">
+                                编辑
+                            </el-button>
+                            <el-button v-perms="['parten_admin/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="partenAdminLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiPartenAdminLists, apiPartenAdminDelete } from '@/api/parten_admin'
+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({
+    root: '',
+    name: '',
+    account: '',
+    multipoint_login: '',
+    disable: '',
+    city_id: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiPartenAdminLists,
+    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 apiPartenAdminDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>

src/views/teamaster_user/edit.vue

@@ -76,20 +76,20 @@
                     <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-select v-model="formData.city_id" clearable placeholder="请选择" disabled>
                         <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.address" clearable placeholder="请输入地址" />
+                    <el-input v-model="formData.address" clearable placeholder="请输入地址" disabled />
                 </el-form-item>
-                <el-form-item label="经度" prop="longitude">
+                <!-- <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> -->
                 <el-form-item label="状态" prop="state">
                     <el-select class="flex-1" v-model="formData.state" clearable placeholder="请选择">
                         <el-option label="可约" :value="0"></el-option>

vite.config.ts

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