diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue index b8624d4..b565096 100644 --- a/src/views/consume/gold/addCoinConsume.vue +++ b/src/views/consume/gold/addCoinConsume.vue @@ -524,7 +524,8 @@ onMounted(async function () { @@ -825,14 +821,6 @@ p { margin-bottom: 14px; } -.customer-info { - width: 700px; - float: right; - margin-right: 200px; - margin-top: 100px; -} - - .field-label { font-size: 14px; color: #606266; @@ -850,4 +838,31 @@ p { justify-content: center; gap: 12px; } + +.father1 { + width: 100%; + height: 100%; + display: flex; + + .left { + width: 35%; + float: left; + align-items: center; + } + + .right { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + + .customer-info { + width: 80%; + height: 70%; + display: flex; + justify-content: center; + align-items: center; + } + } +} diff --git a/src/views/consume/gold/coinConsume.vue b/src/views/consume/gold/coinConsume.vue index ee7824b..1186005 100644 --- a/src/views/consume/gold/coinConsume.vue +++ b/src/views/consume/gold/coinConsume.vue @@ -1,39 +1,33 @@ \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index b9621db..29a7ca7 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -90,33 +90,8 @@ 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({}) @@ -157,21 +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 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) { @@ -429,7 +404,7 @@ onMounted(async function () { // getActivity(); await getMarket() await getGoods() - // await getPlatformData() + await getPlatformData() }) @@ -576,7 +551,7 @@ const getMarket = async function () {