From 1d2f2ede70ba67d8328fe3536fbb75ffcf5f9a34 Mon Sep 17 00:00:00 2001
From: heyujie <516346543@qq.com>
Date: 星期四, 23 六月 2022 15:25:40 +0800
Subject: [PATCH] ceshi version name
---
src/pages/desktop/index/App.vue | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/pages/desktop/index/App.vue b/src/pages/desktop/index/App.vue
index 235097f..ee89dc5 100644
--- a/src/pages/desktop/index/App.vue
+++ b/src/pages/desktop/index/App.vue
@@ -48,7 +48,10 @@
return false;
},
defaultBgUrl() {
- return JSON.parse(sessionStorage.getItem("userInfo")).backgroundpic;
+ if (JSON.parse(sessionStorage.getItem("userInfo"))) {
+ return JSON.parse(sessionStorage.getItem("userInfo")).backgroundpic;
+ }
+ return ""
},
},
created() {
@@ -103,16 +106,11 @@
});
},
methods: {
-<<<<<<< HEAD
- quit(){
- this.$refs.tools.toLogout()
+ 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