From 96aeb2a232d85306ced2061f024a2ff491a92ff7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 25 七月 2024 17:47:12 +0800
Subject: [PATCH] fix bug
---
App.vue | 217 ++++++++++++++++++++++++++++--------------------------
1 files changed, 113 insertions(+), 104 deletions(-)
diff --git a/App.vue b/App.vue
index d279b31..773aab4 100644
--- a/App.vue
+++ b/App.vue
@@ -1,105 +1,114 @@
-<script>
- import storage from '@/plugins/storage.js'
-
- export default {
- onLaunch: function(options) {
-
- // #ifdef MP
- // {
- // if(decodeURIComponent(options.query.q))
- // if (options.inviter) {
- // //说明是邀请的，需要保存下来,
- // this.$storage.setItem('inviter', options.inviter)
- // //有效24小时
- // this.$storage.setItem('inviterTime', new Date().getTime())
-
- // }
- // if (options.inviterName) {
- // this.$storage.setItem('inviterName', options.inviterName)
- // this.inviterName = options.inviterName
- // }else{
- // this.inviterName = this.$storage.getItem('inviterName') || ''
- // }
- // }
- // #endif
- console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
- console.log('App Launch')
- uni.getSystemInfo({
- success: (e) => {
- // this.globalData.StatusBar = e.statusBarHeight;
- let custom = uni.getMenuButtonBoundingClientRect();
- // this.globalData.Custom = custom;
- // this.globalData.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
- uni.setStorageSync('StatusBar', e.statusBarHeight);
- uni.setStorageSync('CustomBar', (custom.bottom + custom.top - e.statusBarHeight));
- }
- });
- // #ifdef MP
- if (true && storage.getItem('token')) {
- setTimeout(async () => {
- const res = await this.$store.dispatch('getCurrentInfo');
- // console.log('init info',res,this.currentInfo)
- if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
- uni.reLaunch({
- url: '/pages/home/farmer-home'
- })
- }
- }, 200);
- } else {
-
- }
- // #endif
- },
-
- onReady() {
- //做token判断
- // this.check_login()
- },
- onShow: function() {
- console.log('App Show')
- },
- onHide: function() {
- console.log('App Hide')
- },
-
- }
-</script>
-
-<style lang="scss">
- /*每个页面公共css */
- @import '@/uni_modules/uni-scss/index.scss';
- /* #ifndef APP-NVUE */
- @import '@/static/customicons.css';
-
- // 设置整个项目的背景色
- page {
- background-color: #f5f5f5;
- }
-
- @import '@/common/self.scss';
- @import '@/common/icons.scss';
- @import '@/common/global.scss';
-
- /* #endif */
- .example-info {
- font-size: 14px;
- color: #333;
- padding: 10px;
- }
- // uni-rich-text img{
- // max-width: 100% !important;
- // }
- .rich /deep/ img{
- max-width: 600rpx !important;
- }
- .rich /deep/ image{
- max-width: 600rpx !important;
- }
-
- .rich2 /deep/ img{
- max-width: 400rpx !important;
- }
- .rich2 /deep/ image{
- max-width: 400rpx !important;
- }
+<script>
+ // 合伙人： "appid" : "wx6d0ecc4e18710458",
+ // 花农： "appid" : "wx3203fd935a6ffe09",
+ // 花店 wx1441324401626290
+ import storage from '@/plugins/storage.js'
+
+ export default {
+ onLaunch: function(options) {
+
+ console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
+ console.log('App Launch')
+ uni.getSystemInfo({
+ success: (e) => {
+ try {
+ let custom = uni.getMenuButtonBoundingClientRect();
+ uni.setStorageSync('StatusBar', e.statusBarHeight);
+ uni.setStorageSync('CustomBar', (custom.bottom + custom.top - e.statusBarHeight));
+ } catch (e) {
+ console.error('e', e)
+ }
+ }
+ });
+ // #ifdef MP
+ if (true && storage.getItem('token')) {
+ setTimeout(async () => {
+ const res = await this.$store.dispatch('getCurrentInfo');
+ // #ifndef PUB_CUSTOMER
+ if (this.currentInfo && this.currentInfo.id && !this.currentInfo.openId) {
+ uni.reLaunch({
+ url: '/pages/home/supplier-home'
+ })
+ } else {
+ uni.reLaunch({
+ url: '/pages/login/supplier-login'
+ })
+ }
+ // #endif
+ }, 200);
+ } else {
+ // #ifndef PUB_CUSTOMER
+ uni.reLaunch({
+ url: '/pages/login/supplier-login'
+ })
+ // #endif
+ }
+ // #endif
+ // #ifdef PUB_CUSTOMER
+ uni.reLaunch({
+ url: '/pages/home/home'
+ })
+ // #endif
+
+ },
+
+ onReady() {
+ //做token判断
+ // this.check_login()
+ },
+ onShow: function() {
+ console.log('App Show')
+ },
+ onHide: function() {
+ console.log('App Hide')
+ },
+
+ }
+</script>
+
+<style lang="scss">
+ /*每个页面公共css */
+ @import '@/uni_modules/uni-scss/index.scss';
+ /* uni.scss */
+
+ // @import "@/uni_modules/uview-plus/index.scss";
+ @import "uview-ui/index.scss";
+
+ /* #ifndef APP-NVUE */
+ @import '@/static/customicons.css';
+
+ // 设置整个项目的背景色
+ page {
+ background-color: #f5f5f5;
+ }
+
+ @import '@/common/self.scss';
+ @import '@/common/icons.scss';
+ @import '@/common/global.scss';
+
+ /* #endif */
+ .example-info {
+ font-size: 14px;
+ color: #333;
+ padding: 10px;
+ }
+
+ // uni-rich-text img{
+ // max-width: 100% !important;
+ // }
+ .rich /deep/ img {
+ max-width: 600rpx !important;
+ }
+
+ .rich /deep/ image {
+ max-width: 600rpx !important;
+ }
+
+ .rich2 /deep/ img {
+ max-width: 400rpx !important;
+ }
+
+ .rich2 /deep/ image {
+ max-width: 400rpx !important;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3