Merge branch 'zhangrenyuan/feature-20250728113353-金币前端三期' into milestone-20250728-金币前端三期

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) => {
                 }}
               </template>
             </el-table-column>
-            <el-table-column prop="beanNum" label="金豆总数" sortable="custom" width="120px">
-              
-            </el-table-column>
-            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px">
-              
-            </el-table-column>
-            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px">
-              
-            </el-table-column>
+            <el-table-column prop="beanNum" label="金豆总数" sortable="custom" width="120px"/>
+            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
+            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
             <el-table-column prop="articleId" label="文章/视频ID" width="150px" />
             <el-table-column prop="articleName" label="文章/视频标题" width="200px" show-overflow-tooltip />
             <el-table-column prop="author" label="作者" width="120px" />

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) => {
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
             <el-table-column prop="dept" label="地区" width="110px" />
             <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px"/>
+            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
+            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
             <el-table-column prop="channel" label="频道" width="190px" />
             <el-table-column prop="type" label="会员类型" width="120px" >
               <template #default="scope">

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) => {
             <el-table-column prop="gift" label="礼物" width="140px" >
               
             </el-table-column>
-            <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px">
+            <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px"/>
+            <el-table-column prop="isBackpack" label="背包礼物" width="120px">
+              <template #default="scope"> 
+                {{ scope.row.isBackpack === 1 ? '是' : '否' }}
+              </template>
             </el-table-column>
+            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
+            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
             <el-table-column prop="liveChannel" label="频道" width="180px" />
             <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
             <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />