From c0ec1367306d26e4c5ed5af221ccaf47a6bafe6b Mon Sep 17 00:00:00 2001
From: weiwei <ctw@example.com>
Date: Wed, 14 May 2025 15:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/pay/payComplete.vue       | 7 ++++---
 src/pages/thirdApp/thirdAppList.vue | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/pages/pay/payComplete.vue b/src/pages/pay/payComplete.vue
index 0d970d5..7cb62b8 100644
--- a/src/pages/pay/payComplete.vue
+++ b/src/pages/pay/payComplete.vue
@@ -39,7 +39,7 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="getLaunchParam()" class="p-40rpx fixed bottom-30rpx left-0 right-0 font-bold">
+		<view class="p-40rpx fixed bottom-30rpx left-0 right-0 font-bold">
 			<tm-button :block="true" @click="goBack">完成</tm-button>
 		</view>
 	</view>
@@ -50,7 +50,6 @@ import { ref } from "vue"
 import { onShow } from "@dcloudio/uni-app"
 import { router } from "@@/index"
 import { usePayStore } from "@/sheep/stores/pay"
-import getLaunchParam from "@/sheep/utils/getLaunchParam"
 
 const payData = ref<{ id?: string; name?: string; customPrice?: number }>({})
 
@@ -60,6 +59,8 @@ onShow(() => {
 })
 
 const goBack = () => {
-	router.jump("/pages/tabbar/my", {}, 2)
+	const url: string = window.location.href.split("#")[0] + "?launchParam=coopMerchant#/pages/tabbar/order"
+	window.location.replace(url)
+	// router.jump(url, {}, 2)
 }
 </script>
diff --git a/src/pages/thirdApp/thirdAppList.vue b/src/pages/thirdApp/thirdAppList.vue
index 3785c8c..a94b58d 100644
--- a/src/pages/thirdApp/thirdAppList.vue
+++ b/src/pages/thirdApp/thirdAppList.vue
@@ -52,7 +52,7 @@
 				@confirm="thirdAppJump()"
 				@cancel="state.show = false"
 			>
-				<tm-text font-size="30" color="#999999">您即将离开智慧后勤应用并跳转到第三方应用，请注意账号财产安全</tm-text>
+				<tm-text font-size="30" color="#999999">您即将离开智慧后勤应用并跳转到第三方应用，请注意个人隐私和账号财产安全</tm-text>
 			</tm-modal>
 		</z-paging>
 	</crud-layout>