chengen02

-fix 修改page边距

@@ -38,88 +38,86 @@ export struct CompParser { @@ -38,88 +38,86 @@ export struct CompParser {
38 38
39 build() { 39 build() {
40 Column() { 40 Column() {
41 -  
42 this.componentBuilder(); 41 this.componentBuilder();
43 } 42 }
44 } 43 }
45 44
46 @Builder 45 @Builder
47 componentBuilder() { 46 componentBuilder() {
48 -  
49 //CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO:this.compDTO }) 47 //CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO:this.compDTO })
50 -  
51 if (this.compDTO.operDataList[0]?.objectType !== '3' && 48 if (this.compDTO.operDataList[0]?.objectType !== '3' &&
52 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 49 this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口
  50 +
53 if (this.compDTO.compStyle === CompStyle.Label_03) { 51 if (this.compDTO.compStyle === CompStyle.Label_03) {
54 LabelComponent({ compDTO: this.compDTO }) 52 LabelComponent({ compDTO: this.compDTO })
55 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 53 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
56 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { 54 } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) {
57 ZhCarouselLayout01({ compDTO: this.compDTO }) 55 ZhCarouselLayout01({ compDTO: this.compDTO })
58 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 56 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
59 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && 57 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 &&
60 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡" 58 this.compDTO.imageScale === 2) { // && compDTO.name ==="横划卡"
61 59
62 LiveHorizontalCardComponent({ compDTO: this.compDTO }) 60 LiveHorizontalCardComponent({ compDTO: this.compDTO })
63 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 61 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
64 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) { 62 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_01 && this.compDTO.imageScale === 3) {
65 if (this.compDTO.operDataList.length > 1) { 63 if (this.compDTO.operDataList.length > 1) {
66 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO }) 64 HorizontalStrokeCardThreeTwoRadioForMoreComponent({ compDTO: this.compDTO })
67 } else { 65 } else {
68 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO }) 66 HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO })
69 } 67 }
70 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 68 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
71 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { 69 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) {
72 ZhSingleRow02({ compDTO: this.compDTO }) 70 ZhSingleRow02({ compDTO: this.compDTO })
73 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 71 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
74 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) { 72 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_03) {
75 ZhSingleRow03({ compDTO: this.compDTO }) 73 ZhSingleRow03({ compDTO: this.compDTO })
76 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 74 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
77 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题 75 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 ->标题
78 //ZhGridLayout02({ compDTO: this.compDTO }) 76 //ZhGridLayout02({ compDTO: this.compDTO })
79 CompNormalTitle({ compDTO: this.compDTO }) 77 CompNormalTitle({ compDTO: this.compDTO })
80 - // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 78 + // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
81 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡 79 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Zh_Grid_Layout_02) { //双列流小视频,一行两图卡
82 80
83 ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList }) 81 ZhGridLayout02NewsContent({ compDTO: this.compDTO, operDataList: this.compDTO.operDataList })
84 82
85 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { 83 } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) {
86 ZhGridLayout03({ compDTO: this.compDTO }) 84 ZhGridLayout03({ compDTO: this.compDTO })
87 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 85 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
88 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { 86 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) {
89 ZhSingleRow04({ compDTO: this.compDTO }) 87 ZhSingleRow04({ compDTO: this.compDTO })
90 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 88 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
91 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { 89 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) {
92 // ZhSingleRow05({ compDTO }) 90 // ZhSingleRow05({ compDTO })
93 - // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 91 + // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
94 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { 92 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) {
95 ZhSingleRow06({ compDTO: this.compDTO }) 93 ZhSingleRow06({ compDTO: this.compDTO })
96 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 94 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
97 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { 95 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) {
98 //头图卡 和comStyle 2相同, 96 //头图卡 和comStyle 2相同,
99 Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy }) 97 Card5Component({ contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy })
100 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 98 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
101 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { 99 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) {
102 // 大图卡 100 // 大图卡
103 Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] }) 101 Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0] })
104 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 102 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
105 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { 103 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) {
106 ZhSingleColumn04({ compDTO: this.compDTO }) 104 ZhSingleColumn04({ compDTO: this.compDTO })
107 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 105 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
108 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { 106 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) {
109 // ZhSingleColumn05({ compDTO: compDTO }) 107 // ZhSingleColumn05({ compDTO: compDTO })
110 - // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 108 + // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
111 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { 109 } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) {
112 - Divider().strokeWidth(3).color('#ffffff').padding({ left: 16, right: 16 }).margin({ top: -3 }) 110 + Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 })
113 Divider().strokeWidth(6).color('#f5f5f5') 111 Divider().strokeWidth(6).color('#f5f5f5')
114 ZhSingleColumn09({ compDTO: this.compDTO }) 112 ZhSingleColumn09({ compDTO: this.compDTO })
115 Divider().strokeWidth(6).color('#f5f5f5') 113 Divider().strokeWidth(6).color('#f5f5f5')
116 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 114 } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告
117 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) 115 AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO })
118 - //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 16, right: 16 })  
119 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 116 + //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 })
  117 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
120 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) { 118 } else if (!Number.isNaN(Number(this.compDTO.compStyle))) {
121 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO }); 119 CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO });
122 - Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 120 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
123 } else { 121 } else {
124 // Text(this.compDTO.compStyle) 122 // Text(this.compDTO.compStyle)
125 // .width(CommonConstants.FULL_PARENT) 123 // .width(CommonConstants.FULL_PARENT)
@@ -129,7 +127,7 @@ export struct CompParser { @@ -129,7 +127,7 @@ export struct CompParser {
129 // WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage) 127 // WDRouterRule.jumpWithPage(WDRouterPage.QualityCommentsPage)
130 // } 128 // }
131 // }) 129 // })
132 - // Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) 130 + // Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
133 } 131 }
134 } 132 }
135 133
@@ -34,6 +34,7 @@ export struct PageComponent { @@ -34,6 +34,7 @@ export struct PageComponent {
34 needload: boolean = true; 34 needload: boolean = true;
35 build() { 35 build() {
36 Column() { 36 Column() {
  37 + Divider().strokeWidth(8).color('#f5f5f5').padding({ left: 0, right: 0 })
37 if (this.pageModel.viewType == ViewType.LOADING) { 38 if (this.pageModel.viewType == ViewType.LOADING) {
38 this.LoadingLayout() 39 this.LoadingLayout()
39 } else if (this.pageModel.viewType == ViewType.LOADED) { 40 } else if (this.pageModel.viewType == ViewType.LOADED) {