冲突解决

ZZJ

2022-01-06 584587a9d9932762aad2d27027be348c810926d0

 src/pages/desktop/index/App.vue

@@ -1,7 +1,7 @@
<template>
  <div id="app" @contextmenu.prevent>
    <tools @jumpToDock="onJumpToDock"></tools>
    <desktop ref="desktop"></desktop>
    <tools ref="tools" @jumpToDock="onJumpToDock"></tools>
    <desktop @quit="quit" ref="desktop"></desktop>
    <tools-entry @changeBackground="onChangeBg" ref="dock_model"></tools-entry>
    <notice-tip ref="notice_tip_model"></notice-tip>
    <notification-center></notification-center>
@@ -103,8 +103,11 @@
    });
  },
  methods: {
    onJumpToDock(name) {
      this.$refs.dock_model.onJumpToDock(name);
    quit(){
      this.$refs.tools.toLogout()
    },
    onJumpToDock(name){
      this.$refs.dock_model.onJumpToDock(name)
    },
    onChangeBg(v) {
      document.getElementById("app").style.backgroundImage = "url(" + v + ")";