Showing
1 changed file
with
25 additions
and
16 deletions
| @@ -87,7 +87,7 @@ export struct CompParser { | @@ -87,7 +87,7 @@ export struct CompParser { | ||
| 87 | this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 | 87 | this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 |
| 88 | if (this.compDTO.compStyle === CompStyle.Label_03) { | 88 | if (this.compDTO.compStyle === CompStyle.Label_03) { |
| 89 | LabelComponent({ compDTO: this.compDTO }) | 89 | LabelComponent({ compDTO: this.compDTO }) |
| 90 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 90 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 91 | } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { | 91 | } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { |
| 92 | if (this.compDTO.operDataList.length > this.audioItems.length) { | 92 | if (this.compDTO.operDataList.length > this.audioItems.length) { |
| 93 | ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 93 | ZhCarouselLayout01({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| @@ -104,7 +104,7 @@ export struct CompParser { | @@ -104,7 +104,7 @@ export struct CompParser { | ||
| 104 | } else { | 104 | } else { |
| 105 | HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 105 | HorizontalStrokeCardThreeTwoRadioForOneComponent({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 106 | } | 106 | } |
| 107 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 107 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 108 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { | 108 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_02) { |
| 109 | ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 109 | ZhSingleRow02({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 110 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | 110 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| @@ -121,49 +121,58 @@ export struct CompParser { | @@ -121,49 +121,58 @@ export struct CompParser { | ||
| 121 | 121 | ||
| 122 | } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { | 122 | } else if (this.compDTO.compStyle === CompStyle.Zh_Grid_Layout_03) { |
| 123 | ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 123 | ZhGridLayout03({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 124 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 124 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 125 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { | 125 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_04) { |
| 126 | ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 126 | ZhSingleRow04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 127 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 127 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 128 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { | 128 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_05) { |
| 129 | // ZhSingleRow05({ compDTO }) | 129 | // ZhSingleRow05({ compDTO }) |
| 130 | // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 130 | // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) |
| 131 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { | 131 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Row_06) { |
| 132 | ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 132 | ZhSingleRow06({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 133 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 133 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 134 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { | 134 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_02) { |
| 135 | //头图卡 和comStyle 2相同, | 135 | //头图卡 和comStyle 2相同, |
| 136 | - Card5Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], titleShowPolicy: this.compDTO.titleShowPolicy, pageId: this.pageId, pageName: this.pageName }) | ||
| 137 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 136 | + Card5Component({ |
| 137 | + compDTO: this.compDTO, | ||
| 138 | + contentDTO: this.compDTO.operDataList[0], | ||
| 139 | + titleShowPolicy: this.compDTO.titleShowPolicy, | ||
| 140 | + pageId: this.pageId, | ||
| 141 | + pageName: this.pageName | ||
| 142 | + }) | ||
| 143 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | ||
| 138 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { | 144 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_03) { |
| 139 | // 大图卡 | 145 | // 大图卡 |
| 140 | Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) | 146 | Card2Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) |
| 141 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | 147 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 142 | } else if (this.compDTO.compStyle === CompStyle.Card_09) { | 148 | } else if (this.compDTO.compStyle === CompStyle.Card_09) { |
| 143 | //时间链卡 | 149 | //时间链卡 |
| 144 | - Card9Component({ compDTO: this.compDTO, contentDTO:this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) | ||
| 145 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 150 | + Card9Component({ |
| 151 | + compDTO: this.compDTO, | ||
| 152 | + contentDTO:this.compDTO.operDataList[0], | ||
| 153 | + pageId: this.pageId, | ||
| 154 | + pageName: this.pageName | ||
| 155 | + }) | ||
| 156 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | ||
| 146 | } else if(this.compDTO.compStyle === CompStyle.Card_13){ | 157 | } else if(this.compDTO.compStyle === CompStyle.Card_13){ |
| 147 | Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) | 158 | Card6Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) |
| 148 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 159 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 149 | } else if(this.compDTO.compStyle === CompStyle.Card_03){ | 160 | } else if(this.compDTO.compStyle === CompStyle.Card_03){ |
| 150 | Card3Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) | 161 | Card3Component({ compDTO: this.compDTO, contentDTO: this.compDTO.operDataList[0], pageId: this.pageId, pageName: this.pageName }) |
| 151 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 162 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 152 | }else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { | 163 | }else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_04) { |
| 153 | ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 164 | ZhSingleColumn04({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 154 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 165 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 155 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { | 166 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_05) { |
| 156 | // ZhSingleColumn05({ compDTO: compDTO }) | 167 | // ZhSingleColumn05({ compDTO: compDTO }) |
| 157 | // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 168 | // Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) |
| 158 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { | 169 | } else if (this.compDTO.compStyle === CompStyle.Zh_Single_Column_09) { |
| 159 | - Divider().strokeWidth(3).color('#ffffff').padding({ left: 0, right: 0 }).margin({ top: -3 }) | ||
| 160 | - Divider().strokeWidth(6).color('#f5f5f5') | ||
| 161 | ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) | 170 | ZhSingleColumn09({ compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }) |
| 162 | - Divider().strokeWidth(6).color('#f5f5f5') | 171 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 163 | } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 | 172 | } else if (this.compDTO.compStyle === CompStyle.Card_Comp_Adv) { // 广告 |
| 164 | AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) | 173 | AdvCardParser({ pageModel: this.pageModel, compDTO: this.compDTO }) |
| 165 | //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 }) | 174 | //Text(`compIndex = ${compIndex}`).width('100%').fontSize('12fp').fontColor(Color.Red).padding({ left: 0, right: 0 }) |
| 166 | - Divider().strokeWidth(5).color('#f5f5f5').padding({ left: 0, right: 0 }) | 175 | + Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
| 167 | } else if (!Number.isNaN(Number(this.compDTO.compStyle))) { | 176 | } else if (!Number.isNaN(Number(this.compDTO.compStyle))) { |
| 168 | CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }); | 177 | CardParser({ contentDTO: this.compDTO.operDataList[0], compDTO: this.compDTO, pageId: this.pageId, pageName: this.pageName }); |
| 169 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) | 178 | Divider().strokeWidth(1).color('#f5f5f5').padding({ left: 16, right: 16 }) |
-
Please register or login to post a comment