From a647f375171784c954bcc2658a971623f8c7b016 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Thu, 4 Sep 2025 17:14:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json            |  4 ++--
 pages/index/index.vue |  4 ++--
 pages/map/map.vue     | 26 +++++++++++++++-----------
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/pages.json b/pages.json
index 6389e2b..e7666b4 100644
--- a/pages.json
+++ b/pages.json
@@ -16,7 +16,7 @@
         {
             "path" : "pages/map/map",
             "style" : {
-                "navigationBarTitleText" : "智游常熟"
+                "navigationBarTitleText" : "文体旅地图"
             }
         },
         {
@@ -293,7 +293,7 @@
                 "pagePath" : "pages/map/map",
                 "iconPath" : "/static/images/map.png",
                 "selectedIconPath" : "/static/images/selectMap.png",
-                "text" : "地图"
+                "text" : "文体旅地图"
             },
             {
                 "pagePath" : "pages/user/user",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0f5dfdd..faeee33 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -311,8 +311,8 @@
 			this.Post({
 				id: 4
 			},'/api/article/getArticleById').then(res => {
-				// this.isShow = res.data.subtitle == 1 ? true : false
-				this.isShow = res.data.address == 1 ? true : false
+				this.isShow = res.data.subtitle == 1 ? true : false
+				// this.isShow = res.data.address == 1 ? true : false
 			})
 		},
 		onReady() {
diff --git a/pages/map/map.vue b/pages/map/map.vue
index f1945c2..5c09847 100644
--- a/pages/map/map.vue
+++ b/pages/map/map.vue
@@ -12,18 +12,22 @@
 			}
 		},
 		onShow() {
+			this.checkIsLoginJdsz().then(res => {
+				if(res) {
+					this.src = 'https://chang-map.js-dyyj.com?token=' + res
+				}
+			})
 			// 必须登录
-			let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
-			console.log(userInfo)
-			if(userInfo.token) {
-				this.src = 'http://localhost:8080/?token=' + userInfo.token
-				// this.src = 'https://chang-map.js-dyyj.com?token=' + userInfo.token
-				console.log(this.src)
-			}else {
-				uni.navigateTo({
-					url: '/pages/login/login'
-				})
-			}
+			// let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
+			// console.log(userInfo)
+			// if(userInfo.token) {
+			// 	this.src = 'https://chang-map.js-dyyj.com?token=' + userInfo.token
+			// 	console.log(this.src)
+			// }else {
+			// 	uni.navigateTo({
+			// 		url: '/pages/login/login'
+			// 	})
+			// }
 		},
 		methods: {