Merge branch 'merge_music' into ol_12_30

src/views/teamBuild/components/merge-music.vue

@@ -43,6 +43,7 @@
       append-to-body
     >
       <mergedStudents
+        v-if="studentsVisible"
         @close="studentsVisible = false"
         @submited="submited"
       />
@@ -138,6 +139,7 @@ export default {
           registerIds: allId
         })
         this.$message.success('合并成功')
+        this.$emit('close')
         this.$emit('submited')
       } catch (error) {}
     },