From 27344d284e9977343964d1e4e616f7d41204b9a5 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 19 Dec 2025 16:18:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=A2=91=E9=81=93=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=91=E9=81=93=E6=98=BE=E7=A4=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/channelManage/fans/fans.vue     | 27 ++++++++++++++++++++++---
 src/views/channelManage/reward/reward.vue | 33 +++++++++++++++++++++++++------
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue
index 8e8008f..5911a2e 100644
--- a/src/views/channelManage/fans/fans.vue
+++ b/src/views/channelManage/fans/fans.vue
@@ -57,7 +57,8 @@ const beanConsumeFan = ref({
 })
 // 频道列表
 const channels = ref([])
-// 获取频道列表的方法
+const showChannelFilter = ref(false)
+
 const getChannel = async function () {
   try {
     const result = await request({
@@ -76,6 +77,26 @@ const getChannel = async function () {
     })
   }
 }
+
+const getRoleChannel = async function () {
+  try {
+    if (!adminData.value || !adminData.value.roleId) {
+      showChannelFilter.value = true
+      return
+    }
+    const result = await request({
+      url: '/beanConsume/getRoleChannel',
+      data: { roleId: adminData.value.roleId }
+    })
+    const data = result.data ?? result
+    const channelName = typeof data === 'string' ? data : data.channelName
+    const allLabel = t('common.all')
+    showChannelFilter.value = channelName === allLabel || channelName === '全部'
+  } catch (error) {
+    console.log('请求角色频道失败', error)
+    showChannelFilter.value = true
+  }
+}
 // // 频道模糊查询方法
 // const filterChannel = (query) => {
 //   if (query) {
@@ -390,10 +411,10 @@ const handleCurrentChange = function (val) {
 
 onMounted(async function () {
   await getAdminData()
+  await getRoleChannel()
   await ConsumeSelectBy()
   await getChannel()
   await getDept()
-
 })
 
 
@@ -500,7 +521,7 @@ const getTagText = (state) => {
   <el-card class="card1" style="margin-bottom: 0.5vh;">
     <el-col style="margin-bottom: 1vh">
       <div class="select">
-        <div class="selectRow">
+        <div class="selectRow" v-if="showChannelFilter">
           <el-text class="text">{{ t('common.jwcode') }}：</el-text>
           <el-input class="selectContent" v-model="beanConsumeFan.jwcode" :placeholder="t('common.jwcodePlaceholder')" clearable />
         </div>
diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue
index 4532112..b2fa03b 100644
--- a/src/views/channelManage/reward/reward.vue
+++ b/src/views/channelManage/reward/reward.vue
@@ -40,7 +40,6 @@ const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
 /*
 ====================数据=================================
 */
-//这是获取用户信息的接口
 const adminData = ref({})
 // 充值明细表格
 const tableData = ref([])
@@ -83,7 +82,8 @@ const getGift = async function () {
 
 // 频道列表
 const channels = ref([])
-// 获取频道列表的方法
+const showChannelFilter = ref(false)
+
 const getChannel = async function () {
   try {
     const result = await request({
@@ -103,6 +103,26 @@ const getChannel = async function () {
   }
 }
 
+const getRoleChannel = async function () {
+  try {
+    if (!adminData.value || !adminData.value.roleId) {
+      showChannelFilter.value = true
+      return
+    }
+    const result = await request({
+      url: '/beanConsume/getRoleChannel',
+      data: { roleId: adminData.value.roleId }
+    })
+    const data = result.data ?? result
+    const channelName = typeof data === 'string' ? data : data.channelName
+    const allLabel = t('common.all')
+    showChannelFilter.value = channelName === allLabel || channelName === '全部'
+  } catch (error) {
+    console.log('请求角色频道失败', error)
+    showChannelFilter.value = true
+  }
+}
+
 // 抽离类型选项到响应式数组
 const consumeTypes = ref([
   {label: t('consume.consumeTypes.1'), value: 1},
@@ -402,10 +422,11 @@ const handleCurrentChange = function (val) {
 
 onMounted(async function () {
   await getAdminData()
-  await selectLiveBy()
+  await getRoleChannel()
   await getDept()
-  await getGift()
+  await selectLiveBy()
   await getChannel()
+  await getGift()
 })
 
 
@@ -538,7 +559,7 @@ const getTagText = (state) => {
             <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
-        <div class="selectRow" style="width: 14vw;">
+        <div class="selectRow" style="min-width: 14vw;">
           <el-text class="text">{{ t('common.giftName') }}：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.gift" :placeholder="t('common.giftNamePlaceholder')" clearable
                      filterable
@@ -546,7 +567,7 @@ const getTagText = (state) => {
             <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
-        <div class="selectRow" style="min-width: 12vw;">
+        <div class="selectRow" style="min-width: 12vw;" v-if="showChannelFilter">
           <el-text class="textB" size="large">{{ t('common.channel') }}：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.liveChannel" :placeholder="t('common.channelPlaceholder')" clearable
                      filterable allow-create default-first-option>