wangliang_wd

feat:优化电子报间距,优化tabs显示错误问题

@@ -199,7 +199,7 @@ export struct ENewspaperListDialog { @@ -199,7 +199,7 @@ export struct ENewspaperListDialog {
199 .fontColor($r('app.color.color_222222')) 199 .fontColor($r('app.color.color_222222'))
200 .fontWeight(600)// .maxLines(2) 200 .fontWeight(600)// .maxLines(2)
201 .margin({ 201 .margin({
202 - bottom: 12 202 + bottom: 8
203 }) 203 })
204 } 204 }
205 205
@@ -195,11 +195,11 @@ export struct BottomNavigationComponent { @@ -195,11 +195,11 @@ export struct BottomNavigationComponent {
195 getBottomImageKnifeOption(navItem: BottomNavDTO, isSelect: boolean): ImageKnifeOption { 195 getBottomImageKnifeOption(navItem: BottomNavDTO, isSelect: boolean): ImageKnifeOption {
196 196
197 let defaultIcon = this.getBottomLocalIcon(navItem, isSelect) 197 let defaultIcon = this.getBottomLocalIcon(navItem, isSelect)
198 - let url = this.getBottomIcon(navItem, isSelect) 198 + let url = this.getBottomIcon(navItem, isSelect) as string
199 // Logger.info(TAG, `onChange111, 本地的地址: ${defaultIcon}`); 199 // Logger.info(TAG, `onChange111, 本地的地址: ${defaultIcon}`);
200 200
201 let imageKnifeOption: ImageKnifeOption = { 201 let imageKnifeOption: ImageKnifeOption = {
202 - loadSrc: url, 202 + loadSrc: url.length > 0?url:defaultIcon,
203 // 占位图使用本地资源 203 // 占位图使用本地资源
204 placeholderSrc: defaultIcon, 204 placeholderSrc: defaultIcon,
205 // 失败占位图使用本地资源 205 // 失败占位图使用本地资源
@@ -215,7 +215,7 @@ export struct BottomNavigationComponent { @@ -215,7 +215,7 @@ export struct BottomNavigationComponent {
215 return imageKnifeOption 215 return imageKnifeOption
216 } 216 }
217 217
218 - private getBottomIcon(navItem: BottomNavDTO, isSelect: boolean): string | Resource { 218 + private getBottomIcon(navItem: BottomNavDTO, isSelect: boolean): string {
219 if (!navItem) { 219 if (!navItem) {
220 return '' 220 return ''
221 } 221 }