developOne / harmonyPool

Go to a project
Toggle navigation Toggle navigation pinning
张善主
870a024e 2 parents 6ea1d556 63d79d4a

Merge remote-tracking branch 'origin/main'

Inline Side-by-side
Showing 18 changed files with 92 additions and 43 deletions
@@ -42,10 +42,12 @@ export struct ENewspaperPageComponent { @@ -42,10 +42,12 @@ export struct ENewspaperPageComponent {
42 console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date)) 42 console.log("onDateChange-日历选择弹框", "date：", JSON.stringify(date))
43 if (date.fullYear && date.month && date.date) { 43 if (date.fullYear && date.month && date.date) {
44 let month: number = date.month + 1 44 let month: number = date.month + 1
45 - this.calendarDate = `${date.fullYear}-${month > 9 ? month : '0' + month}-${date.date > 9 ? date.date : '0' + date.date}` 45 + this.calendarDate =
  46 + `${date.fullYear}-${month > 9 ? month : '0' + month}-${date.date > 9 ? date.date : '0' + date.date}`
46 this.getNewspaperTime() 47 this.getNewspaperTime()
47 this.getNewspaperList() 48 this.getNewspaperList()
48 - this.selectDate = new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0) 49 + this.selectDate =
  50 + new Date(date.fullYear ? date.fullYear : 0, date.month ? date.month : 0, date.date ? date.date : 0)
49 } 51 }
50 } 52 }
51 }), 53 }),
@@ -81,8 +83,8 @@ export struct ENewspaperPageComponent { @@ -81,8 +83,8 @@ export struct ENewspaperPageComponent {
81 this.picHeight = this.picWidth * 566 / 378 83 this.picHeight = this.picWidth * 566 / 378
82 //注册字体 84 //注册字体
83 font.registerFont({ 85 font.registerFont({
84 - familyName: 'BebasNeue_Regular',  
85 - familySrc: $rawfile('font/BebasNeue_Regular.otf') 86 + familyName: 'BebasNeueBold',
  87 + familySrc: $rawfile('font/BebasNeueBold.otf')
86 }) 88 })
87 this.getNewspaperTime() 89 this.getNewspaperTime()
88 this.getNewspaperList() 90 this.getNewspaperList()
@@ -117,7 +119,7 @@ export struct ENewspaperPageComponent { @@ -117,7 +119,7 @@ export struct ENewspaperPageComponent {
117 Text(this.calendarDate?.replace('-', '.')?.replace('-', '.')) 119 Text(this.calendarDate?.replace('-', '.')?.replace('-', '.'))
118 .fontSize($r('app.float.font_size_20')) 120 .fontSize($r('app.float.font_size_20'))
119 .fontColor($r('app.color.white')) 121 .fontColor($r('app.color.white'))
120 - .fontFamily('BebasNeue_Regular') 122 + .fontFamily('BebasNeueBold')
121 .fontWeight(FontWeight.Regular) 123 .fontWeight(FontWeight.Regular)
122 124
123 Image($r('app.media.icon_triangle')) 125 Image($r('app.media.icon_triangle'))
@@ -148,6 +150,7 @@ export struct ENewspaperPageComponent { @@ -148,6 +150,7 @@ export struct ENewspaperPageComponent {
148 center: { anchor: "__container__", align: VerticalAlign.Center } 150 center: { anchor: "__container__", align: VerticalAlign.Center }
149 }) 151 })
150 .id('e_newspaper_share') 152 .id('e_newspaper_share')
  153 + .visibility(Visibility.Hidden)
151 } 154 }
152 .margin({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') }) 155 .margin({ left: $r('app.float.margin_16'), right: $r('app.float.margin_16') })
153 .height($r('app.float.top_bar_height')) 156 .height($r('app.float.top_bar_height'))
@@ -208,13 +211,15 @@ export struct ENewspaperPageComponent { @@ -208,13 +211,15 @@ export struct ENewspaperPageComponent {
208 .id('e_newspaper_shadow') 211 .id('e_newspaper_shadow')
209 212
210 Row() { 213 Row() {
211 - Text(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? '已到底部，可以选择其他日期' : '滑动查看下一版') 214 + Text(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? '已到底部，可以选择其他日期' :
  215 + '滑动查看下一版')
212 .fontColor(Color.White) 216 .fontColor(Color.White)
213 .fontSize($r('app.float.font_size_14')) 217 .fontSize($r('app.float.font_size_14'))
214 Image($r('app.media.icon_next_page')) 218 Image($r('app.media.icon_next_page'))
215 .width($r('app.float.vp_16')) 219 .width($r('app.float.vp_16'))
216 .height($r('app.float.vp_16')) 220 .height($r('app.float.vp_16'))
217 - .visibility(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? Visibility.None : Visibility.Visible) 221 + .visibility(this.swiperIndex + 1 == this.newspaperListBean?.list?.length ? Visibility.None :
  222 + Visibility.Visible)
218 } 223 }
219 .justifyContent(FlexAlign.Center) 224 .justifyContent(FlexAlign.Center)
220 .margin({ top: $r('app.float.margin_16') }) 225 .margin({ top: $r('app.float.margin_16') })
@@ -232,7 +237,7 @@ export struct ENewspaperPageComponent { @@ -232,7 +237,7 @@ export struct ENewspaperPageComponent {
232 Text(this.currentPageNum) 237 Text(this.currentPageNum)
233 .fontSize($r('app.float.font_size_36')) 238 .fontSize($r('app.float.font_size_36'))
234 .fontColor($r('app.color.white')) 239 .fontColor($r('app.color.white'))
235 - .fontFamily('BebasNeue_Regular') 240 + .fontFamily('BebasNeueBold')
236 Text('版') 241 Text('版')
237 .fontSize($r('app.float.font_size_16')) 242 .fontSize($r('app.float.font_size_16'))
238 .fontColor($r('app.color.white')) 243 .fontColor($r('app.color.white'))
@@ -108,7 +108,7 @@ export struct ImageAndTextPageComponent { @@ -108,7 +108,7 @@ export struct ImageAndTextPageComponent {
108 .height(24) 108 .height(24)
109 .margin({ right: 5 }) 109 .margin({ right: 5 })
110 } 110 }
111 - if (this.interactData?.likeNum != '0') { 111 + if (this.interactData?.likeNum) {
112 Text(`${this.interactData?.likeNum}`) 112 Text(`${this.interactData?.likeNum}`)
113 .fontSize(16) 113 .fontSize(16)
114 .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999') 114 .fontColor(this.newsStatusOfUser?.likeStatus === '1' ? '#ED2800' : '#999999')
@@ -150,7 +150,10 @@ export struct SingleColumn999Component { @@ -150,7 +150,10 @@ export struct SingleColumn999Component {
150 scrollBackward: NestedScrollMode.SELF_FIRST 150 scrollBackward: NestedScrollMode.SELF_FIRST
151 }) 151 })
152 } else { 152 } else {
153 - EmptyComponent({ emptyHeight: 200 }) 153 + if (this.compListItem && this.compListItem?.operDataList) {
  154 + EmptyComponent({ emptyHeight: 200 })
  155 + }
  156 +
154 } 157 }
155 } 158 }
156 159
@@ -63,10 +63,10 @@ export struct MultiPictureDetailPageComponent { @@ -63,10 +63,10 @@ export struct MultiPictureDetailPageComponent {
63 this.picHeight = this.picWidth * 578 / 375 63 this.picHeight = this.picWidth * 578 / 375
64 this.titleHeight = this.screenWidth * 178 / 375 64 this.titleHeight = this.screenWidth * 178 / 375
65 //注册字体 65 //注册字体
66 - font.registerFont({  
67 - familyName: 'BebasNeue_Regular',  
68 - familySrc: $rawfile('font/BebasNeue_Regular.otf')  
69 - }) 66 + // font.registerFont({
  67 + // familyName: 'BebasNeueBold',
  68 + // familySrc: $rawfile('font/BebasNeueBold.otf')
  69 + // })
70 // 注册监听网络连接 70 // 注册监听网络连接
71 let netStatus = NetworkUtil.isNetConnected() 71 let netStatus = NetworkUtil.isNetConnected()
72 if (netStatus) { 72 if (netStatus) {
@@ -110,7 +110,7 @@ export struct RMCalendar { @@ -110,7 +110,7 @@ export struct RMCalendar {
110 if (this.onDateChange) { 110 if (this.onDateChange) {
111 this.onDateChange(item) 111 this.onDateChange(item)
112 if (item.fullYear && item.month) { 112 if (item.fullYear && item.month) {
113 - this.title = `${item.fullYear}年${item.month + 1}月` 113 + this.title = `${item.fullYear}年${this.getMonthStr(item.month + 1)}月`
114 } 114 }
115 } 115 }
116 } 116 }
@@ -191,18 +191,20 @@ export struct RMCalendar { @@ -191,18 +191,20 @@ export struct RMCalendar {
191 */ 191 */
192 private calcData() { 192 private calcData() {
193 193
194 - this.title = `${this.selectDay.getFullYear()}年${this.selectDay.getMonth() + 1}月` 194 + this.title = `${this.selectDay.getFullYear()}年${this.getMonthStr(this.selectDay.getMonth() + 1)}月`
195 this.selectDay.setDate(1) 195 this.selectDay.setDate(1)
196 196
197 if (this.selectDay.getFullYear() < this.startDate.getFullYear() 197 if (this.selectDay.getFullYear() < this.startDate.getFullYear()
198 - || (this.selectDay.getFullYear() == this.startDate.getFullYear() && this.selectDay.getMonth() <= this.startDate.getMonth())) { 198 + || (this.selectDay.getFullYear() == this.startDate.getFullYear() &&
  199 + this.selectDay.getMonth() <= this.startDate.getMonth())) {
199 this.hasPre = false 200 this.hasPre = false
200 } else { 201 } else {
201 this.hasPre = true 202 this.hasPre = true
202 } 203 }
203 204
204 if (this.selectDay.getFullYear() > this.endDate.getFullYear() 205 if (this.selectDay.getFullYear() > this.endDate.getFullYear()
205 - || (this.selectDay.getFullYear() == this.endDate.getFullYear() && this.selectDay.getMonth() >= this.endDate.getMonth())) { 206 + || (this.selectDay.getFullYear() == this.endDate.getFullYear() &&
  207 + this.selectDay.getMonth() >= this.endDate.getMonth())) {
206 this.hasNext = false 208 this.hasNext = false
207 } else { 209 } else {
208 this.hasNext = true 210 this.hasNext = true
@@ -274,7 +276,8 @@ export struct RMCalendar { @@ -274,7 +276,8 @@ export struct RMCalendar {
274 Text(this.title) 276 Text(this.title)
275 .fontSize(this.titleFontSize) 277 .fontSize(this.titleFontSize)
276 .fontColor(this.titleFontColor) 278 .fontColor(this.titleFontColor)
277 - .fontWeight(this.titleFontWeight) 279 + .fontWeight(600)
  280 + .fontFamily('PingFang SC-Semibold')
278 } 281 }
279 282
280 Blank() 283 Blank()
@@ -318,7 +321,22 @@ export struct RMCalendar { @@ -318,7 +321,22 @@ export struct RMCalendar {
318 left: 35, 321 left: 35,
319 right: 35 322 right: 35
320 }) 323 })
  324 + .padding(
  325 + { bottom: 20 })
321 .border({ radius: 4 }) 326 .border({ radius: 4 })
322 } 327 }
323 } 328 }
  329 +
  330 + getMonthStr(month?: number): string {
  331 + if (!month) {
  332 + return ''
  333 + }
  334 + if (month <= 0) {
  335 + return ''
  336 + }
  337 + if (month <= 9) {
  338 + return '0' + month
  339 + }
  340 + return month + ''
  341 + }
324 } 342 }
@@ -100,7 +100,7 @@ export struct RMCalenderCell { @@ -100,7 +100,7 @@ export struct RMCalenderCell {
100 .fontSize(this.itemFontSize) 100 .fontSize(this.itemFontSize)
101 .fontColor(this.getItemColor()) 101 .fontColor(this.getItemColor())
102 .fontWeight(this.itemFontWeight) 102 .fontWeight(this.itemFontWeight)
103 - .fontFamily('BebasNeue_Regular') 103 + .fontFamily('BebasNeueBold')
104 } 104 }
105 } 105 }
106 // .justifyContent(FlexAlign.Center) 106 // .justifyContent(FlexAlign.Center)
@@ -30,6 +30,7 @@ const TAG = 'Zh_Single_Row-06' @@ -30,6 +30,7 @@ const TAG = 'Zh_Single_Row-06'
30 @Component 30 @Component
31 export struct ZhSingleRow06 { 31 export struct ZhSingleRow06 {
32 @State compDTO: CompDTO = {} as CompDTO 32 @State compDTO: CompDTO = {} as CompDTO
  33 + @State likeBl: boolean = false;
33 34
34 build() { 35 build() {
35 Column() { 36 Column() {
@@ -81,7 +82,7 @@ export struct ZhSingleRow06 { @@ -81,7 +82,7 @@ export struct ZhSingleRow06 {
81 .fontColor(0x999999) 82 .fontColor(0x999999)
82 83
83 Row(){ 84 Row(){
84 - Image($r('app.media.icon_like_no')) 85 + Image(this.likeBl ? $r('app.media.icon_like_select') : $r('app.media.icon_like'))
85 .width(16) 86 .width(16)
86 .height(16) 87 .height(16)
87 .margin({right: 3}) 88 .margin({right: 3})
@@ -90,6 +91,13 @@ export struct ZhSingleRow06 { @@ -90,6 +91,13 @@ export struct ZhSingleRow06 {
90 .fontSize(14) 91 .fontSize(14)
91 .fontColor(0x999999) 92 .fontColor(0x999999)
92 } 93 }
  94 + .onClick(() => {
  95 + if (this.likeBl) {
  96 + this.likeBl = false;
  97 + } else {
  98 + this.likeBl = true;
  99 + }
  100 + })
93 } 101 }
94 .justifyContent(FlexAlign.SpaceBetween) 102 .justifyContent(FlexAlign.SpaceBetween)
95 .width('100%') 103 .width('100%')
@@ -67,14 +67,15 @@ export struct PeopleShipHomePageNavComponent { @@ -67,14 +67,15 @@ export struct PeopleShipHomePageNavComponent {
67 Row(){ 67 Row(){
68 Image($r('app.media.people_ship_top_add')) 68 Image($r('app.media.people_ship_top_add'))
69 .objectFit(ImageFit.Auto) 69 .objectFit(ImageFit.Auto)
70 - .width('12vp')  
71 - .height('12pv') 70 + .width('13vp')
  71 + .height('13pv')
72 .margin({ 72 .margin({
73 - right: '2vp' 73 + right: '3vp'
74 }) 74 })
75 Text('关注') 75 Text('关注')
76 .fontSize($r('app.float.vp_12')) 76 .fontSize($r('app.float.vp_12'))
77 .fontColor(Color.White) 77 .fontColor(Color.White)
  78 + .height('100%')
78 } 79 }
79 .alignSelf(ItemAlign.Center) 80 .alignSelf(ItemAlign.Center)
80 .justifyContent(FlexAlign.Center) 81 .justifyContent(FlexAlign.Center)
@@ -53,9 +53,12 @@ export default struct CustomLayout { @@ -53,9 +53,12 @@ export default struct CustomLayout {
53 .visibility(this.refreshBean.loadStatus === LoadStatus.LOADING ? Visibility.Visible : Visibility.Hidden) 53 .visibility(this.refreshBean.loadStatus === LoadStatus.LOADING ? Visibility.Visible : Visibility.Hidden)
54 54
55 Text('已更新至最新') 55 Text('已更新至最新')
56 - .fontSize(17) 56 + .fontSize(14)
57 .textAlign(TextAlign.Center) 57 .textAlign(TextAlign.Center)
58 - .fontColor('#bbbbbb') 58 + .fontColor('#676767')
  59 + .backgroundColor('#f6f6f6')
  60 + .borderRadius(20)
  61 + .padding({ left: 19, right: 19, top: 10, bottom: 10 })
59 .visibility(this.refreshBean.loadStatus != LoadStatus.LOADED ? Visibility.Hidden : Visibility.Visible) 62 .visibility(this.refreshBean.loadStatus != LoadStatus.LOADED ? Visibility.Hidden : Visibility.Visible)
60 63
61 } 64 }
@@ -42,7 +42,7 @@ export struct SearchHistoryComponent{ @@ -42,7 +42,7 @@ export struct SearchHistoryComponent{
42 Row(){ 42 Row(){
43 Text("搜索历史") 43 Text("搜索历史")
44 .textAlign(TextAlign.Center) 44 .textAlign(TextAlign.Center)
45 - .fontWeight('400lpx') 45 + .fontWeight(FontWeight.Regular)
46 .fontSize('27lpx') 46 .fontSize('27lpx')
47 .lineHeight('38lpx') 47 .lineHeight('38lpx')
48 .fontColor($r('app.color.color_999999')) 48 .fontColor($r('app.color.color_999999'))
@@ -68,7 +68,7 @@ export struct SearchHistoryComponent{ @@ -68,7 +68,7 @@ export struct SearchHistoryComponent{
68 Text(`${item.searchContent}`) 68 Text(`${item.searchContent}`)
69 .fontColor($r('app.color.color_222222')) 69 .fontColor($r('app.color.color_222222'))
70 .fontSize('31lpx') 70 .fontSize('31lpx')
71 - .fontWeight('400lpx') 71 + .fontWeight(FontWeight.Regular)
72 .lineHeight('46lpx') 72 .lineHeight('46lpx')
73 .maxLines(1) 73 .maxLines(1)
74 .constraintSize({maxWidth:index%2 === 0?'270lpx':'230lpx'}) 74 .constraintSize({maxWidth:index%2 === 0?'270lpx':'230lpx'})
@@ -68,7 +68,7 @@ export struct SearchHotsComponent{ @@ -68,7 +68,7 @@ export struct SearchHotsComponent{
68 .height('31lpx') 68 .height('31lpx')
69 .fontColor($r('app.color.color_666666')) 69 .fontColor($r('app.color.color_666666'))
70 .fontSize('27lpx') 70 .fontSize('27lpx')
71 - .fontWeight('400lpx') 71 + .fontWeight(FontWeight.Regular)
72 .lineHeight('31lpx') 72 .lineHeight('31lpx')
73 .margin({right:'12lpx'}) 73 .margin({right:'12lpx'})
74 } 74 }
@@ -77,7 +77,7 @@ export struct SearchHotsComponent{ @@ -77,7 +77,7 @@ export struct SearchHotsComponent{
77 .fontColor($r('app.color.color_222222')) 77 .fontColor($r('app.color.color_222222'))
78 .fontSize('31lpx') 78 .fontSize('31lpx')
79 .maxLines(1) 79 .maxLines(1)
80 - .fontWeight('400lpx') 80 + .fontWeight(FontWeight.Regular)
81 .lineHeight('42lpx') 81 .lineHeight('42lpx')
82 }.layoutWeight(1) 82 }.layoutWeight(1)
83 83
@@ -13,7 +13,8 @@ export struct ENewspaperListDialog { @@ -13,7 +13,8 @@ export struct ENewspaperListDialog {
13 @State pageDialogShow: boolean = false 13 @State pageDialogShow: boolean = false
14 @State scrollIndex: number = 0 14 @State scrollIndex: number = 0
15 @Prop @Watch('updateRecordsData') newspaperListBean: NewspaperListBean = {} as NewspaperListBean 15 @Prop @Watch('updateRecordsData') newspaperListBean: NewspaperListBean = {} as NewspaperListBean
16 - private listScroller: Scroller = new Scroller(); 16 + private listScroller: Scroller = new Scroller()
  17 + @State scrollOffset: number = 0
17 //文字版选择弹框 18 //文字版选择弹框
18 pageListDialogController: CustomDialogController = new CustomDialogController({ 19 pageListDialogController: CustomDialogController = new CustomDialogController({
19 builder: ENewspaperPageDialog({ 20 builder: ENewspaperPageDialog({
@@ -73,7 +74,7 @@ export struct ENewspaperListDialog { @@ -73,7 +74,7 @@ export struct ENewspaperListDialog {
73 Text(this.currentPageNum) 74 Text(this.currentPageNum)
74 .fontSize($r('app.float.font_size_36')) 75 .fontSize($r('app.float.font_size_36'))
75 .fontColor($r('app.color.color_222222')) 76 .fontColor($r('app.color.color_222222'))
76 - .fontFamily('BebasNeue_Regular') 77 + .fontFamily('BebasNeueBold')
77 Text('版') 78 Text('版')
78 .fontSize($r('app.float.font_size_16')) 79 .fontSize($r('app.float.font_size_16'))
79 .fontColor($r('app.color.color_222222')) 80 .fontColor($r('app.color.color_222222'))
@@ -159,6 +160,7 @@ export struct ENewspaperListDialog { @@ -159,6 +160,7 @@ export struct ENewspaperListDialog {
159 Text(positionItem.newsTxt) 160 Text(positionItem.newsTxt)
160 .fontSize($r('app.float.font_size_14')) 161 .fontSize($r('app.float.font_size_14'))
161 .fontColor($r('app.color.color_999999')) 162 .fontColor($r('app.color.color_999999'))
  163 + .lineHeight(25)
162 .margin({ 164 .margin({
163 // bottom: 15 165 // bottom: 15
164 }) 166 })
@@ -228,18 +230,24 @@ export struct ENewspaperListDialog { @@ -228,18 +230,24 @@ export struct ENewspaperListDialog {
228 .scrollBar(BarState.Off) 230 .scrollBar(BarState.Off)
229 231
230 .onScrollIndex((firstIndex: number, lastIndex: number, centerIndex: number) => { 232 .onScrollIndex((firstIndex: number, lastIndex: number, centerIndex: number) => {
231 - console.info('ENewspaperListDialog::first' + firstIndex)  
232 - console.info('ENewspaperListDialog::last' + lastIndex)  
233 - console.info('ENewspaperListDialog::center' + centerIndex) 233 + // console.info('ENewspaperListDialog::first' + firstIndex)
  234 + // console.info('ENewspaperListDialog::last' + lastIndex)
  235 + // console.info('ENewspaperListDialog::center' + centerIndex)
234 // this.updateCurrentPageNum(firstIndex) 236 // this.updateCurrentPageNum(firstIndex)
235 // const tempIndex = this.findClassIndex(firstIndex) 237 // const tempIndex = this.findClassIndex(firstIndex)
236 if (firstIndex !== centerIndex) { 238 if (firstIndex !== centerIndex) {
237 return 239 return
238 } 240 }
239 - this.currentPageNum = `${centerIndex < 9 ? '0' + (centerIndex + 1) : centerIndex + 1}` 241 + // console.info(`this.scrollOffset:` + this.scrollOffset)
  242 + // if (this.scrollOffset == 0) {
  243 + this.currentPageNum = `${centerIndex < 9 ? '0' + (centerIndex + 1) : centerIndex + 1}`
  244 + // }
240 }) 245 })
241 .onScroll((scrollOffset: number, scrollState: ScrollState) => { 246 .onScroll((scrollOffset: number, scrollState: ScrollState) => {
242 - console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset) 247 + // console.info(`onScroll scrollState = ScrollState` + scrollState + `, scrollOffset = ` + scrollOffset)
  248 + // if (this.scrollOffset == 0) {
  249 + // this.scrollOffset = 0
  250 + // }
243 }) 251 })
244 } 252 }
245 .margin({ top: 124 }) 253 .margin({ top: 124 })
@@ -29,7 +29,7 @@ export struct ENewspaperPageDialog { @@ -29,7 +29,7 @@ export struct ENewspaperPageDialog {
29 Text(item.pageNum) 29 Text(item.pageNum)
30 .fontSize($r('app.float.normal_text_size')) 30 .fontSize($r('app.float.normal_text_size'))
31 .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222')) 31 .fontColor(this.currentPageNum == item.pageNum ? Color.White : $r('app.color.color_222222'))
32 - .fontFamily('BebasNeue_Regular') 32 + .fontFamily('BebasNeueBold')
33 } 33 }
34 .alignItems(VerticalAlign.Center) 34 .alignItems(VerticalAlign.Center)
35 .justifyContent(FlexAlign.Center) 35 .justifyContent(FlexAlign.Center)
@@ -429,7 +429,7 @@ @@ -429,7 +429,7 @@
429 </div> 429 </div>
430 430
431 <!-- 分享 --> 431 <!-- 分享 -->
432 - <div class="share" v-if="shareOpen"> 432 + <div class="share" v-if="false">
433 <div 433 <div
434 v-if="details.shareInfo.sharePosterOpen == 1" 434 v-if="details.shareInfo.sharePosterOpen == 1"
435 class="sharePoster share-wrapper share-box" 435 class="sharePoster share-wrapper share-box"
@@ -31,10 +31,10 @@ struct ENewspaper { @@ -31,10 +31,10 @@ struct ENewspaper {
31 31
32 pageTransition() { 32 pageTransition() {
33 // 定义页面进入时的效果，从底侧滑入 33 // 定义页面进入时的效果，从底侧滑入
34 - PageTransitionEnter({ type: RouteType.None, duration: 300 }) 34 + PageTransitionEnter({ type: RouteType.Push, duration: 400 })
35 .slide(SlideEffect.Bottom) 35 .slide(SlideEffect.Bottom)
36 // 定义页面退出时的效果，向底侧滑出 36 // 定义页面退出时的效果，向底侧滑出
37 - PageTransitionExit({ type: RouteType.None, duration: 300 }) 37 + PageTransitionExit({ type: RouteType.Pop, duration: 400 })
38 .slide(SlideEffect.Bottom) 38 .slide(SlideEffect.Bottom)
39 } 39 }
40 40
@@ -2,8 +2,6 @@ import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } fr @@ -2,8 +2,6 @@ import { BottomNavigationComponent, LogoutViewModel, PermissionDesComponent } fr
2 import { BreakpointConstants } from 'wdConstant'; 2 import { BreakpointConstants } from 'wdConstant';
3 3
4 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger } from 'wdKit'; 4 import { BreakpointSystem, EmitterEventId, EmitterUtils, Logger } from 'wdKit';
5 -import router from '@ohos.router';  
6 -import { promptAction } from '@kit.ArkUI';  
7 import { HWLocationUtils, WDPushNotificationManager } from 'wdHwAbility/Index'; 5 import { HWLocationUtils, WDPushNotificationManager } from 'wdHwAbility/Index';
8 import { common } from '@kit.AbilityKit'; 6 import { common } from '@kit.AbilityKit';
9 7
@@ -44,6 +42,11 @@ struct MainPage { @@ -44,6 +42,11 @@ struct MainPage {
44 }) 42 })
45 } 43 }
46 44
  45 + pageTransition() {
  46 + PageTransitionEnter({ type: RouteType.None, duration: 0 })
  47 + PageTransitionExit({ type: RouteType.None, duration: 0 })
  48 + }
  49 +
47 aboutToDisappear() { 50 aboutToDisappear() {
48 this.breakpointSystem.unregister() 51 this.breakpointSystem.unregister()
49 Logger.info(TAG, 'aboutToDisappear'); 52 Logger.info(TAG, 'aboutToDisappear');