From b00cf54a89940d7afe4d489b57e9fc15e647fcff Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Sat, 2 Aug 2025 15:51:56 +0800 Subject: [PATCH] completed liveStream dieHardFan and articleVidel's page --- .env.development | 4 ++-- src/views/consume/bean/articleVideo.vue | 33 ++++++++++++++++++++------------- src/views/consume/bean/beanConsume.vue | 4 ++++ src/views/consume/bean/dieHardFan.vue | 12 ++++++------ src/views/consume/bean/liveStream.vue | 22 ++++++++++++---------- 5 files changed, 44 insertions(+), 31 deletions(-) diff --git a/.env.development b/.env.development index 315e256..d3bf591 100644 --- a/.env.development +++ b/.env.development @@ -1,10 +1,10 @@ -VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' # 测试环境 # VITE_API_BASE='http://18.143.76.3:10704/' # VITE_API_BASE='http://192.168.9.52:10705/' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # VITE_API_BASE='http://192.168.9.28:8081/' -# VITE_API_BASE='http://192.168.9.28:8081/' + VITE_API_BASE='http://localhost:8081/' # sunjiabei # VITE_API_BASE='http://192.168.9.28:8081/' # VITE_API_BASE='http://192.168.5.92:8081/' diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue index 4fc3888..389d933 100644 --- a/src/views/consume/bean/articleVideo.vue +++ b/src/views/consume/bean/articleVideo.vue @@ -310,7 +310,11 @@ const handleSortChange = (column) => { sortField.value = 'beanNum' } else if (column.prop === 'consumeTime') { sortField.value = 'consumeTime' - } + } else if (column.prop === 'buyBean') { + sortField.value = 'buyBean' + } else if (column.prop === 'freeBean') { + sortField.value = 'freeBean' + } sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC' ConsumeSelectBy() } @@ -360,6 +364,8 @@ const exportExcel = async function () { articleName: beanConsumeArticle.value.articleName || '', author: beanConsumeArticle.value.author || '', beanNum: beanConsumeArticle.value.beanNum || '', + buyBean: beanConsumeArticle.value.buyBean || '', + freeBean: beanConsumeArticle.value.freeBean || '', consumeTime: beanConsumeArticle.value.consumeTime || '', sortField: sortField.value || 'consumeTime', sortOrder: sortOrder.value || 'desc' @@ -453,7 +459,7 @@ const getTagText = (state) => {
精网号： - +
@@ -480,21 +486,22 @@ const getTagText = (state) => { - +
文章/视频标题： - +
+ + +
- 作者： - + 作者： +
- - - +
付费时间： { }} - + - + - + - + diff --git a/src/views/consume/bean/beanConsume.vue b/src/views/consume/bean/beanConsume.vue index dbdb993..6844048 100644 --- a/src/views/consume/bean/beanConsume.vue +++ b/src/views/consume/bean/beanConsume.vue @@ -5,6 +5,7 @@ :type="activeTab === 'addBeanConsume' ? 'primary' : 'default'" @click="navigateTo('addBeanConsume')" :disabled="!hasAdd" + style="width: 120px;" > 新增消耗 @@ -12,6 +13,7 @@ :type="activeTab === 'liveStream' ? 'primary' : 'default'" @click="navigateTo('liveStream')" :disabled="!hasLive" + style="width: 120px;" > 直播 @@ -19,6 +21,7 @@ :type="activeTab === 'dieHardFan' ? 'primary' : 'default'" @click="navigateTo('dieHardFan')" :disabled="!hasFan" + style="width: 120px;" > 铁粉 @@ -26,6 +29,7 @@ :type="activeTab === 'articleVideo' ? 'primary' : 'default'" @click="navigateTo('articleVideo')" :disabled="!hasArticleVideo" + style="width: 120px;" > 文章/视频 diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue index 36a9f88..a5415b0 100644 --- a/src/views/consume/bean/dieHardFan.vue +++ b/src/views/consume/bean/dieHardFan.vue @@ -324,17 +324,17 @@ const handleSortChange = (column) => { sortField.value = 'consumeTime' } sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC' - selectLiveBy() + ConsumeSelectBy() } const handlePageSizeChange = function (val) { getObj.value.pageSize = val - selectLiveBy() + ConsumeSelectBy() } const handleCurrentChange = function (val) { getObj.value.pageNum = val - selectLiveBy() + ConsumeSelectBy() } /* ====================计算属性================================= @@ -541,15 +541,15 @@ const getTagText = (state) => { - - + + - +
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue index 5a03d8b..5b55882 100644 --- a/src/views/consume/bean/liveStream.vue +++ b/src/views/consume/bean/liveStream.vue @@ -487,18 +487,22 @@ const getTagText = (state) => { - + +
礼物名称： - +
@@ -572,14 +576,12 @@ const getTagText = (state) => { - - + + - + - +