From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/App.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/h5/App.vue b/h5/App.vue
index 487c8ad..04a031d 100644
--- a/h5/App.vue
+++ b/h5/App.vue
@@ -1,8 +1,13 @@
<script>
-import { wxAuthorize, refreshToken } from '@/api'
+import { wxAuthorize, refreshToken, app_url } from '@/api'
export default {
onLaunch: function () {
-
+ window.addEventListener("popstate", (event) => {
+ const path = this.$route.fullPath
+ if(path == '/pages/login/login' || path == '/'){
+ window.location.href = app_url
+ }
+ })
},
onShow: function () {
console.log('App Show')
@@ -16,7 +21,11 @@
<style lang="scss">
/*姣忎釜椤甸潰鍏叡css */
@import "uview-ui/index.scss";
-
+html, body {
+ height: auto;
+ min-height: 100%;
+ overflow: visible;
+}
.flex-cb {
display: flex;
justify-content: space-between;
@@ -191,7 +200,7 @@
}
.main_app {
- padding: 0 30rpx 30rpx;
+ padding: 10rpx 30rpx 30rpx;
font-size: 28rpx;
color: #333333;
}
--
Gitblit v1.9.3