fix: 冲突

This commit is contained in:
hw
2025-11-14 11:18:50 +08:00
526 changed files with 42388 additions and 3716 deletions

View File

@@ -11,7 +11,6 @@ import { useAccessStore } from '@vben/stores';
import { Button, Image, message, Modal, Upload } from 'ant-design-vue';
import { UploadType, useBeforeUpload } from '#/utils/useUpload';
import { MaterialSelect } from '#/views/mp/components';
const props = defineProps<{
isFirst: boolean;

View File

@@ -1,7 +1,7 @@
<script lang="ts" setup>
import type { Article } from './types';
import { News } from '#/views/mp/components';
import { WxNews } from '#/views/mp/components';
defineOptions({ name: 'DraftTableCell' });
@@ -13,7 +13,7 @@ const props = defineProps<{
<template>
<div class="p-2.5">
<div v-if="props.row.content && props.row.content.newsItem">
<News :articles="props.row.content.newsItem" />
<WxNews :articles="props.row.content.newsItem" />
</div>
</div>
</template>

View File

@@ -23,7 +23,7 @@ interface Article {
updateTime: number;
}
const createEmptyNewsItem = (): NewsItem => {
function createEmptyNewsItem(): NewsItem {
return {
title: '',
thumbMediaId: '',
@@ -36,7 +36,7 @@ const createEmptyNewsItem = (): NewsItem => {
onlyFansCanComment: 0,
thumbUrl: '',
};
};
}
export type { Article, NewsItem, NewsItemList };
export { createEmptyNewsItem };