From 3e987711c4a21f46c079eaa20f1ad18f58eb9169 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 25 Sep 2024 17:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9B=BE=E5=8A=A0to?=
 =?UTF-8?q?ken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/webPage/webPage.vue | 39 +++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/subPackages/webPage/webPage.vue b/subPackages/webPage/webPage.vue
index 6c115dd..db5abae 100644
--- a/subPackages/webPage/webPage.vue
+++ b/subPackages/webPage/webPage.vue
@@ -6,20 +6,45 @@
 export default {
   data() {
     return {
-      url: ''
+      url: '',
+	  tempUrl: ''
     }
   },
   onLoad(option) {
+	  let url = ''
 	  console.log(option);
 	  if (option.url) {
-	  	this.url = decodeURIComponent(option.url)
+	  	url = decodeURIComponent(option.url)
 	  }else{
-		this.url = uni.getStorageSync('webUrl')
-		console.log(this.url);
+		url = uni.getStorageSync('webUrl')
+		console.log(url);
 	  }
-    console.log(this.url)
-    // 传入需要跳转的链接 使用web-view标签进行跳转
-  }
+	  this.tempUrl = url
+  },
+  onShow() {
+  	let url = this.tempUrl
+  	// 如果跳转地图需要token
+  	  if(url.toLocaleLowerCase().indexOf('yandumap.sz-trip.com')>=0 && url.toLocaleLowerCase().indexOf("token")<0) {
+  		  let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
+  		  if(userInfo.token) {
+  				let tokenParam = 'token=' + userInfo.token
+  				let concatStr = url.indexOf('?')>0?'&':'?'
+  				url+=concatStr
+  				url+=tokenParam
+  		  }else {
+  				uni.navigateTo({
+  					url: '/pages/login/login',
+  				})
+				return
+  		  }
+  	  }
+  	  
+  	  if (this.url != url) {
+  		  this.url = url
+  	  }
+  	console.log(this.url)
+  	// 传入需要跳转的链接 使用web-view标签进行跳转
+  },
 }
 </script>