From 6c32afbe7396b7f83ae6a198f2a83ef4f9356b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=B7=E9=BE=99?= Date: Mon, 18 Aug 2025 19:05:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=8D=E5=A4=8D=E7=9A=84?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/common/ChatInputBox.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/components/common/ChatInputBox.tsx b/components/common/ChatInputBox.tsx index 60b574e..bc9c9db 100644 --- a/components/common/ChatInputBox.tsx +++ b/components/common/ChatInputBox.tsx @@ -30,15 +30,11 @@ import { AudioRecorder } from "./AudioRecorder"; import { useTemplateStoryServiceHook } from "@/app/service/Interaction/templateStoryService"; import { createScriptEpisodeNew } from "@/api/script_episode"; import { useRouter } from "next/navigation"; -<<<<<<< HEAD import { EditorContent, useEditor } from "@tiptap/react"; import StarterKit from "@tiptap/starter-kit"; import { HighlightTextExtension } from "@/components/ui/main-editor/HighlightText"; import Placeholder from "@tiptap/extension-placeholder"; import { createMovieProjectV1 } from "@/api/video_flow"; -======= -import { createMovieProjectV1 } from "@/api/video_flow"; ->>>>>>> 3a713f988f2a1b9f322258e14c192470d879eee5 // 自定义音频播放器样式 const customAudioPlayerStyles = `