diff --git a/pages/aroundDetail/index.vue b/pages/aroundDetail/index.vue index 5c41b9d..5ff80b3 100644 --- a/pages/aroundDetail/index.vue +++ b/pages/aroundDetail/index.vue @@ -397,11 +397,11 @@ export default { }, previewImage(index) { - if (!this.detailInfo.detailImages || !this.detailInfo.detailImages.length) return; + // if (!this.detailInfo.detailImages || !this.detailInfo.detailImages.length) return; uni.previewImage({ current: index, - urls: this.detailInfo.detailImages.map(img => img.startsWith('http') ? img : IMAGE_BASE_URL + img) + urls: this.detailInfo.imgs.map(img => img.startsWith('http') ? img : IMAGE_BASE_URL + img) }); }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 6628b6d..84195c5 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -48,7 +48,7 @@ {{weather.real || '--'}}° @@ -127,7 +127,7 @@ import Copyright from '@/components/gx-copyright.vue'; import Footer from '@/components/footer_common.vue'; import { get, post } from '@/utils/request'; import { IMAGE_BASE_URL, BASE_URL } from '@/utils/config'; - +import {navigateTo} from '@/utils/router.js' export default { components: { Footer, @@ -160,10 +160,15 @@ export default { this.getWeather(); }, methods: { - goDetail(page) { - uni.navigateTo({ - url: `/pages/${page}/index` - }); + goDetail(page) { + if(page==='neighbor'){ + navigateTo({url: `/pages/${page}/index`}) + }else{ + uni.navigateTo({ + url: `/pages/${page}/index` + }); + } + }, formatDate(date) { const weekdays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']; diff --git a/pages/meetingList/index.vue b/pages/meetingList/index.vue index 1cff183..1462369 100644 --- a/pages/meetingList/index.vue +++ b/pages/meetingList/index.vue @@ -39,6 +39,7 @@ + @@ -313,6 +314,7 @@ // 获取会议室列表 async getList() { try { + wx.showLoading({title:'加载中...',mask:true}) const res = await get('/api/v1/apps/home/metting-room', { current: 1, pageSize: 10, @@ -329,12 +331,13 @@ icon: 'none' }); } finally { - this.isLoading = false; + wx.hideLoading() } }, // 获取我的预约记录 async getOrderList() { try { + wx.showLoading({title:'加载中...',mask:true}) const res = await get('/api/v1/app_auth/metting-room/order', { current: 1, pageSize: 10, @@ -352,7 +355,7 @@ icon: 'none' }); } finally { - this.isLoading = false; + wx.hideLoading() } }, diff --git a/pages/mySeekHelp/index.vue b/pages/mySeekHelp/index.vue index 573ac92..de442cb 100644 --- a/pages/mySeekHelp/index.vue +++ b/pages/mySeekHelp/index.vue @@ -52,11 +52,11 @@ height="780px" v-if="filteredOrders.length === 0" mode="data" - icon="/static/imgs/noData.jpeg" + icon="/static/imgs/noData.png" > - + diff --git a/pages/serviceNoticeList/index.vue b/pages/serviceNoticeList/index.vue index e226d78..b2159b4 100644 --- a/pages/serviceNoticeList/index.vue +++ b/pages/serviceNoticeList/index.vue @@ -16,57 +16,58 @@ - - - - - - {{item.title}} - - - {{formatTime(item.createdAt,'YYYY-MM-DD')}} - 查看详情 → + + + + + + + {{item.title}} + + + {{formatTime(item.createdAt,'YYYY-MM-DD')}} + 查看详情 → + - - - - - {{isLoading ? '加载中...' : '上拉加载更多'}} - - + + + + {{isLoading ? '加载中...' : '上拉加载更多'}} + + + - + 暂无公告 - + - - -