scout666/chat-pc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: scout666:576e950650631423282f383851540fe71863fd10
Branches Tags
scout666:main
scout666:dev
scout666:yink
scout666:wyfMain-dev
scout666:xingyy
scout666:main-backup
...
compare: scout666:4b7c69ea367d368987f4b6e9cf618bc73b57d03c
Branches Tags
scout666:main
scout666:dev
scout666:yink
scout666:wyfMain-dev
scout666:xingyy
scout666:main-backup

2 Commits
576e950650 ... 4b7c69ea36

Author SHA1 Message Date
Phoenix
4b7c69ea36 Merge branch 'dev' of http://172.16.100.91:3000/scout666/chat-pc into dev 2025-06-24 16:01:27 +08:00
Phoenix
f5ca14f746 test构建 2025-06-24 16:01:26 +08:00
1 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

6
src/views/message/inner/panel/PanelFooter.vue
View File

@ -16,7 +16,7 @@ import Editor from '@/components/editor/Editor.vue'
import MultiSelectFooter from './MultiSelectFooter.vue'
import HistoryRecord from '@/components/talk/HistoryRecord.vue'
import {scrollToBottom} from '@/utils/dom.ts'
import CustomEditor from '@/components/editor/CustomEditor.vue'
// import CustomEditor from '@/components/editor/CustomEditor.vue'
const userStore = useUserStore()
const talkStore = useTalkStore()
const editorStore = useEditorStore()
@ -294,8 +294,8 @@ onMounted(() => {
<footer class="el-footer">
<MultiSelectFooter v-if="dialogueStore.isOpenMultiSelect" />
<!-- <Editor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" /> -->
<CustomEditor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" />
<Editor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" />
<!-- <CustomEditor v-else @editor-event="onEditorEvent" :vote="talk_type == 2" :members="members" /> -->
</footer>
<HistoryRecord