From d890e84a200136da3e08fd78ac4da91eb8b0a180 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Tue, 14 Nov 2023 20:48:49 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=BC=EC=9E=90=EB=B3=84=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=ED=9B=84=EC=9B=90=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/calculate.js | 9 +- src/router/index.js | 5 + .../Calculate/CalculateContentDonation.vue | 255 ++++++++++++++++++ 3 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 src/views/Calculate/CalculateContentDonation.vue diff --git a/src/api/calculate.js b/src/api/calculate.js index 345df74..d15f08f 100644 --- a/src/api/calculate.js +++ b/src/api/calculate.js @@ -15,4 +15,11 @@ async function getCumulativeSalesByContent(page, size) { return Vue.axios.get('/creator-admin/calculate/cumulative-sales-by-content?page=' + (page - 1) + "&size=" + size); } -export {getCalculateLive, getCalculateContent, getCumulativeSalesByContent} +async function getCalculateContentDonation(startDate, endDate, page, size) { + return Vue.axios.get( + '/creator-admin/calculate/content-donation-list?startDateStr=' + + startDate + '&endDateStr=' + endDate + "&page=" + (page - 1) + "&size=" + size + ); +} + +export {getCalculateLive, getCalculateContent, getCumulativeSalesByContent, getCalculateContentDonation} diff --git a/src/router/index.js b/src/router/index.js index c21a68f..139af9c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,11 @@ const routes = [ name: 'CalculateAccumulation', component: () => import(/* webpackChunkName: "calculate" */ '../views/Calculate/CalculateAccumulation.vue') }, + { + path: '/calculate/content-donation-by-date', + name: 'CalculateContentDonation', + component: () => import(/* webpackChunkName: "calculate" */ '../views/Calculate/CalculateContentDonation.vue') + }, ] }, { diff --git a/src/views/Calculate/CalculateContentDonation.vue b/src/views/Calculate/CalculateContentDonation.vue new file mode 100644 index 0000000..d1e07ce --- /dev/null +++ b/src/views/Calculate/CalculateContentDonation.vue @@ -0,0 +1,255 @@ + + + -- 2.40.1 From 850c7d038ae9b04f35d1cd011ff91b791f778345 Mon Sep 17 00:00:00 2001 From: Yu Sung Date: Tue, 14 Nov 2023 21:02:18 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=BC=EC=9E=90=EB=B3=84=20=EC=BD=98?= =?UTF-8?q?=ED=85=90=EC=B8=A0=20=ED=9B=84=EC=9B=90=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20-=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Calculate/CalculateContentDonation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/Calculate/CalculateContentDonation.vue b/src/views/Calculate/CalculateContentDonation.vue index d1e07ce..329e088 100644 --- a/src/views/Calculate/CalculateContentDonation.vue +++ b/src/views/Calculate/CalculateContentDonation.vue @@ -229,7 +229,7 @@ export default { this.is_loading = true try { - const res = await api.getCalculateContentDonation(this.start_date, this.end_date) + const res = await api.getCalculateContentDonation(this.start_date, this.end_date, this.page, this.page_size) if (res.status === 200 && res.data.success === true) { const data = res.data.data -- 2.40.1