From 217808e8c83d7d665aea720b0d59a4085e7012e1 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 12 三月 2024 15:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
App.vue | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/App.vue b/App.vue
index 72d23d5..bef369a 100644
--- a/App.vue
+++ b/App.vue
@@ -9,16 +9,20 @@
},
onShow() {
- console.log('appvueZI鏄剧ず');
- if (!this.globalisconnect && !this.globalisUploadimg) {
- this.$store.dispatch('websocketInit')
+ console.log('appvue鏄剧ず');
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(true);
+ console.log('appvue鐨剋s');
+ }
}
},
methods: {
...mapMutations(['changeisconnect'])
},
computed: {
- ...mapState(['globalisconnect', 'globalisUploadimg', 'globalisLogin'])
+ ...mapState(['globalisconnect', 'globalisUploadimg', 'globalisLogin', 'is_open_socket'])
}
};
</script>
@@ -30,12 +34,12 @@
@font-face {
font-family: siYuanLight;
- src: url('https://mx.jzeg.cn:9095/appimg/fonts/siyuannormal.OTF');
+ src: url('https://mx.jzeg.cn:9096/appimg/fonts/siyuannormal.OTF');
}
@font-face {
font-family: weighting;
- src: url('https://mx.jzeg.cn:9095/appimg/fonts/weighting.TTF');
+ src: url('https://mx.jzeg.cn:9096/appimg/fonts/weighting.TTF');
}
body {
--
Gitblit v1.9.1