sileya-ai
/
vr-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

v1.0.0
于肖磊 2024-08-12 17:40:10 +08:00
parent 511f6bf6c6
commit d1f060888d
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.eslintrc-auto-import.json
View File

@ -283,12 +283,8 @@
"watchThrottled": true, "watchThrottled": true,
"watchTriggerable": true, "watchTriggerable": true,
"watchWithFilter": true, "watchWithFilter": true,
<<<<<<< HEAD
"whenever": true
=======
"whenever": true, "whenever": true,
"ElMessageBox": true, "ElMessageBox": true,
"ElMessage": true "ElMessage": true
>>>>>>> master
} }
} }

2
src/components/common/hot/index.vue
View File

@ -1,6 +1,6 @@
<!-- 上传组件 --> <!-- 上传组件 -->
<template> <template>
<el-dialog v-model="dialog_visible" append-to-body fullscreen @close="close_event"> <el-dialog v-model="dialog_visible" fullscreen @close="close_event">
<template #header> <template #header>
<div class="title re"> <div class="title re">
<div class="tc size-16 fw">编辑热区</div> <div class="tc size-16 fw">编辑热区</div>