跳转bug修改

subpackage/personal-center/etc-activation.vue

@@ -629,7 +629,8 @@ const next = () => {
 		cardId: formData.cardId,
 		obuId: formData.obuId,
 		type: activationType.value == 'self' ? 1 : 2,
-		activeType: formData.activeType
+		activeType: formData.activeType,
+		cardBalance: ""
 		// obuId: 'dsjfslkfjlsa'
 	})
 	navTo(`/subpackage/after-sale/activation/operation-tips?id=${formData.orderId}&orderId=${formData.orderNo}&cardStatus=${undefined}&obuStatus=${undefined}&transfer=${formData.activeType}`);

utils/utils.ts

@@ -16,6 +16,9 @@ export const msg = (title : string = "", param : any = {}) => {
 	});
 };
 
+// tab页面,用于区分不同跳转方法
+const tabBarPages = ["pages/index/index", "pages/service/service", "pages/user/user"]
+
 //确认弹窗
 export const confirm = (content : string, callback : Function, title : string = "", showCancel ?: boolean, confimTxt = '确定') => {
 	uni.showModal({
@@ -70,13 +73,38 @@ export const navTo = (url : string = "", login : boolean = false) => {
 			})
 		} else {
 			// 如果页面栈总数小于10，则打开新页面
-			uni.navigateTo({
-				url,
-			});
+			if (isTabarPages(url)) {
+				uni.switchTab({
+					url: url
+				})
+			} else {
+				uni.navigateTo({
+					url,
+				});
+			}
 		}
 	}
 };
 
+/**
+ * 是否是tabar页面
+ * url：页面路径
+ */
+const isTabarPages = (url : string) => {
+	let isNot = false
+	
+	for (let i = 0; i < tabBarPages.length; i++) {
+		let item = tabBarPages[i]
+		if (url.includes(item)) {
+			isNot = true
+			break
+		}
+		
+	}
+	
+	return isNot
+}
+
 /**
  * 校验格式数据格式
  * @param 要校验的数据