renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into test_多平台

Browse Source
This commit is contained in:
rd
2025-08-19 10:46:37 +08:00
parent 4e3d519ed2 df782e4374
commit f568b4509c
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/creative-generation-workshop/explore/detail/index.vue
View File

@ -90,10 +90,10 @@ export default {
if (isVideo.value) {
return (
<div class="main-video-box mb-16px relative overflow-hidden cursor-pointer" onClick={togglePlay}>
<video ref={videoRef} class="w-100% h-100% object-cover" onEnded={onVideoEnded}></video>
<video ref={videoRef} class="w-100% h-100% object-contain" onEnded={onVideoEnded}></video>
{!isPlaying.value && (
<>
<img src={coverImageUrl.value} class="w-100% h-100% object-cover absolute z-0 top-0 left-0" />
<img src={coverImageUrl.value} class="w-100% h-100% object-contain absolute z-0 top-0 left-0" />
<div v-show={!isPlaying.value} class="play-icon"></div>
</>
)}

5
src/views/property-marketing/media-account/account-dashboard/components/account-table/index.vue
View File

@ -74,7 +74,7 @@
</template>
<template v-if="column.dataIndex === 'platform'" #cell="{ record }">
{{ record.platform === 0 ? '抖音' : record.platform === 1 ? '小红书' : '-' }}
<img :src="getMediaAccountPlatformLogo(record.platform)" width="20" height="20" class="rounded-4px" />
</template>
<template v-else-if="column.dataIndex === 'status'" #cell="{ record }">
<StatusBox :item="record" class="w-fit h-28px" />
@ -141,6 +141,7 @@
<template v-else #cell="{ record }">
{{ formatTableField(column, record, true) }}
</template>
</a-table-column>
<a-table-column data-index="operation" fixed="right" width="100" title="操作">
<template #cell="{ record }">
@ -165,6 +166,7 @@ import { useRouter } from 'vue-router';
import { getCustomColumns } from '@/api/all/common';
import StatusBox from '@/views/property-marketing/media-account/components/status-select/status-box.tsx';
import { formatTableField, formatNumberShow, exactFormatTime } from '@/utils/tools';
import { getMediaAccountPlatformLogo } from '@/utils/platform';
import { getDefaultColumns, getPropPrefix } from '@/views/property-marketing/media-account/account-dashboard/constants';
import CustomTableColumnModal from '../custom-column-modal';
@ -207,6 +209,7 @@ const dateType = computed(() => (props.query.type === 7 ? 'week' : 'month'));
const tableColumns = computed(() => {
const _result = [];
const _columns = getDefaultColumns(dateType.value);
console.log({_columns})
selectedColumns.value.forEach((item) => {
const _column = _columns.find((_item) => _item.prop === item);

7
src/views/property-marketing/media-account/account-dashboard/constants.ts
View File

@ -71,6 +71,13 @@ export const getDefaultColumns = (type = 'week') => {
width: 180,
fixed: 'left',
},
{
title: '平台',
dataIndex: 'platform',
prop: 'platform',
width: 120,
fixed: 'left',
},
{
title: '账号分组',
dataIndex: 'group.name',

5
src/views/property-marketing/media-account/account-detail/components/account-info/index.vue
View File

@ -88,7 +88,7 @@
}}
</template>
<template v-else-if="field.dataIndex === 'platform'">
<img :src="detailData.platform === 0 ? icon5 : icon6" width="16" height="16" />
<img :src="getMediaAccountPlatformLogo(detailData.platform)" width="16" height="16" class="rounded-4px" />
</template>
<template v-else-if="field.dataIndex === 'last_synced_at'">
{{ exactFormatTime(detailData.last_synced_at, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD HH:mm:ss') }}
@ -133,6 +133,7 @@
import { useRoute } from 'vue-router';
import { formatTableField, formatNumberShow, exactFormatTime } from '@/utils/tools';
import { getMediaAccountPlatformLogo } from '@/utils/platform';
import { getAccountInfoFields } from '../../constants';
import { getPropPrefix } from '@/views/property-marketing/media-account/account-dashboard/constants';
import StatusBox from '@/views/property-marketing/media-account/components/status-select/status-box.tsx';
@ -143,8 +144,6 @@ import icon1 from '@/assets/img/media-account/icon5.png';
import icon2 from '@/assets/img/media-account/icon-warn.png';
import icon3 from '@/assets/img/media-account/icon-warn-1.png';
import icon4 from '@/assets/img/media-account/icon-success.png';
import icon5 from '@/assets/img/platform/icon-dy.png';
import icon6 from '@/assets/img/platform/icon-xhs.png';
const route = useRoute();
const id = route.params.id;