src/pages/desktop/index/App.vue
@@ -103,16 +103,11 @@ }); }, methods: { <<<<<<< HEAD quit(){ this.$refs.tools.toLogout() }, onJumpToDock(name){ this.$refs.dock_model.onJumpToDock(name) ======= onJumpToDock(name) { this.$refs.dock_model.onJumpToDock(name); >>>>>>> ca43456ba7e5a27fdeaebb8293ddda90962ac42e }, onChangeBg(v) { document.getElementById("app").style.backgroundImage = "url(" + v + ")";