diff --git a/dist.zip b/dist.zip deleted file mode 100644 index f0341d9..0000000 Binary files a/dist.zip and /dev/null differ diff --git a/src/api/order_group.ts b/src/api/order_group.ts new file mode 100644 index 0000000..c9b590a --- /dev/null +++ b/src/api/order_group.ts @@ -0,0 +1,26 @@ +import request from '@/utils/request' + +// 团购订单表列表 +export function apiOrderGroupLists(params: any) { + return request.get({ url: '/order_group/lists', params }) +} + +// 添加团购订单表 +export function apiOrderGroupAdd(params: any) { + return request.post({ url: '/order_group/add', params }) +} + +// 编辑团购订单表 +export function apiOrderGroupEdit(params: any) { + return request.post({ url: '/order_group/edit', params }) +} + +// 删除团购订单表 +export function apiOrderGroupDelete(params: any) { + return request.post({ url: '/order_group/delete', params }) +} + +// 团购订单表详情 +export function apiOrderGroupDetail(params: any) { + return request.get({ url: '/order_group/detail', params }) +} \ No newline at end of file diff --git a/src/api/tea_store.ts b/src/api/tea_store.ts index 6a3f923..802856a 100644 --- a/src/api/tea_store.ts +++ b/src/api/tea_store.ts @@ -33,4 +33,9 @@ export function apiTeaStoreCityLists() { // 归属人 export function apiTeaStoreOwnerLists(params: any) { return request.get({ url: '/teaStore/storeUser', params }) +} + +// 门店资质详情 +export function apiQualDetail(params: any) { + return request.post({ url: '/teaStore/qualDetail', params }) } \ No newline at end of file diff --git a/src/views/consumer/lists/index.vue b/src/views/consumer/lists/index.vue index cfa6985..f02da43 100644 --- a/src/views/consumer/lists/index.vue +++ b/src/views/consumer/lists/index.vue @@ -11,8 +11,10 @@ v-model:endTime="queryParams.create_time_end" /> - - + + + + @@ -32,7 +34,13 @@ - + + + - - + + +
+ + + + + + + + + + + + + + + + + + + + + +
+
+ +
+ + + + + + diff --git a/src/views/order/order_store/index.vue b/src/views/order/order_store/index.vue index 073a2b4..bee99f8 100644 --- a/src/views/order/order_store/index.vue +++ b/src/views/order/order_store/index.vue @@ -45,9 +45,8 @@ --> @@ -76,13 +75,17 @@ - + + + + - - + + + - - - + @@ -105,6 +111,7 @@ import { apiTeaStoreLists, apiTeaStoreDelete } from '@/api/tea_store' import { timeFormat } from '@/utils/util' import feedback from '@/utils/feedback' import EditPopup from './edit.vue' +import LicensePopup from './license.vue' import { useDictOptions } from '@/hooks/useDictOptions' import { getRoutePath } from '@/router' @@ -112,6 +119,10 @@ const editRef = shallowRef>() // 是否显示编辑框 const showEdit = ref(false) +const licenseRef = shallowRef>() +// 是否显示编辑框 +const showLicense = ref(false) + // 查询条件 const queryParams = reactive({ @@ -163,5 +174,14 @@ const handleDelete = async (id: number | any[]) => { getLists() } +// 查看资质 +const handleSee = async (data: any) => { + showLicense.value = true + await nextTick() + console.log("🚀 ~ data:", 123) + licenseRef.value?.open('see') + licenseRef.value?.setFormData(data) +} + getLists() diff --git a/src/views/tea_store/license.vue b/src/views/tea_store/license.vue new file mode 100644 index 0000000..0aba432 --- /dev/null +++ b/src/views/tea_store/license.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/views/teamaster_user/edit.vue b/src/views/teamaster_user/edit.vue index 6123980..8fff50e 100644 --- a/src/views/teamaster_user/edit.vue +++ b/src/views/teamaster_user/edit.vue @@ -12,6 +12,9 @@ + + + @@ -56,8 +59,8 @@ - - + + @@ -158,6 +161,7 @@ const formData = reactive({ latitude: '', disable: '', state: '', + user_money: '' }) // 城市列表 @@ -226,7 +230,6 @@ const handleClose = () => { } - defineExpose({ open, setFormData, diff --git a/src/views/teamaster_user/index.vue b/src/views/teamaster_user/index.vue index 6786395..0f041a9 100644 --- a/src/views/teamaster_user/index.vue +++ b/src/views/teamaster_user/index.vue @@ -2,10 +2,10 @@
- - + + - + @@ -68,46 +68,36 @@ - - - - + + + + + + - - - + - - -