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

@@ -1,6 +1,11 @@
<script lang="ts" setup>
import { Music, News, VideoPlayer, VoicePlayer } from '#/views/mp/components';
// DONE @hw迁移到 /apps/web-antd/src/views/mp/autoReply/modules 里;组件名可能要换一个,= = 之前写的不太好;类似 content.vue ?本质是内容~
import {
WxMusic,
WxNews,
WxVideoPlayer,
WxVoicePlayer,
} from '#/views/mp/components';
defineOptions({ name: 'ReplyContentCell' });
const props = defineProps<{
@@ -14,7 +19,7 @@ const props = defineProps<{
{{ props.row.responseContent }}
</div>
<div v-else-if="props.row.responseMessageType === 'voice'">
<VoicePlayer
<WxVoicePlayer
v-if="props.row.responseMediaUrl"
:url="props.row.responseMediaUrl"
/>
@@ -30,17 +35,17 @@ const props = defineProps<{
props.row.responseMessageType === 'shortvideo'
"
>
<VideoPlayer
<WxVideoPlayer
v-if="props.row.responseMediaUrl"
:url="props.row.responseMediaUrl"
style="margin-top: 10px"
/>
</div>
<div v-else-if="props.row.responseMessageType === 'news'">
<News :articles="props.row.responseArticles" />
<WxNews :articles="props.row.responseArticles" />
</div>
<div v-else-if="props.row.responseMessageType === 'music'">
<Music
<WxMusic
:title="props.row.responseTitle"
:description="props.row.responseDescription"
:thumb-media-url="props.row.responseThumbMediaUrl"

View File

@@ -1,5 +1,5 @@
<script lang="ts" setup>
import type { Reply } from '#/views/mp/components/reply/types';
import type { Reply } from '#/views/mp/components';
import { computed, nextTick, ref } from 'vue';
@@ -10,7 +10,7 @@ import { message } from 'ant-design-vue';
import { useVbenForm } from '#/adapter/form';
import { createAutoReply, updateAutoReply } from '#/api/mp/autoReply';
import { $t } from '#/locales';
import { ReplyType } from '#/views/mp/components/reply/types';
import { ReplyType } from '#/views/mp/components/constants';
import { useFormSchema } from '../data';
import { MsgType } from '../types';