diff --git a/components/me-tabs/me-tabs.vue b/components/me-tabs/me-tabs.vue index 527e2b0..14c344e 100644 --- a/components/me-tabs/me-tabs.vue +++ b/components/me-tabs/me-tabs.vue @@ -54,7 +54,7 @@ return uni.upx2px(this.height) }, tabHeightPx1() { - return uni.upx2px(54) + return uni.upx2px(60) }, tabHeightVal() { return this.tabHeightPx + 'px' @@ -176,6 +176,8 @@ background-color: white; border-radius: 10px; margin: 2px 0; + height: 27px!important; + line-height: 27px!important; } } } diff --git a/pages/order/index.vue b/pages/order/index.vue index e6ef8cb..d69d1d6 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -148,20 +148,23 @@ }).then(res => { if (res.code == 0) { console.log(res) - - let isPage = res.data.has_more_page; - tab_item.isPage = isPage; - if (isPage) { - tab_item.loadingClass = true; - tab_item.loadingText = '正在加载中'; - } else { - tab_item.loadingClass = false; - tab_item.loadingText = '没有更多数据啦~'; - } - if (tab_item.page == 1) { - tab_item.list = res.data.items; - } else { - tab_item.list.push(...res.data.items); + if( Object.keys(res.metal_data).length != 0 ) { + this.$routerGo('/pages/login/index?type=userinfo') + }else { + let isPage = res.data.has_more_page; + tab_item.isPage = isPage; + if (isPage) { + tab_item.loadingClass = true; + tab_item.loadingText = '正在加载中'; + } else { + tab_item.loadingClass = false; + tab_item.loadingText = '没有更多数据啦~'; + } + if (tab_item.page == 1) { + tab_item.list = res.data.items; + } else { + tab_item.list.push(...res.data.items); + } } }