From c0a3d0ab3c33dac267bb1afbafef8d4b1b34be75 Mon Sep 17 00:00:00 2001 From: lihui Date: Sun, 24 Aug 2025 14:25:41 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=B9=B3=E5=8F=B0=20=E8=B0=81?= =?UTF-8?q?=E6=94=B9=E4=BA=86=E6=88=91=E7=9A=84=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/gold/coinConsumeDetail.vue | 47 +++-- src/views/usergold/gold/clientCountDetail.vue | 267 +++++++++++++------------- 2 files changed, 164 insertions(+), 150 deletions(-) diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index 4e0426d..8c69cc9 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -90,7 +90,33 @@ const sortField = ref('') const sortOrder = ref('') // 消费平台选项 -const consumePlatform = ref([]); +const consumePlatform = [ + { + value: '金币系统', + label: '金币系统' + }, + + { + value: 'HomilyChart', + label: 'HomilyChart' + }, + { + value: 'HomilyLink', + label: 'HomilyLink' + }, + { + value: 'ERP', + label: 'ERP' + }, + { + value: '其他', + label: '其他' + }, + { + value: '初始化金币', + label: '初始化金币' + }, +] // 合计数的显示数据 const tableDataTotal = ref({}) @@ -132,21 +158,6 @@ const getAdminData = async function () { console.log('请求失败', error) } } -// 平台 -const getPlatformData = async function () { - try { - const result = await request({ - url: '/general/platform', - }) - if (result.code === 200){ - consumePlatform.value = result.data - console.log('平台信息', consumePlatform.value) - console.log('请求成功', result) - } - } catch (error) { - console.log('请求失败', error) - } -} const ConsumeSelectBy = async function (val) { @@ -404,7 +415,7 @@ onMounted(async function () { // getActivity(); await getMarket() await getGoods() - await getPlatformData() + // await getPlatformData() }) @@ -577,7 +588,7 @@ const getMarket = async function () {
消耗平台: - +
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index 21f97e6..e49ae38 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -60,10 +60,13 @@ const getPlatform = async () => { const result = await API({ url: '/general/platform', method: 'post', - data: {}// 这里添加参数 }) - - platform.value = result.data + if (Array.isArray(result.data)) { + platform.value = result.data.map(item => ({value: item, label: item})); + } else { + console.error('平台信息格式错误', result) + ElMessage.error('平台信息格式错误,请联系管理员') + } } catch (error) { console.error('获取平台信息失败:', error); @@ -166,7 +169,7 @@ const get = async function (val) { const result = await API({ url: '/goldDetail/getGoldDetail', method: 'post', - data: {...getObj.value, goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 0 : 1}} + data: {...getObj.value, goldDetail: {...goldDetail.value, flag: showEmployeeData.value ? 0 : 1}} }) console.log('响应数据', result) tableData.value = result.data.list @@ -187,7 +190,7 @@ const get = async function (val) { url: '/goldDetail/getTotal', method: 'post', data: { - goldDetail: {...goldDetail.value, flag: showEmployeeData.value? 0 : 1}, + goldDetail: {...goldDetail.value, flag: showEmployeeData.value ? 0 : 1}, /* jwcode: goldDetail.value.jwcode || '', payPlatform: goldDetail.value.payPlatform || '', type: goldDetail.value.type || '', @@ -490,142 +493,142 @@ const format3 = (num) => {