优化跳转

src/pages/order/editQuotation.vue

@@ -201,10 +201,14 @@ let init = () => {
 
 onBackPress((options: any) => {
 	let pages = getCurrentPages(); // 当前页面路由
-	let route = pages[pages.length - 2].route; // 上一个页面路由
-	if (options.from === 'backbutton' && route == 'pages/order/quotation')
-		// return uni.navigateBack({ delta: 4 })
-		return uni.reLaunch({ url: '/' })
+	let route = JSON.parse(JSON.stringify(pages[pages.length - 2].route)) // 上一个页面路由
+	let route1 = JSON.parse(JSON.stringify(pages[pages.length - 3].route)) // 上一个页面路由
+	let route2 = JSON.parse(JSON.stringify(pages[pages.length - 4].route)) // 上一个页面路由
+	if (options.from === 'backbutton' && route == 'pages/order/quotation') {
+		if (route2 && route2 == 'pages/order/checkout') return uni.navigateBack({ delta: 1 })
+		console.log('跳转', route, route1);
+		return uni.navigateBack({ delta: 2 })
+	}
 })
 </script>
 

src/pages/order/quotation.vue

@@ -250,7 +250,7 @@ onLoad((options: any) => {
 	quotationExist({ orderId: orderId.value }).then((res: any) => {
 		if (res.data.code === 200) {
 			if (res.data.data) {
-				uni.reLaunch({
+				uni.navigateTo({
 					url: '../order/editQuotation?orderId=' + orderId.value
 				})
 			} else {
@@ -379,12 +379,11 @@ let modelConfirm = () => {
 }
 
 let handleSheet = (index: number) => {
-	console.log(index);
-	// if (index)
-	// 	open(baseUrl + '/wx/quotation/download/pdf?orderId=' + orderId.value)
-	// else
-	// 	open(baseUrl + '/wx/quotation/download?orderId=' + orderId.value)
-	// uni.navigateBack({ delta: 1 })
+	if (index)
+		open(baseUrl + '/wx/quotation/download/pdf?orderId=' + orderId.value)
+	else
+		open(baseUrl + '/wx/quotation/download?orderId=' + orderId.value)
+	uni.navigateBack({ delta: 1 })
 	showSheet.value = false
 }