From 4e811c3f254a9254176d6a4acb2970919e17d149 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Thu, 7 Aug 2025 18:05:18 +0800
Subject: [PATCH] fix consume bug and feat backpack column
---
.env.development | 2 +-
src/views/consume/bean/articleVideo.vue | 14 ++++----------
src/views/consume/bean/dieHardFan.vue | 6 ++++++
src/views/consume/bean/liveStream.vue | 13 ++++++++++++-
4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/.env.development b/.env.development
index 295cf73..a04d469 100644
--- a/.env.development
+++ b/.env.development
@@ -11,4 +11,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/'
# 本地
- # VITE_API_BASE='http://localhost:8081/'
+ # VITE_API_BASE='http://localhost:8081/'
\ No newline at end of file
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index f7b7e83..37c3248 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -200,7 +200,7 @@ const ConsumeSelectBy = async function (val) {
return true;
});
tableData.value = filteredList;
- total.value = filteredList.length;
+
}
// 合计数的接口
@@ -568,15 +568,9 @@ const getTagText = (state) => {
}}
-
-
-
-
-
-
-
-
-
+
+
+
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 00109b5..f776da3 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -332,6 +332,10 @@ 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()
@@ -548,6 +552,8 @@ const getTagText = (state) => {
+
+
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 3a3d6e1..b55382d 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -213,6 +213,7 @@ const selectLiveBy = async function (val) {
type: beanConsumeLive.value.type || '',
gift: beanConsumeLive.value.gift || '',
beanNum: beanConsumeLive.value.beanNum || '',
+ isBackpack: beanConsumeLive.value.isBackpack || '',
liveChannel: beanConsumeLive.value.liveChannel || '',
liveName: beanConsumeLive.value.liveName || '',
startTime: beanConsumeLive.value.startTime || '',
@@ -342,6 +343,10 @@ 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'
selectLiveBy()
@@ -603,8 +608,14 @@ const getTagText = (state) => {
-
+
+
+
+ {{ scope.row.isBackpack === 1 ? '是' : '否' }}
+
+
+