From 584587a9d9932762aad2d27027be348c810926d0 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期四, 06 一月 2022 10:09:34 +0800
Subject: [PATCH] 冲突解决
---
src/pages/desktop/index/App.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index a3b84ef..4b2728b 100644
--- a/src/pages/desktop/index/App.vue
+++ b/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 + ")";
--
Gitblit v1.8.0