From b6ed5de9cd9a6a4589cef89c739153f21be74e83 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 20 Aug 2026 20:50:49 +0800
Subject: [PATCH] 111

---
 .env                                        | 4 ++--
 src/pages.json                              | 2 +-
 src/pages/tabbar/index.vue                  | 6 +++---
 src/pages/tabbar/my.vue                     | 2 +-
 src/pages/{thrid => thirdApp}/happyMall.vue | 4 ++--
 src/pages/user/userRole.vue                 | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)
 rename src/pages/{thrid => thirdApp}/happyMall.vue (97%)

diff --git a/.env b/.env
index 5d0ff5e..0ed20e9 100644
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
 # H5：true 时在页面加载 vConsole
-VITE_VCONSOLE=true
-# VITE_VCONSOLE=false
+# VITE_VCONSOLE=true
+VITE_VCONSOLE=false
 
 #VITE_ZZD_TRACK_DISABLE=true
 #是否是TOC应用
diff --git a/src/pages.json b/src/pages.json
index 74d4c07..b8054f5 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -523,7 +523,7 @@
 			]
 		},
 		{
-			"root": "pages/thrid",
+			"root": "pages/thirdApp",
 			"pages": [
 				{
 					"path": "happyMall",
diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue
index 5b4a5c4..6b8a476 100644
--- a/src/pages/tabbar/index.vue
+++ b/src/pages/tabbar/index.vue
@@ -124,9 +124,9 @@ const jumpByParam = async () => {
 			}
 			if (await jumpIntegratedSubPage(launchParam)) return
 			switch (launchParam) {
-				case "thrid":
+				case "thirdApp":
 					uni.setStorageSync("launchParam", launchParam)
-					return uni.reLaunch({ url: "/pages/thrid/happyMall" })
+					return uni.reLaunch({ url: "/pages/thirdApp/happyMall" })
 				case "canteen":
 					uni.setStorageSync("launchParam", launchParam)
 					uni.switchTab({ url: "/pages/tabbar/canteen" })
@@ -173,7 +173,7 @@ const jumpByParam = async () => {
 				failBoot("缺少入口参数，请从门户重新进入")
 				return
 			}
-			if (launchParam == "thrid") return uni.reLaunch({ url: "/pages/thrid/happyMall" })
+			if (launchParam == "thirdApp") return uni.reLaunch({ url: "/pages/thirdApp/happyMall" })
 
 			switch (userRole) {
 				case "merchant":
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index f782087..49e1077 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -361,7 +361,7 @@ const initMenuConfig = () => {
 			{ text: "dev-外来人员就餐", icon: "/static/icon/service_1.png", path: "/pages/apply/foreign-list" },
 			{ text: "dev-跨单位就餐", icon: "/static/icon/service_1.png", path: "/pages/apply/stride-list" },
 			{ text: "dev-包厢预定", icon: "/static/icon/service_4.png", path: "/pages/boxes/apply-list" },
-			{ text: "dev-第三方应用", icon: "/static/icon/login.png", path: "/pages/thrid/happyMall" },
+			{ text: "dev-第三方应用", icon: "/static/icon/login.png", path: "/pages/thirdApp/happyMall" },
 			{ text: "dev-登录", icon: "/static/icon/login.png", path: "/pages/user/login" },
 			{ text: "dev-角色选择", icon: "/static/icon/login.png", path: "/pages/user/userRole" },
 		)
diff --git a/src/pages/thrid/happyMall.vue b/src/pages/thirdApp/happyMall.vue
similarity index 97%
rename from src/pages/thrid/happyMall.vue
rename to src/pages/thirdApp/happyMall.vue
index abdae91..3cd6782 100644
--- a/src/pages/thrid/happyMall.vue
+++ b/src/pages/thirdApp/happyMall.vue
@@ -12,7 +12,7 @@
 		</view>
 
 		<tm-modal v-model:show="show" :overlayClick="false" title="注意" position="bottom" height="auto"
-			:showCancel="true" cancelText="取消" confirmText="继续访问" @confirm="thridJump()" @cancel="show = false">
+			:showCancel="true" cancelText="取消" confirmText="继续访问" @confirm="thirdAppJump()" @cancel="show = false">
 			<tm-text font-size="30" color="#999999">
 				您即将离开智慧后勤应用并跳转到第三方应用，请注意个人隐私和账号财产安全。您通过第三方服务页面主动提供给第三方商户的个人信息，相关信息保护责任由第三方商户承担。
 			</tm-text>
@@ -86,7 +86,7 @@ onLoad(async () => {
 // }
 
 // 确认或拒绝协议
-const thridJump = async () => {
+const thirdAppJump = async () => {
 	try {
 		uni.showLoading({ title: "跳转中", mask: true })
 		const res: any = await merchantApi.lbLogin()
diff --git a/src/pages/user/userRole.vue b/src/pages/user/userRole.vue
index bbd17d4..7232500 100644
--- a/src/pages/user/userRole.vue
+++ b/src/pages/user/userRole.vue
@@ -71,8 +71,8 @@ const relaunchByLaunchParam = () => {
 			return uni.reLaunch({ url: "/pages/tabbar/integrated" })
 		case "cabinet":
 			return uni.reLaunch({ url: "/pages/tabbar/cabinet" })
-		case "thrid":
-			return uni.reLaunch({ url: "/pages/thrid/happyMall" })
+		case "thirdApp":
+			return uni.reLaunch({ url: "/pages/thirdApp/happyMall" })
 		default:
 			if (launchParam) {
 				return uni.reLaunch({ url: `/pages/tabbar/index?launchParam=${encodeURIComponent(launchParam)}` })