From 8be96e4ea5cfe9696f954e988235f613c0dc1250 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Mon, 13 Apr 2026 14:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/consumer.ts | 5 + src/api/tea_store_city.ts | 26 ++++ src/config/index.ts | 1 + src/views/consumer/lists/index.vue | 16 ++- src/views/consumer/lists/store_balance.vue | 35 +++++ src/views/parten_admin/edit.vue | 12 +- src/views/tea_store_city/edit.vue | 122 ++++++++++++++++++ src/views/tea_store_city/index.vue | 113 ++++++++++++++++ .../teamaster_group/edit.vue | 2 +- .../teamaster_group/index.vue | 4 +- src/views/teamaster_real/edit.vue | 31 +++-- src/views/teamaster_user/edit.vue | 40 ++++-- .../teamaster_user/teamaster_cert/edit.vue | 12 +- .../teamaster_user/teamaster_cert/index.vue | 14 +- .../teamaster_group_reservation/index.vue | 6 +- .../withdraw/store_user_reflect/edit.vue | 10 +- .../withdraw/store_user_reflect/index.vue | 4 +- vite.config.ts | 1 + 18 files changed, 408 insertions(+), 46 deletions(-) create mode 100644 src/api/tea_store_city.ts create mode 100644 src/views/consumer/lists/store_balance.vue create mode 100644 src/views/tea_store_city/edit.vue create mode 100644 src/views/tea_store_city/index.vue diff --git a/src/api/consumer.ts b/src/api/consumer.ts index ef92143..824fe92 100644 --- a/src/api/consumer.ts +++ b/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 }) +} diff --git a/src/api/tea_store_city.ts b/src/api/tea_store_city.ts new file mode 100644 index 0000000..279f0f7 --- /dev/null +++ b/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 }) +} \ No newline at end of file diff --git a/src/config/index.ts b/src/config/index.ts index 23a52c8..edda028 100644 --- a/src/config/index.ts +++ b/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 //请求超时时长 } diff --git a/src/views/consumer/lists/index.vue b/src/views/consumer/lists/index.vue index f02da43..657ba94 100644 --- a/src/views/consumer/lists/index.vue +++ b/src/views/consumer/lists/index.vue @@ -42,7 +42,7 @@ - + + + 门店余额 + + @@ -80,9 +91,6 @@ const { pager, getLists, resetPage, resetParams } = usePaging({ fetchFun: getUserList, params: queryParams }) -onActivated(() => { - getLists() -}) getLists() diff --git a/src/views/consumer/lists/store_balance.vue b/src/views/consumer/lists/store_balance.vue new file mode 100644 index 0000000..1c3b644 --- /dev/null +++ b/src/views/consumer/lists/store_balance.vue @@ -0,0 +1,35 @@ + + + + + + + + + + + diff --git a/src/views/parten_admin/edit.vue b/src/views/parten_admin/edit.vue index d6edd9e..9bbe938 100644 --- a/src/views/parten_admin/edit.vue +++ b/src/views/parten_admin/edit.vue @@ -16,7 +16,8 @@ - + @@ -109,7 +110,7 @@ const formData = reactive({ // 表单验证 -const formRules = reactive({ +const formRules = computed(() => ({ name: [{ required: true, message: '请输入名称', @@ -126,7 +127,7 @@ const formRules = reactive({ trigger: ['blur'] }], password: [{ - required: true, + required: mode.value === 'add', message: '请输入密码', trigger: ['blur'] }], @@ -155,7 +156,7 @@ const formRules = reactive({ message: '请选择所属城市', trigger: ['blur'] }] -}) +})) // 获取详情 @@ -187,6 +188,9 @@ const getDetail = async (row: Record) => { 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) diff --git a/src/views/tea_store_city/edit.vue b/src/views/tea_store_city/edit.vue new file mode 100644 index 0000000..6132d93 --- /dev/null +++ b/src/views/tea_store_city/edit.vue @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/tea_store_city/index.vue b/src/views/tea_store_city/index.vue new file mode 100644 index 0000000..8b36507 --- /dev/null +++ b/src/views/tea_store_city/index.vue @@ -0,0 +1,113 @@ + + + + + + + + + 查询 + 重置 + + + + + + + + + 新增 + + + 删除 + + + + + + + + + + + + + + 编辑 + + + 删除 + + + + + + + + + + + + + + diff --git a/src/views/teamaster_package/teamaster_group/edit.vue b/src/views/teamaster_package/teamaster_group/edit.vue index b2efea6..52fc53a 100644 --- a/src/views/teamaster_package/teamaster_group/edit.vue +++ b/src/views/teamaster_package/teamaster_group/edit.vue @@ -7,7 +7,7 @@ - + diff --git a/src/views/teamaster_package/teamaster_group/index.vue b/src/views/teamaster_package/teamaster_group/index.vue index acdb23c..f62bd72 100644 --- a/src/views/teamaster_package/teamaster_group/index.vue +++ b/src/views/teamaster_package/teamaster_group/index.vue @@ -7,7 +7,7 @@ - + @@ -37,7 +37,7 @@ 清风 明月 - 鹤鸣 + 云华 diff --git a/src/views/teamaster_real/edit.vue b/src/views/teamaster_real/edit.vue index f403dda..8fa9bbf 100644 --- a/src/views/teamaster_real/edit.vue +++ b/src/views/teamaster_real/edit.vue @@ -37,7 +37,6 @@ - 未上传 - + + 未上传 + + + + + 未上传 + + + + 未上传 @@ -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) diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue index 2ffc596..42b9fbf 100644 --- a/src/views/teamaster_user/edit.vue +++ b/src/views/teamaster_user/edit.vue @@ -7,17 +7,23 @@ - + - + + + + + + + @@ -46,7 +52,7 @@ - + @@ -95,14 +101,17 @@ - + - + - + @@ -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({ - -}) +const formRules = reactive({}) // 获取详情 @@ -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) diff --git a/src/views/teamaster_user/teamaster_cert/edit.vue b/src/views/teamaster_user/teamaster_cert/edit.vue index a481df7..307b2fd 100644 --- a/src/views/teamaster_user/teamaster_cert/edit.vue +++ b/src/views/teamaster_user/teamaster_cert/edit.vue @@ -4,10 +4,18 @@ @close="handleClose"> - + + + + 未上传 - + + + + 未上传 diff --git a/src/views/teamaster_user/teamaster_cert/index.vue b/src/views/teamaster_user/teamaster_cert/index.vue index 99062fc..4085074 100644 --- a/src/views/teamaster_user/teamaster_cert/index.vue +++ b/src/views/teamaster_user/teamaster_cert/index.vue @@ -38,14 +38,20 @@ - + + + + — - + + + + — diff --git a/src/views/teamaster_user/teamaster_group_reservation/index.vue b/src/views/teamaster_user/teamaster_group_reservation/index.vue index 53cb328..4115355 100644 --- a/src/views/teamaster_user/teamaster_group_reservation/index.vue +++ b/src/views/teamaster_user/teamaster_group_reservation/index.vue @@ -15,12 +15,12 @@ - + 删除 diff --git a/src/views/withdraw/store_user_reflect/edit.vue b/src/views/withdraw/store_user_reflect/edit.vue index 3dca893..fb2514f 100644 --- a/src/views/withdraw/store_user_reflect/edit.vue +++ b/src/views/withdraw/store_user_reflect/edit.vue @@ -12,13 +12,16 @@ - + + + + - + - + @@ -75,6 +78,7 @@ const formData = reactive({ mobile: '', bank_card: '', bank_name: '', + bank_user_name: '', bank_open_name: '', name: '' }) diff --git a/src/views/withdraw/store_user_reflect/index.vue b/src/views/withdraw/store_user_reflect/index.vue index 9849627..7a03590 100644 --- a/src/views/withdraw/store_user_reflect/index.vue +++ b/src/views/withdraw/store_user_reflect/index.vue @@ -37,8 +37,10 @@ + 名称:{{ row.bank_user_name }} 卡号:{{ row.bank_card }} - 开户行:{{ row.bank_name }} {{ row.bank_open_name }} + 银行卡:{{ row.bank_name }} + 开户行:{{ row.bank_open_name }} diff --git a/vite.config.ts b/vite.config.ts index d61adb0..f1235fc 100644 --- a/vite.config.ts +++ b/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