diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index 1c440f8..7d14354 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -90,33 +90,7 @@ const sortField = ref('') const sortOrder = ref('') // 消费平台选项 -const consumePlatform = [ - { - value: '金币系统', - label: '金币系统' - }, - - { - value: 'HomilyChart', - label: 'HomilyChart' - }, - { - value: 'HomilyLink', - label: 'HomilyLink' - }, - { - value: 'ERP', - label: 'ERP' - }, - { - value: '其他', - label: '其他' - }, - { - value: '初始化金币', - label: '初始化金币' - }, -] +const consumePlatform = ref([]); // 合计数的显示数据 const tableDataTotal = ref({}) @@ -158,6 +132,21 @@ 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) { @@ -411,6 +400,7 @@ onMounted(async function () { // getActivity(); await getMarket() await getGoods() + await getPlatformData() }) @@ -583,7 +573,7 @@ const getMarket = async function () {
消耗平台: - +
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index c04c1cc..0bb5fb6 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -62,13 +62,9 @@ const getPlatform = async () => { method: 'post', data: {}// 这里添加参数 }) - // 假设后端返回的是字符串数组,转换为 { value, label } 格式 - if (Array.isArray(result.data)) { - platform.value = result.data.map(item => ({value: item, label: item})); - } else { - console.error('平台信息格式错误', result) - ElMessage.error('平台信息格式错误,请联系管理员') - } + + platform.value = result.data + } catch (error) { console.error('获取平台信息失败:', error); ElMessage.error('获取平台信息失败,请稍后重试'); @@ -507,7 +503,7 @@ const format3 = (num) => { 平台信息: - + diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue index 72444a8..4dc6c18 100644 --- a/src/views/workspace/index.vue +++ b/src/views/workspace/index.vue @@ -313,8 +313,8 @@ const getToday = function () { // 本周 const getWeek = function () { const today = dayjs() - const startTime = (today.startOf('week').format('YYYY-MM-DD HH:mm:ss')) - const endTime = today.endOf('week').format('YYYY-MM-DD HH:mm:ss') + const startTime =((today.startOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss')) + const endTime = (today.endOf('week').add(1, 'day')).format('YYYY-MM-DD HH:mm:ss') // const endTime = today.add(1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD HH:mm:ss') dateRange.value = [startTime, endTime] console.log('看看dateRange', dateRange.value)