diff --git a/pages/index/index.vue b/pages/index/index.vue index a14b9ef..c11f311 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -292,14 +292,14 @@ } }, onLoad() { - }, onShow() { // 后台文章id 4,副标题(subtitle)和地址(address)切换 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 }) }, onReady() { @@ -307,6 +307,7 @@ this.getWinnowList() this.getCalendarList() this.changeType(0) + this.getLocation() }, onReachBottom() { setTimeout(() => { diff --git a/subPackages/webPage/webPage.vue b/subPackages/webPage/webPage.vue index c5ffa7d..fed805e 100644 --- a/subPackages/webPage/webPage.vue +++ b/subPackages/webPage/webPage.vue @@ -111,6 +111,7 @@ export default { console.log(fullUrl); this.url = fullUrl } else { + uni.getLocation({ success: data => { uni.setStorageSync('location', { @@ -129,6 +130,7 @@ export default { this.url = fullUrl } }) + } }