fix:
1、18558 我的频道下默认选中的推荐和热点频道按钮未能使用圆角; 2、18559 更多频道”和“地方频道”下的频道按钮未能使用圆角
Showing
3 changed files
with
16 additions
and
13 deletions
| @@ -40,7 +40,7 @@ struct ChannelSubscriptionLayout { | @@ -40,7 +40,7 @@ struct ChannelSubscriptionLayout { | ||
| 40 | 40 | ||
| 41 | aboutToAppear() { | 41 | aboutToAppear() { |
| 42 | this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex] | 42 | this.currentTopNavSelectedItem = this.myChannelList[this.currentTopNavSelectedIndex] |
| 43 | - this.myChannelList.forEach(item=>{ | 43 | + this.myChannelList.forEach(item => { |
| 44 | this.channelIds.push(item.channelId) | 44 | this.channelIds.push(item.channelId) |
| 45 | }) | 45 | }) |
| 46 | } | 46 | } |
| @@ -53,8 +53,9 @@ struct ChannelSubscriptionLayout { | @@ -53,8 +53,9 @@ struct ChannelSubscriptionLayout { | ||
| 53 | this.channelIds.splice(index2, 0, channelIdTmp[0]) | 53 | this.channelIds.splice(index2, 0, channelIdTmp[0]) |
| 54 | AppStorage.setOrCreate('channelIds', this.channelIds.join(',')) | 54 | AppStorage.setOrCreate('channelIds', this.channelIds.join(',')) |
| 55 | } | 55 | } |
| 56 | + | ||
| 56 | //删除频道 | 57 | //删除频道 |
| 57 | - delChannelItem(index: number){ | 58 | + delChannelItem(index: number) { |
| 58 | let item = this.myChannelList.splice(index, 1)[0] | 59 | let item = this.myChannelList.splice(index, 1)[0] |
| 59 | this.channelIds.splice(index, 1) | 60 | this.channelIds.splice(index, 1) |
| 60 | AppStorage.setOrCreate('channelIds', JSON.stringify(this.channelIds)) | 61 | AppStorage.setOrCreate('channelIds', JSON.stringify(this.channelIds)) |
| @@ -65,8 +66,9 @@ struct ChannelSubscriptionLayout { | @@ -65,8 +66,9 @@ struct ChannelSubscriptionLayout { | ||
| 65 | this.localChannelList.unshift(item) | 66 | this.localChannelList.unshift(item) |
| 66 | } | 67 | } |
| 67 | } | 68 | } |
| 69 | + | ||
| 68 | // 添加频道 | 70 | // 添加频道 |
| 69 | - addChannelItem(item: TopNavDTO){ | 71 | + addChannelItem(item: TopNavDTO) { |
| 70 | this.channelIds.push(item.channelId) | 72 | this.channelIds.push(item.channelId) |
| 71 | this.myChannelList.push(item) | 73 | this.myChannelList.push(item) |
| 72 | AppStorage.setOrCreate('channelIds', this.channelIds.join(',')) | 74 | AppStorage.setOrCreate('channelIds', this.channelIds.join(',')) |
| @@ -323,9 +325,10 @@ struct ChannelSubscriptionLayout { | @@ -323,9 +325,10 @@ struct ChannelSubscriptionLayout { | ||
| 323 | } | 325 | } |
| 324 | .width('23%') | 326 | .width('23%') |
| 325 | .height(40) | 327 | .height(40) |
| 328 | + .borderRadius(3) | ||
| 326 | .border({ | 329 | .border({ |
| 327 | - width: item.headlinesOn === 1 || item.movePermitted === 0 ? 0 : 1, | ||
| 328 | - color: '#EDEDED', | 330 | + width: 0.7, |
| 331 | + color: item.headlinesOn === 1 || item.movePermitted === 0 ? '#F5F5F5' : '#EDEDED', | ||
| 329 | radius: 3 | 332 | radius: 3 |
| 330 | }) | 333 | }) |
| 331 | .zIndex(this.dragItem == item.num ? 1 : 0) | 334 | .zIndex(this.dragItem == item.num ? 1 : 0) |
| @@ -427,8 +430,9 @@ struct ChannelSubscriptionLayout { | @@ -427,8 +430,9 @@ struct ChannelSubscriptionLayout { | ||
| 427 | .width(80) | 430 | .width(80) |
| 428 | .height(40) | 431 | .height(40) |
| 429 | .border({ | 432 | .border({ |
| 430 | - width: 1, | ||
| 431 | - color: '#EDEDED' | 433 | + width: 0.7, |
| 434 | + color: '#EDEDED', | ||
| 435 | + radius: 3 | ||
| 432 | }) | 436 | }) |
| 433 | }, (item: TopNavDTO) => JSON.stringify(item)) | 437 | }, (item: TopNavDTO) => JSON.stringify(item)) |
| 434 | } | 438 | } |
| @@ -471,8 +475,9 @@ struct ChannelSubscriptionLayout { | @@ -471,8 +475,9 @@ struct ChannelSubscriptionLayout { | ||
| 471 | .width(80) | 475 | .width(80) |
| 472 | .height(40) | 476 | .height(40) |
| 473 | .border({ | 477 | .border({ |
| 474 | - width: 1, | ||
| 475 | - color: '#EDEDED' | 478 | + width: 0.7, |
| 479 | + color: '#EDEDED', | ||
| 480 | + radius: 3 | ||
| 476 | }) | 481 | }) |
| 477 | }, (item: TopNavDTO) => JSON.stringify(item)) | 482 | }, (item: TopNavDTO) => JSON.stringify(item)) |
| 478 | } | 483 | } |
| @@ -203,7 +203,6 @@ export struct TopNavigationComponentNew { | @@ -203,7 +203,6 @@ export struct TopNavigationComponentNew { | ||
| 203 | moreChannelList: $moreChannelList, | 203 | moreChannelList: $moreChannelList, |
| 204 | localChannelList: $localChannelList, | 204 | localChannelList: $localChannelList, |
| 205 | changeTab: (index) => { | 205 | changeTab: (index) => { |
| 206 | - | ||
| 207 | this.changePage(index) | 206 | this.changePage(index) |
| 208 | } | 207 | } |
| 209 | }) | 208 | }) |
| @@ -125,7 +125,6 @@ export struct TopPlayComponent { | @@ -125,7 +125,6 @@ export struct TopPlayComponent { | ||
| 125 | } else { | 125 | } else { |
| 126 | Logger.debug(TAG, `---0------>${playUrl}`) | 126 | Logger.debug(TAG, `---0------>${playUrl}`) |
| 127 | if (StringUtils.isNotEmpty(playUrl)) { | 127 | if (StringUtils.isNotEmpty(playUrl)) { |
| 128 | - Logger.debug(TAG, `---isNotEmpty------>`) | ||
| 129 | this.playUrl = playUrl | 128 | this.playUrl = playUrl |
| 130 | this.tryToPlay() | 129 | this.tryToPlay() |
| 131 | } | 130 | } |
| @@ -152,8 +151,8 @@ export struct TopPlayComponent { | @@ -152,8 +151,8 @@ export struct TopPlayComponent { | ||
| 152 | this.previewUrl = '' | 151 | this.previewUrl = '' |
| 153 | } | 152 | } |
| 154 | } | 153 | } |
| 155 | - Logger.debug(TAG, | ||
| 156 | - `---0------>` + this.isWait + ' ->' + this.isHideLoading + ' ->' + this.isEnd + ' -->' + this.isVideoSource) | 154 | + // Logger.debug(TAG, |
| 155 | + // `---0------>` + this.isWait + ' ->' + this.isHideLoading + ' ->' + this.isEnd + ' -->' + this.isVideoSource) | ||
| 157 | } | 156 | } |
| 158 | 157 | ||
| 159 | tryToPlay() { | 158 | tryToPlay() { |
-
Please register or login to post a comment