diff --git a/.gitignore b/.gitignore index 28f03308e3d963fc1b0841dc56205cfb8b45a9d3..f2c7bea7716d596a88dff1ee1f5634f4db8fae74 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ unpackage/ node_modules .DS_Store uni_modules/uni-id/uniCloud/cloudfunctions/common/uni-id/config.json -manifest.json \ No newline at end of file +manifest.json +pages/grid/banner.json \ No newline at end of file diff --git a/pages.json b/pages.json index e479216b326786f5c84d90bb02caa02831d90c40..da15f581c2c234495d4790ee97d6b49daee170a4 100644 --- a/pages.json +++ b/pages.json @@ -34,8 +34,6 @@ } } } - // "navigationBarTitleText": "", - // "navigationBarBackgroundColor": "#FFFFFF", }, { "path": "pages/list/search/search", "style": { @@ -69,7 +67,7 @@ }, { "path": "uni_modules/opendb-feedback/pages/opendb-feedback/list", "style": { - "navigationBarTitleText": "反馈列表" + "navigationBarTitleText": "常见问题" } }, { "path": "uni_modules/opendb-feedback/pages/opendb-feedback/add", diff --git a/pages/grid/grid.vue b/pages/grid/grid.vue index 035042fd875b57592d003b380bea2fbeea73941f..279d4d717ecba81b4344b4c2d818964e4c51bf1b 100644 --- a/pages/grid/grid.vue +++ b/pages/grid/grid.vue @@ -9,10 +9,10 @@ - - + @@ -119,7 +119,9 @@ current: 0, mode: 'default', dotsStyles: {}, - swiperDotIndex: 0 + swiperDotIndex: 0, + + isLoading:true } }, methods: { @@ -181,7 +183,8 @@ /** * banner数据过滤 */ - bannerFormate(bannerList) { + bannerFormate(bannerList, loading) { + if (loading) return []; if (bannerList.length > 0) return bannerList; // 无数据添加默认值 let list = [{ diff --git a/pages/list/news-list.vue b/pages/list/news-list.vue index c359c1401ea30203335eb64f6fdc7f4bdc642b89..db978f3c6eb2a29831405dbb3a10e96e875365d8 100644 --- a/pages/list/news-list.vue +++ b/pages/list/news-list.vue @@ -21,13 +21,13 @@ + :collection="collection" :field="field" :where="where" @load="load($event);isLoading = false;" @error="isLoading = false"> {{error.message}} -