From 5b38bbfd1cd075253990b8477e8713540ae228b8 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 11 一月 2022 11:26:04 +0800
Subject: [PATCH] 暂存
---
src/pages/desktop/index/App.vue | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 235097f..4b2728b 100644
--- a/src/pages/desktop/index/App.vue
+++ b/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 + ")";
--
Gitblit v1.8.0