diff --git a/src/api/bonus.js b/src/api/bonus.js index ee8dceb..a864bc6 100644 --- a/src/api/bonus.js +++ b/src/api/bonus.js @@ -4,10 +4,18 @@ export function getBonusList(params) { return request('/bonus/getBonusList', 'post', params) } +export function getBonus(type_id) { + return request('/bonus/getBonus', 'post', { type_id }) +} + export function addBonus(params) { return request('/bonus/addBonus', 'post', params) } +export function updateBonus(params) { + return request('/bonus/updateBonus', 'post', params) +} + export function deleteBonus(id) { return request('/bonus/deleteBonus', 'get', { id }) } @@ -19,3 +27,11 @@ export function getUseBonusList(params) { export function deleteUseBonus(id) { return request('/bonus/deleteUseBonus', 'get', { id }) } + +export function sendBonus(params) { + return request('/bonus/send', 'post', params) +} + +export function getUseList(params) { + return request('/bonus/getUseList', 'post', params) +} diff --git a/src/pages/bonus/UseList.vue b/src/pages/bonus/UseList.vue index ab9eb8f..e610108 100644 --- a/src/pages/bonus/UseList.vue +++ b/src/pages/bonus/UseList.vue @@ -2,7 +2,7 @@ import { ref, reactive, watch, onMounted } from "vue"; import { useRouter } from "vue-router"; -import { getUseBonusList, deleteUseBonus } from "@/api/bonus"; +import { getUseBonusList, getUseList,deleteUseBonus } from "@/api/bonus"; const router = useRouter(); @@ -39,7 +39,7 @@ watch( ); const onBack = () => { - router.back() + router.back(); }; const handleDelete = async (bonus) => { @@ -49,64 +49,92 @@ const handleDelete = async (bonus) => { } }; +const dialogTableVisible = ref(false) + +const useData = ref([]) + +const handleShowUsed =async (row)=> { + dialogTableVisible.value = true + const res = await getUseList({ + bonus_id: row.bonus_id + }); + useData.value = res.data +} + + const reloadList = () => { initData(state.page, state.pageSize); }; diff --git a/src/pages/bonus/components/AddForm.vue b/src/pages/bonus/components/AddForm.vue deleted file mode 100644 index ede9340..0000000 --- a/src/pages/bonus/components/AddForm.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - - - diff --git a/src/pages/bonus/components/BonusForm.vue b/src/pages/bonus/components/BonusForm.vue new file mode 100644 index 0000000..3829beb --- /dev/null +++ b/src/pages/bonus/components/BonusForm.vue @@ -0,0 +1,200 @@ + + + + + diff --git a/src/pages/bonus/components/EditForm.vue b/src/pages/bonus/components/EditForm.vue deleted file mode 100644 index ed2a9a5..0000000 --- a/src/pages/bonus/components/EditForm.vue +++ /dev/null @@ -1,151 +0,0 @@ - - - - - diff --git a/src/pages/bonus/components/SendBonus.vue b/src/pages/bonus/components/SendBonus.vue index aa2df56..4b66812 100644 --- a/src/pages/bonus/components/SendBonus.vue +++ b/src/pages/bonus/components/SendBonus.vue @@ -1,11 +1,18 @@