diff --git a/src/api/broker.ts b/src/api/broker.ts
index b708338..04a778d 100644
--- a/src/api/broker.ts
+++ b/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 })
}
\ No newline at end of file
diff --git a/src/views/tea_store/edit.vue b/src/views/tea_store/edit.vue
index cb187e5..64d8c51 100644
--- a/src/views/tea_store/edit.vue
+++ b/src/views/tea_store/edit.vue
@@ -166,7 +166,7 @@ onMounted(async () => {
// 弹窗标题
const popupTitle = computed(() => {
- return mode.value == 'edit' ? '编辑门店表' : '新增门店表'
+ return mode.value == 'edit' ? '编辑门店' : '新增门店'
})
// 表单数据
diff --git a/src/views/teamaster_real/edit.vue b/src/views/teamaster_real/edit.vue
index 823ee23..c1eb5b3 100644
--- a/src/views/teamaster_real/edit.vue
+++ b/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" />
-
+
-
+
+ -->
@@ -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,
diff --git a/src/views/teamaster_real/index.vue b/src/views/teamaster_real/index.vue
index 6c5a7a8..b971228 100644
--- a/src/views/teamaster_real/index.vue
+++ b/src/views/teamaster_real/index.vue
@@ -2,9 +2,6 @@
-
-
-
@@ -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>()
// 是否显示编辑框
const showEdit = ref(false)
@@ -126,7 +125,8 @@ const queryParams = reactive({
nickname: '',
username: '',
mobile: '',
- gender: ''
+ gender: '',
+ city_id: userStore.userInfo.city_id,
})
// 选中数据
diff --git a/src/views/teamaster_user/broker/edit.vue b/src/views/teamaster_user/broker/edit.vue
index 4c4a477..bd99841 100644
--- a/src/views/teamaster_user/broker/edit.vue
+++ b/src/views/teamaster_user/broker/edit.vue
@@ -6,16 +6,19 @@
-
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
@@ -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>,
@@ -50,26 +57,36 @@ const popupTitle = computed(() => {
const formData = reactive({
id: '',
name: '',
+ avatar: '',
account: '',
- mobile: '',
- status: ''
+ password: '',
+ disable: 0,
+ city_id: '',
})
// 表单验证
const formRules = reactive({
- name: [
- { required: true, message: '请输入名称', trigger: 'blur' }
- ],
- account: [
- { required: true, message: '请输入账号', trigger: 'blur' }
- ],
- mobile: [
- { required: true, message: '请输入手机号码', trigger: 'blur' }
- ],
- status: [
- { required: true, message: '请选择状态', trigger: 'blur' }
- ]
+ name: [{
+ required: true,
+ message: '请输入名称',
+ trigger: ['blur']
+ }],
+ avatar: [{
+ 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) => {
formData[key] = data[key]
}
}
-
-
}
const getDetail = async (row: Record) => {
@@ -97,6 +112,8 @@ const getDetail = async (row: Record) => {
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)
diff --git a/src/views/teamaster_user/broker/index.vue b/src/views/teamaster_user/broker/index.vue
index dc18b09..c6c6cf6 100644
--- a/src/views/teamaster_user/broker/index.vue
+++ b/src/views/teamaster_user/broker/index.vue
@@ -8,11 +8,8 @@
-
-
-
-
-
+
+
查询
@@ -35,18 +32,16 @@
-
-
-
+
- 禁用
- 启用
+ 启用
+ 禁用
@@ -87,7 +82,7 @@ const queryParams = reactive({
name: '',
account: '',
mobile: '',
- status: ''
+ disable: ''
})
// 选中数据
diff --git a/src/views/teamaster_user/index.vue b/src/views/teamaster_user/index.vue
index 0f041a9..1bc83f5 100644
--- a/src/views/teamaster_user/index.vue
+++ b/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>()
// 是否显示编辑框
const showEdit = ref(false)
@@ -146,7 +148,8 @@ const queryParams = reactive({
is_mileage: '',
server_type: '',
disable: '',
- state: ''
+ state: '',
+ city_id: userStore.userInfo.city_id,
})
// 选中数据
diff --git a/vite.config.ts b/vite.config.ts
index 0dc05fb..c3415ff 100644
--- a/vite.config.ts
+++ b/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,