diff --git a/src/api/teamaster_order_split.ts b/src/api/teamaster_order_split.ts new file mode 100644 index 0000000..cf05a6f --- /dev/null +++ b/src/api/teamaster_order_split.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 茶艺师订单分账表列表 +export function apiTeamasterOrderSplitLists(params: any) { + return request.get({ url: '/teamaster_order_split/lists', params }) +} + +// 添加茶艺师订单分账表 +export function apiTeamasterOrderSplitAdd(params: any) { + return request.post({ url: '/teamaster_order_split/add', params }) +} + +// 编辑茶艺师订单分账表 +export function apiTeamasterOrderSplitEdit(params: any) { + return request.post({ url: '/teamaster_order_split/edit', params }) +} + +// 删除茶艺师订单分账表 +export function apiTeamasterOrderSplitDelete(params: any) { + return request.post({ url: '/teamaster_order_split/delete', params }) +} + +// 茶艺师订单分账表详情 +export function apiTeamasterOrderSplitDetail(params: any) { + return request.get({ url: '/teamaster_order_split/detail', params }) +} \ No newline at end of file diff --git a/src/views/finance/teamaster_order_split/edit.vue b/src/views/finance/teamaster_order_split/edit.vue new file mode 100644 index 0000000..95f28a7 --- /dev/null +++ b/src/views/finance/teamaster_order_split/edit.vue @@ -0,0 +1,81 @@ + + + + + + + + + 订单 + {{ order.order_sn }} + {{ order.type == 1 ? '完成订单' : '部分退款订单' }} + + + + 实际营收 + {{ order.platform_income }} + + + + 茶艺师 + {{ order.teamaster_user.nickname }} + {{ order.teamaster_user.mobile }} + {{ order.tea_master_commission }} + + + + 合伙人 + {{ order.parten.name }} + {{ order.parten.account }} + {{ order.city_partner_commission }} + + + + 经济人 + {{ order.broker.name }} + {{ order.broker.account }} + {{ order.tea_master_agent_commission }} + + + + 茶室 + {{ order.tea_store.name }} + {{ order.tea_store.contact_phone }} + {{ order.tea_store.province }} {{ order.tea_store.city }} {{ + order.tea_store.district }} {{ order.tea_store.address }} + {{ order.tea_room_commission }} + + + + 平台 + {{ order.platform_commission }} + + + + 用户信息 + {{ order.user.nickname }} + {{ order.user.mobile }} + + + + + + diff --git a/src/views/finance/teamaster_order_split/index.vue b/src/views/finance/teamaster_order_split/index.vue new file mode 100644 index 0000000..9c14cf2 --- /dev/null +++ b/src/views/finance/teamaster_order_split/index.vue @@ -0,0 +1,95 @@ + + + + + + + + + 查询 + 重置 + + + + + + + + + + + {{ row.teamaster_user.nickname }} + + + + + + + + + + + + + + 查看 + + + + + + + + + + + + + + diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue index 2fa784b..d4254fe 100644 --- a/src/views/teamaster_user/edit.vue +++ b/src/views/teamaster_user/edit.vue @@ -1,138 +1,338 @@ - - - - - - - - - + + + + + + + + + + + + + 基本信息 + + + + + + + + + + + + + + + + + + + + + + + + + + cm + + / + + kg + + + + + + + + + + + + + 联系信息 + + + + + + + + + + + + + + + + + + + + 服务配置 + + + + + + + + + + + + 星 + + + + + + 元/小时 + + + + + + 元/公里 + + + + + + + + + + + + + 次 + + + + + + + + + + + + + + + + + + 位置信息 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 状态设置 + + + + + + + + + 可预约 + + + + + 不可预约 + + + + + + + + + + 启用 + + + + + 禁用 + + + + + + - 未上传 - - - - + + + + + + + + + + + 照片资料 + + + + + + + + + + + + + + + + 未上传 + + + + + + + + + + + + + 证件资料 + + + + + + + + 未上传 + + + + + + + 未上传 + + + + + + + + 未上传 + + + + + + + 未上传 + + + + + + + + + + + + 专属圈子 + + + + + + + + + - 未上传 - - - - - - 未上传 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -146,7 +346,7 @@ import type { PropType } from 'vue' import { apiTeaStoreCityLists } from '@/api/tea_store' import type { FormInstance } from 'element-plus' import { isArray } from 'lodash' - +import { User, Message, Service, Location, Picture, Document, Collection, Setting, MapLocation } from '@element-plus/icons-vue' defineProps({ dictData: { @@ -154,12 +354,12 @@ defineProps({ default: () => ({}) } }) + const emit = defineEmits(['success', 'close']) const formRef = shallowRef() const popupRef = shallowRef>() const mode = ref('add') -// 获取专属圈子 const options = ref<{ label: string; value: string }[]>([]) const getLabel = async () => { try { @@ -171,12 +371,10 @@ const getLabel = async () => { } getLabel() -// 弹窗标题 const popupTitle = computed(() => { - return mode.value == 'edit' ? '编辑茶艺师' : '新增茶艺师' + return mode.value = '茶艺师详情' }) -// 表单数据 const formData = reactive({ id: '', avatar: '', @@ -214,7 +412,6 @@ const formData = reactive({ back_card: '', }) -// 城市列表 const cityList = ref([]) onMounted(async () => { @@ -226,12 +423,8 @@ onMounted(async () => { } }) - -// 表单验证 const formRules = reactive({}) - -// 获取详情 const setFormData = async (data: Record) => { for (const key in formData) { if (data[key] != null && data[key] != undefined) { @@ -240,14 +433,14 @@ const setFormData = async (data: Record) => { } } - //@ts-ignore - // formData.avatar = normalizeImageUrl(formData.avatar) + const broker_user_id = formData.broker_user_id + await handleCityChange(formData.city_id) + formData.broker_user_id = broker_user_id formData.label_id = formData.label_id ? formData.label_id.split(',') : [] if (isArray(formData.label_id)) { //@ts-ignore formData.label_id = formData.label_id.map((item: string) => Number(item)) } - console.log("🚀 ~ setFormData ~ formData.label_id:", formData.label_id) //@ts-ignore formData.information = formData.information ? formData.information.split(',') : '' } @@ -259,38 +452,25 @@ const getDetail = async (row: Record) => { setFormData(data) } - -// // 提交按钮 -const handleSubmit = async () => { - // await formRef.value?.validate() - // let data = { ...formData, } - // data.avatar = removeImageUrlPrefix(data.avatar) - // data.image = removeImageUrlPrefix(data.image) - // 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.label_id = Array.isArray(data.label_id) ? data.label_id.join(',') : '' - // // console.log("🚀 ~ handleSubmit ~ data:", data) - // // return - // mode.value == 'edit' - // ? await apiTeamasterUserEdit(data) - // : await apiTeamasterUserAdd(data) - // popupRef.value?.close() - // emit('success') -} - -//打开弹窗 const open = (type = 'add') => { mode.value = type popupRef.value?.open() } -// 关闭回调 const handleClose = () => { emit('close') } +const brokerList = ref([]) +const handleCityChange = async (cityId: string | number) => { + try { + const res = await apiBrokerList({ city_id: cityId }) + brokerList.value = res + formData.broker_user_id = '' + } catch (e) { + // handle error + } +} defineExpose({ open, @@ -298,3 +478,179 @@ defineExpose({ getDetail }) + + diff --git a/src/views/withdraw/broker_reflect/index.vue b/src/views/withdraw/broker_reflect/index.vue index fa2f5d4..5a2dac4 100644 --- a/src/views/withdraw/broker_reflect/index.vue +++ b/src/views/withdraw/broker_reflect/index.vue @@ -156,7 +156,7 @@ const { pager, getLists, resetParams, resetPage } = usePaging({ const isWithdrawDay = computed(() => { const today = new Date() const day = today.getDate() - return day === 1 || day === 16 + return day === 1 || day === 16 || day === 22 }) // 添加 diff --git a/src/views/withdraw/store_user_reflect/index.vue b/src/views/withdraw/store_user_reflect/index.vue new file mode 100644 index 0000000..d32c172 --- /dev/null +++ b/src/views/withdraw/store_user_reflect/index.vue @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + 删除 + + + + + + + + 昵称:{{ row.nickname }} + 联系方式:{{ row.mobile }} + + + + + + 卡号:{{ row.bank_card }} + 开户行:{{ row.bank_name }} {{ row.bank_open_name }} + + + + + + 待审核 + 已通过 + 已拒绝 + + + + + + + + + + + + + + + + +