Showing
3 changed files
with
9 additions
and
4 deletions
| @@ -104,7 +104,7 @@ export struct CardParser { | @@ -104,7 +104,7 @@ export struct CardParser { | ||
| 104 | pageId: this.pageId, | 104 | pageId: this.pageId, |
| 105 | pageName: this.pageName | 105 | pageName: this.pageName |
| 106 | }) | 106 | }) |
| 107 | - } else if (contentDTO.appStyle === CompStyle.Card_10) { | 107 | + } else if (contentDTO.appStyle === CompStyle.Card_10 || contentDTO.appStyle === CompStyle.Card_09) { |
| 108 | Card10Component({ | 108 | Card10Component({ |
| 109 | compDTO: this.compDTO, | 109 | compDTO: this.compDTO, |
| 110 | contentDTO, | 110 | contentDTO, |
| 1 | import { ContentDTO, slideShows, VideoInfoDTO, CompDTO, InteractDataDTO } from 'wdBean'; | 1 | import { ContentDTO, slideShows, VideoInfoDTO, CompDTO, InteractDataDTO } from 'wdBean'; |
| 2 | -import { CommonConstants } from 'wdConstant'; | 2 | +import { CommonConstants, CompStyle } from 'wdConstant'; |
| 3 | import { ProcessUtils } from 'wdRouter'; | 3 | import { ProcessUtils } from 'wdRouter'; |
| 4 | import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; | 4 | import { CardSourceInfo } from '../cardCommon/CardSourceInfo'; |
| 5 | import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; | 5 | import { CardMediaInfo } from '../cardCommon/CardMediaInfo'; |
| @@ -99,7 +99,7 @@ export struct Card10Component { | @@ -99,7 +99,7 @@ export struct Card10Component { | ||
| 99 | .width(CommonConstants.FULL_WIDTH) | 99 | .width(CommonConstants.FULL_WIDTH) |
| 100 | .fontSize($r('app.float.font_size_18')) | 100 | .fontSize($r('app.float.font_size_18')) |
| 101 | .fontWeight(FontWeight.Normal) | 101 | .fontWeight(FontWeight.Normal) |
| 102 | - .maxLines(1) | 102 | + .maxLines(this.contentDTO.appStyle === CompStyle.Card_09?2:1) |
| 103 | .textOverflow({ overflow: TextOverflow.Ellipsis }) | 103 | .textOverflow({ overflow: TextOverflow.Ellipsis }) |
| 104 | .margin({ bottom: 19 }) | 104 | .margin({ bottom: 19 }) |
| 105 | .onClick((event: ClickEvent) => { | 105 | .onClick((event: ClickEvent) => { |
| @@ -184,6 +184,12 @@ struct PeopleShipHomePage { | @@ -184,6 +184,12 @@ struct PeopleShipHomePage { | ||
| 184 | Logger.debug('PeopleShipHomePage', '获取页面信息' + `${JSON.stringify(this.detailModel)}`) | 184 | Logger.debug('PeopleShipHomePage', '获取页面信息' + `${JSON.stringify(this.detailModel)}`) |
| 185 | this.isLoading = false | 185 | this.isLoading = false |
| 186 | 186 | ||
| 187 | + } catch (exception) { | ||
| 188 | + this.isLoading = false | ||
| 189 | + this.isHasHomePage = false | ||
| 190 | + } | ||
| 191 | + | ||
| 192 | + try { | ||
| 187 | // 获取关注 | 193 | // 获取关注 |
| 188 | // 登录后获取,是否关注 | 194 | // 登录后获取,是否关注 |
| 189 | if (HttpUtils.getUserId()) { | 195 | if (HttpUtils.getUserId()) { |
| @@ -194,7 +200,6 @@ struct PeopleShipHomePage { | @@ -194,7 +200,6 @@ struct PeopleShipHomePage { | ||
| 194 | 200 | ||
| 195 | } catch (exception) { | 201 | } catch (exception) { |
| 196 | this.isLoading = false | 202 | this.isLoading = false |
| 197 | - this.isHasHomePage = false | ||
| 198 | } | 203 | } |
| 199 | } | 204 | } |
| 200 | 205 |
-
Please register or login to post a comment