王士厅

fix: 关闭网络,访问直播tab,不应展示暂无内容缺省页,应展示无网络缺省页

@@ -13,5 +13,7 @@ export const enum ViewType { @@ -13,5 +13,7 @@ export const enum ViewType {
13 // 已加载结束/非失败/非空/可以是仅一页数据,即楼层数据列表PAGE_GROUP_LIST/ 13 // 已加载结束/非失败/非空/可以是仅一页数据,即楼层数据列表PAGE_GROUP_LIST/
14 LOADED, 14 LOADED,
15 // 已加载的是tab导航数据(可嵌套page的楼层列表) 15 // 已加载的是tab导航数据(可嵌套page的楼层列表)
16 - NAV_BAR 16 + NAV_BAR,
  17 + // 无网络
  18 + NoNetwork
17 } 19 }
@@ -49,10 +49,10 @@ export struct PageComponent { @@ -49,10 +49,10 @@ export struct PageComponent {
49 this.LoadingLayout() 49 this.LoadingLayout()
50 } else if (this.pageModel.viewType == ViewType.LOADED) { 50 } else if (this.pageModel.viewType == ViewType.LOADED) {
51 this.ListLayout() 51 this.ListLayout()
52 - } else if (this.pageModel.viewType == ViewType.EMPTY) { 52 + } else if (this.pageModel.viewType == ViewType.EMPTY || this.pageModel.viewType == ViewType.NoNetwork) {
53 //缺省页 53 //缺省页
54 EmptyComponent({ 54 EmptyComponent({
55 - emptyType: this.pageModel.emptyType, 55 + emptyType: this.pageModel.viewType == ViewType.EMPTY ? this.pageModel.emptyType : this.pageModel.NoNetwork,
56 emptyButton: true, 56 emptyButton: true,
57 retry: () => { 57 retry: () => {
58 this.pageModel.viewType = ViewType.LOADING; 58 this.pageModel.viewType = ViewType.LOADING;
@@ -297,7 +297,7 @@ export struct PageComponent { @@ -297,7 +297,7 @@ export struct PageComponent {
297 this.needload = false; 297 this.needload = false;
298 } 298 }
299 } else { 299 } else {
300 - this.pageModel.viewType = ViewType.EMPTY; 300 + this.pageModel.viewType = ViewType.NoNetwork;
301 } 301 }
302 } 302 }
303 303
@@ -55,6 +55,7 @@ export default class PageModel { @@ -55,6 +55,7 @@ export default class PageModel {
55 offsetY: number = 0; 55 offsetY: number = 0;
56 viewType: number = ViewType.LOADING; 56 viewType: number = ViewType.LOADING;
57 emptyType: WDViewDefaultType = WDViewDefaultType.WDViewDefaultType_Default 57 emptyType: WDViewDefaultType = WDViewDefaultType.WDViewDefaultType_Default
  58 + NoNetwork: WDViewDefaultType = WDViewDefaultType.WDViewDefaultType_NoNetwork
58 hasMore: boolean = true; 59 hasMore: boolean = true;
59 startIndex = 0; 60 startIndex = 0;
60 endIndex = 0; 61 endIndex = 0;