From 40ce9965257472d715d072647796ac91c3932d73 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期一, 18 九月 2023 17:49:00 +0800
Subject: [PATCH] 修改合卡
---
App.vue | 80 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 35 deletions(-)
diff --git a/App.vue b/App.vue
index 681a4b3..e7e6c3c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,38 +1,48 @@
<script>
-export default {
- onShow() {},
- methods: {}
- // created() {
- // uni.loadFontFace({
- // family: 'siYuanLight', // 瀛椾綋鍚嶇О锛屽彲浠ヨ嚜瀹氫箟
- // source: 'url("/utils/fonts/siyuan.OTF")', // 瀛椾綋鏂囦欢璺緞
- // success() {
- // console.log('瀛椾綋鍔犺浇鎴愬姛');
- // },
- // fail() {
- // console.log('瀛椾綋鍔犺浇澶辫触');
- // }
- // });
- // }
-};
+ 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(false);
+ console.log('appvue鐨剋s');
+ }
+ }
+ },
+ methods: {
+ ...mapMutations(['changeisconnect'])
+ },
+ computed: {
+ ...mapState(['globalisconnect', 'globalisUploadimg', 'globalisLogin', 'is_open_socket'])
+ }
+ };
</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/siyuan.OTF');
-}
-@font-face {
- font-family: weighting;
- src: url('https://mx.jzeg.cn:9095/appimg/fonts/weighting.TTF');
-}
-body {
- font-family: siYuanLight, sans-serif;
-}
-// @font-face {
-// font-family: 'weighting';
-// src: url('./utils/fonts/weighing.TTF');
-// }
-</style>
+<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>
\ No newline at end of file
--
Gitblit v1.9.1