Showing
1 changed file
with
20 additions
and
16 deletions
| @@ -83,21 +83,21 @@ export struct CompParser { | @@ -83,21 +83,21 @@ export struct CompParser { | ||
| 83 | }) | 83 | }) |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | - @Builder | ||
| 87 | - beforeDevider() { | ||
| 88 | - if ( | ||
| 89 | - this.compDTO.compStyle === CompStyle.Card_09 || | ||
| 90 | - this.compDTO.compStyle === CompStyle.Zh_Single_Column_09 || | ||
| 91 | - this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 || | ||
| 92 | - this.compDTO.compStyle === CompStyle.Zh_Single_Row_06 | ||
| 93 | - ) { | ||
| 94 | - if (this.compDTO.compStyle === this.nextCompDTO.compStyle) { | ||
| 95 | - Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 }) | ||
| 96 | - } else { | ||
| 97 | - Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) | ||
| 98 | - } | ||
| 99 | - } | ||
| 100 | - } | 86 | + // @Builder |
| 87 | + // beforeDevider() { | ||
| 88 | + // if ( | ||
| 89 | + // this.compDTO.compStyle === CompStyle.Card_09 || | ||
| 90 | + // this.compDTO.compStyle === CompStyle.Zh_Single_Column_09 || | ||
| 91 | + // this.compDTO.compStyle === CompStyle.Zh_Single_Row_04 || | ||
| 92 | + // this.compDTO.compStyle === CompStyle.Zh_Single_Row_06 | ||
| 93 | + // ) { | ||
| 94 | + // if (this.compDTO.compStyle === this.nextCompDTO.compStyle) { | ||
| 95 | + // Divider().strokeWidth(1).color('#f5f5f5').width(CommonConstants.FULL_WIDTH).padding({ left: 10, right: 10 }) | ||
| 96 | + // } else { | ||
| 97 | + // Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) | ||
| 98 | + // } | ||
| 99 | + // } | ||
| 100 | + // } | ||
| 101 | 101 | ||
| 102 | @Builder | 102 | @Builder |
| 103 | behindDevider() { | 103 | behindDevider() { |
| @@ -113,7 +113,11 @@ export struct CompParser { | @@ -113,7 +113,11 @@ export struct CompParser { | ||
| 113 | Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) | 113 | Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) |
| 114 | } | 114 | } |
| 115 | } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { | 115 | } else if (this.compDTO.compStyle === CompStyle.Zh_Carousel_Layout_01) { |
| 116 | + if (this.compIndex === 0) { | ||
| 116 | Divider().strokeWidth(1).color('#f5f5f5').width('120%').margin({left: -6}) | 117 | Divider().strokeWidth(1).color('#f5f5f5').width('120%').margin({left: -6}) |
| 118 | + } else { | ||
| 119 | + Divider().strokeWidth(5).color('#f5f5f5').width('120%').margin({left: -6}) | ||
| 120 | + } | ||
| 117 | } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { | 121 | } else if (this.compDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { |
| 118 | // 大专题 | 122 | // 大专题 |
| 119 | if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { | 123 | if (this.nextCompDTO?.operDataList?.[0]?.appStyle === CompStyle.Card_10) { |
| @@ -141,7 +145,7 @@ export struct CompParser { | @@ -141,7 +145,7 @@ export struct CompParser { | ||
| 141 | 145 | ||
| 142 | @Builder | 146 | @Builder |
| 143 | componentBuilder() { | 147 | componentBuilder() { |
| 144 | - this.beforeDevider(); | 148 | + // this.beforeDevider(); |
| 145 | 149 | ||
| 146 | if (this.compDTO.operDataList[0]?.objectType !== '3' && | 150 | if (this.compDTO.operDataList[0]?.objectType !== '3' && |
| 147 | this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 | 151 | this.compDTO.operDataList[0]?.objectType !== '13') { //暂时屏蔽活动和音频详情入口 |
-
Please register or login to post a comment