Browse Source

fix:时间 每周 工作台

feat: 平台对接口
youhua/chongzhi
lihui 2 months ago
parent
commit
c5906c5752
  1. 46
      src/views/consume/gold/coinConsumeDetail.vue
  2. 12
      src/views/usergold/gold/clientCountDetail.vue
  3. 4
      src/views/workspace/index.vue

46
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 () {
<div class="head-card-element">
<el-text class="mx-1" size="large">消耗平台</el-text>
<el-select v-model="consumeUser.payPlatform" placeholder="请选择消耗平台" style="width: 180px" clearable>
<el-option v-for="item in consumePlatform" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in consumePlatform" :key="item.id" :label="item.platform" :value="item.platform" />
</el-select>
</div>
</el-col>

12
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) => {
<el-text class="mx-1" size="large">平台信息</el-text>
<el-select v-model="goldDetail.payPlatform" placeholder="请选择平台信息" style="width: 160px" clearable
:loading="isLoadingPlatform">
<el-option v-for="item in platform" :key="item.value" :label="item.label" :value="item.value"/>
<el-option v-for="item in platform" :key="item.id" :label="item.platform" :value="item.platform"/>
</el-select>
</div>
</el-col>

4
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)

Loading…
Cancel
Save