tanghuan/mediate-manage-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
张运江 2025-01-20 14:36:00 +08:00
parent 1a2fb2c92d
commit 666f7cc4b9
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/mediation-page/components/MediationRoom.vue
View File

@ -367,10 +367,7 @@ export default {
elapsedTime: 0, elapsedTime: 0,
timerInterval: null, timerInterval: null,
isRunning: false, isRunning: false,
<<<<<<< HEAD
contactId: '', contactId: '',
=======
// 未接来电 // 未接来电
missedCallVisible: false, missedCallVisible: false,
missedCallData: { missedCallData: {
@ -379,7 +376,6 @@ export default {
// 视频提醒 // 视频提醒
videoReminderVisible: false, videoReminderVisible: false,
videoReminderData: {} videoReminderData: {}
>>>>>>> 5d050e83e2826b0ae129388b597928682f1bcc9a
}; };
}, },
computed: { computed: {