From 086549723cc16684445f6ce16701d7c52607da5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?=
 <1518079521@qq.com>
Date: Sat, 3 Jun 2023 18:28:30 +0800
Subject: [PATCH] update uni-app

---
 uni-app/App.vue    | 127 +++++++++++++++++++++++----------------------
 uni-app/pages.json |  52 ++++++++++---------
 2 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/uni-app/App.vue b/uni-app/App.vue
index 1370b5c80..d89c78d62 100644
--- a/uni-app/App.vue
+++ b/uni-app/App.vue
@@ -1,74 +1,75 @@
 <script setup lang="ts">
-    import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
-    import manifest from '@/manifest.json'
-    import { redirectInterceptor, launchInterceptor } from '@/utils/interceptor'
-    import { getToken, isWeixinBrowser,getSiteId } from '@/utils/common'
-    import useMemberStore from '@/stores/member'
-    import useConfigStore from '@/stores/config'
-    import useSystemStore from '@/stores/system'
-    import { useLogin } from '@/hooks/useLogin'
-    import { language } from '@/locale'
+	import { onLaunch, onShow, onHide } from '@dcloudio/uni-app'
+	import manifest from '@/manifest.json'
+	import { redirectInterceptor, launchInterceptor } from '@/utils/interceptor'
+	import { getToken, isWeixinBrowser, getSiteId } from '@/utils/common'
+	import useMemberStore from '@/stores/member'
+	import useConfigStore from '@/stores/config'
+	import useSystemStore from '@/stores/system'
+	import { useLogin } from '@/hooks/useLogin'
+	import { language } from '@/locale'
 
-    // #ifdef H5
-    if (import.meta.env.VITE_APP_DEBUG) { new window.VConsole() }
-    // #endif
-	
-    onLaunch(async (data) => {
-        // 添加初始化拦截器
-        launchInterceptor()
-        // 添加页面跳转拦截器
-        redirectInterceptor()
+	// #ifdef H5
+	if (import.meta.env.VITE_APP_DEBUG) { new window.VConsole() }
+	// #endif
 
-        // #ifdef H5
-        uni.getSystemInfoSync().platform == 'ios' && (uni.setStorageSync('initUrl', location.href))
-        // #endif
-        
-        // 缺少站点id，拦截
-        if (getSiteId(uni.getStorageSync('wap_site_id') || import.meta.env.VITE_SITE_ID) === '') return;
+	onLaunch(async (data) => {
+		// 添加初始化拦截器
+		launchInterceptor()
+		// 添加页面跳转拦截器
+		redirectInterceptor()
 
-        const configStore = useConfigStore()
-        configStore.getTabbarConfig()
-        await configStore.getLoginConfig()
-        
-        useSystemStore().getSitenfo()
+		// #ifdef H5
+		uni.getSystemInfoSync().platform == 'ios' && (uni.setStorageSync('initUrl', location.href))
 
-        // 隐藏tabbar
-        uni.hideTabBar()
-        
-        // 判断是否已登录
-        if (getToken()) {
-            const memberStore = useMemberStore()
-            await memberStore.setToken(getToken())
-        }
-        
-        if (!getToken()) {
-            const login = useLogin()
-            // 三方平台自动登录
-            // #ifdef MP
-            login.getAuthCode()
-            // #endif
-            // #ifdef H5
-            if (isWeixinBrowser()) {
-                data.query.code ? login.authLogin(data.query.code) : login.getAuthCode('snsapi_userinfo')
-            }
-            // #endif
-        }
-        
-        // 监听浏览器返回
-        // #ifdef H5
-        window.addEventListener("popstate", function(e) { 
-            const path = '/' + location.pathname.replace(manifest.h5.router.base, '')
-            language.loadLocaleMessages(path, uni.getLocale())
-        }, false);
-        // #endif
-    })
+		// 缺少站点id，拦截
+		if (process.env.NODE_ENV == 'development' && (getSiteId(uni.getStorageSync('wap_site_id') || import.meta.env.VITE_SITE_ID) === '')) return;
+		// #endif
 
-    onShow(() => {
 
-    })
+		const configStore = useConfigStore()
+		configStore.getTabbarConfig()
+		await configStore.getLoginConfig()
 
-    onHide(() => {
-    })
+		useSystemStore().getSitenfo()
+
+		// 隐藏tabbar
+		uni.hideTabBar()
+
+		// 判断是否已登录
+		if (getToken()) {
+			const memberStore = useMemberStore()
+			await memberStore.setToken(getToken())
+		}
+
+		if (!getToken()) {
+			const login = useLogin()
+			// 三方平台自动登录
+			// #ifdef MP
+			login.getAuthCode()
+			// #endif
+			// #ifdef H5
+			if (isWeixinBrowser()) {
+				data.query.code ? login.authLogin(data.query.code) : login.getAuthCode('snsapi_userinfo')
+			}
+			// #endif
+		}
+
+		// 监听浏览器返回
+		// #ifdef H5
+		window.addEventListener("popstate", function (e) {
+			const path = '/' + location.pathname.replace(manifest.h5.router.base, '')
+			language.loadLocaleMessages(path, uni.getLocale())
+		}, false);
+		// #endif
+	})
+
+	onShow(() => {
+
+	})
+
+	onHide(() => {
+	})
 </script>
 
 <style></style>
\ No newline at end of file
diff --git a/uni-app/pages.json b/uni-app/pages.json
index 6329f968d..966f9bf3f 100644
--- a/uni-app/pages.json
+++ b/uni-app/pages.json
@@ -3,7 +3,9 @@
 		{
 			"path": "pages/index/index",
 			"style": {
+				// #ifdef H5
 				"navigationStyle": "custom",
+				// #endif
 				"navigationBarTitleText": "%pages.index.index%"
 			}
 		},
@@ -70,20 +72,24 @@
 				"navigationBarTitleText": "%pages.index.diy%"
 			}
 		},
-        {
-        	"path": "pages/index/close",
-        	"style": {
-        		"navigationStyle": "custom",
-                "navigationBarTitleText": "%pages.index.close%"
-        	}
-        },
-        {
-        	"path": "pages/index/nonexistence",
-        	"style": {
-        		"navigationStyle": "custom",
-                "navigationBarTitleText": "%pages.index.nonexistence%"
-        	}
-        },
+		{
+			"path": "pages/index/close",
+			"style": {
+				// #ifdef H5
+				"navigationStyle": "custom",
+				// #endif
+				"navigationBarTitleText": "%pages.index.close%"
+			}
+		},
+		{
+			"path": "pages/index/nosite",
+			"style": {
+				// #ifdef H5
+				"navigationStyle": "custom",
+				// #endif
+				"navigationBarTitleText": "%pages.index.nosite%"
+			}
+		},
 		{
 			"path": "pages/article/detail",
 			"style": {
@@ -172,20 +178,12 @@
 		},
 		{
 			"path": "pages/member/index",
-			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": "%pages.member.index%"
-			}
-		},
-		{
-			"path": "pages/member/info",
 			"style": {
 				// #ifdef H5
 				"navigationStyle": "custom",
 				// #endif
-				"navigationBarTitleText": "%pages.member.info%"
-			},
-			"needLogin": true
+				"navigationBarTitleText": "%pages.member.index%"
+			}
 		},
 		{
 			"path": "pages/member/personal",
@@ -230,14 +228,18 @@
 		{
 			"path": "pages/pay/browser",
 			"style": {
+				// #ifdef H5
 				"navigationStyle": "custom",
+				// #endif
 				"navigationBarTitleText": "%pages.pay.browser%"
 			}
 		},
 		{
 			"path": "pages/pay/result",
 			"style": {
+				// #ifdef H5
 				"navigationStyle": "custom",
+				// #endif
 				"navigationBarTitleText": "%pages.pay.result%"
 			}
 		},
@@ -268,7 +270,7 @@
 				// #endif
 				"navigationBarTitleText": "%pages.index.develop%"
 			}
-		}// {{PAGE}}
+		} // {{PAGE}}
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",