yangchenggong1_wd

fix |> 20791 人民号>推荐频道,地方精选卡不应展示更多按钮,见对比截图。

... ... @@ -8,4 +8,5 @@ export const enum BottomNavi {
VIDEO=2,
SERVICE=3,
MINE=4,
TEMPLATE=5,
}
... ...
import { CompDTO, ContentDTO } from 'wdBean';
import { CommonConstants, CompStyle } from 'wdConstant/Index';
import { BottomNavi, CommonConstants, CompStyle } from 'wdConstant/Index';
import PageModel from '../viewmodel/PageModel';
import { CardParser } from './CardParser';
import { Card2Component } from './cardview/Card2Component';
... ... @@ -42,6 +42,7 @@ export struct CompParser {
@State private pageModel: PageModel = new PageModel();
@State audioItems: ContentDTO[] = [];
@State noneAudioItems: ContentDTO[] = [];
bottomNavi:BottomNavi = BottomNavi.PEOPLE
aboutToAppear(): void {
... ... @@ -167,7 +168,7 @@ export struct CompParser {
ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg })
ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName, loadImg: this.pageModel.loadImg ,bottomNavi:this.bottomNavi})
this.getBehindDivider()
} else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
// ZhSingleRow05({ compDTO })
... ...
import { CompDTO, ContentDTO } from 'wdBean';
import { CommonConstants } from 'wdConstant';
import { BottomNavi, CommonConstants } from 'wdConstant';
import { DateTimeUtils } from 'wdKit';
import { ProcessUtils } from 'wdRouter';
import { InfomationCardClick } from '../../utils/infomationCardClick';
... ... @@ -15,6 +15,7 @@ export struct ZhSingleRow04 {
@State pageId: string = '';
@State pageName: string = '';
@State compDTO: CompDTO = {} as CompDTO
bottomNavi:BottomNavi = BottomNavi.PEOPLE
build() {
Column() {
... ... @@ -32,6 +33,8 @@ export struct ZhSingleRow04 {
.lineHeight(25)
}
if(this.bottomNavi === BottomNavi.NEWS){
Row() {
Text("更多")
.fontSize($r("app.float.font_size_14"))
... ... @@ -57,6 +60,7 @@ export struct ZhSingleRow04 {
}
})
}
}
.justifyContent(FlexAlign.SpaceBetween)
.margin({ bottom: 8 })
.width('100%')
... ...
... ... @@ -125,7 +125,8 @@ export struct PageComponent {
nextCompDTO: compIndex === this.pageModel.compList.getDataArray().length - 1 ? new CompDTO() : this.pageModel.compList.get(compIndex + 1) as CompDTO,
compDTO: compDTO,
compIndex: compIndex,
pageId: this.pageId
pageId: this.pageId,
bottomNavi:this.bottomNavi
}
)
}
... ...
... ... @@ -9,6 +9,7 @@ import LoadMoreLayout from '../LoadMoreLayout'
import TemplatePageHelp from './TemplatePageHelp'
import TemplatePageModel from './TemplatePageModel'
import { TemplatePageStateType } from './TemplatePageStateType'
import { BottomNavi} from 'wdConstant/Index';
const TAG: string = 'TemplatePageComponent';
... ... @@ -126,7 +127,8 @@ export default struct TemplatePageComponent {
nextCompDTO: index === this.templatePage.compList.getDataArray().length - 1 ? new CompDTO() : this.templatePage.compList.get(index + 1) as CompDTO,
compIndex: index,
pageId: this.pageId,
pageName: this.pageName
pageName: this.pageName,
bottomNavi:BottomNavi.TEMPLATE
});
}
}
... ...