From 4e517dc54e1e3e5e5b543383c321161de351272e Mon Sep 17 00:00:00 2001
From: yangan <yangan0921@163.com>
Date: 星期一, 11 十一月 2024 16:05:06 +0800
Subject: [PATCH] Merge branch 'feature/jlhg/first' of http://39.96.92.240:10000/r/~fyy/unattended-app into feature/jlhg/first
---
App.vue | 81 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 34 deletions(-)
diff --git a/App.vue b/App.vue
index 727d723..aefc22f 100644
--- a/App.vue
+++ b/App.vue
@@ -1,39 +1,52 @@
<script>
-import { mapState, mapMutations } from 'vuex';
-export default {
- onShow() {},
- onLaunch() {},
- onHide() {
- console.log('appvue闅愯棌鍚庡彴');
- this.changeisconnect(false);
- console.log(this.globalisUploadimg);
- if (!this.globalisconnect && !this.globalisUploadimg) {
- uni.switchTab({
- url: '/pages/tabbar-page/index-tabbar/index-tabbar'
- });
+ import { mapState, mapMutations } from 'vuex';
+ export default {
+ onLaunch() {},
+ onHide() {
+ console.log('appvue闅愯棌鍚庡彴');
+ this.changeisconnect(false);
+ console.log(this.globalisconnect, this.globalisUploadimg, this.globalisLogin);
+
+ },
+ onShow() {
+ 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', 'is_open_socket'])
}
- },
- methods: {
- ...mapMutations(['changeisconnect'])
- },
- computed: {
- ...mapState(['globalisconnect', 'globalisUploadimg'])
- }
-};
+ };
</script>
-<style lang="scss" scoped>
-/*姣忎釜椤甸潰鍏叡css */
-@import '@/uni_modules/uview-ui/index.scss';
-@font-face {
- font-family: siYuanLight;
- src: url('https://mx.jzeg.cn:9095/appimg/fonts/siyuannormal.OTF');
-}
-@font-face {
- font-family: weighting;
- src: url('https://mx.jzeg.cn:9095/appimg/fonts/weighting.TTF');
-}
-body {
- font-family: siYuanLight, sans-serif;
-}
+<style lang="scss"
+ scoped>
+ /*姣忎釜椤甸潰鍏叡css */
+ @import '@/uni_modules/uview-ui/index.scss';
+
+ @font-face {
+ font-family: siYuanLight;
+ src: url('https://wrzs.czjlchem.com:9090/appimg/fonts/siyuannormal.OTF');
+ }
+
+ @font-face {
+ font-family: weighting;
+ src: url('https://wrzs.czjlchem.com:9090/appimg/fonts/weighting.TTF');
+ }
+
+ body {
+ font-family: siYuanLight, sans-serif;
+ }
</style>
+<style lang='scss'>
+ @import '@/utils/publicStyle.scss';
+
+</style>
\ No newline at end of file
--
Gitblit v1.9.1