首页活动

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.subtitle == 1 ? true : false
-				// this.isShow = res.data.address == 1 ? true : false
+				this.isShow = res.data.address == 1 ? true : false
 			})
 		},
 		onReady() {
@@ -533,7 +533,7 @@
 			getHotList() {
 				if(this.typeIndex == 1) {
 					this.Post({
-						date: this.getNowTime(new Date()),
+						end_time: this.getNowTime(new Date()),
 						offset: this.hotList.length,
 						limit:this.limit,
 						type_id: 7,

pages/map/map.vue

@@ -8,15 +8,29 @@
 	export default {
 		data() {
 			return {
-				src: ''
+				src: '',
+				isShow: true,
 			}
 		},
 		onShow() {
-			this.checkIsLoginJdsz().then(res => {
+			// 后台文章id 4,副标题(subtitle)和地址(address)切换
-				if(res) {
+			this.Post({
-					this.src = 'https://chang-map.js-dyyj.com?token=' + res
+				id: 4
+			},'/api/article/getArticleById').then(res => {
+				// this.isShow = res.data.subtitle == 1 ? true : false
+				this.isShow = res.data.address == 1 ? true : false
+				if (this.isShow) {
+					this.checkIsLoginJdsz().then(res => {
+						if(res) {
+							this.src = 'https://chang-map.js-dyyj.com?token=' + res
+						}
+					})
+				} else {
+					this.src = "https://chang-map.js-dyyj.com"
 				}
 			})
+			
+			
 			// 必须登录
 			// let userInfo = (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo'))) || this.$store.state.user.userInfo || {}
 			// console.log(userInfo)