Merge remote-tracking branch 'origin/main'

 @CustomDialog
 export struct CustomToast {
-  public static LENGTH_LONG = 5000;
-  public static LENGTH_SHORT = 3000;
+  public static LENGTH_LONG = 4000;
+  public static LENGTH_SHORT = 2000;
 
   @State msg: string = ""
   @State duration: number = CustomToast.LENGTH_SHORT
@@ -29,6 +29,7 @@ export struct CustomToast {
           .fontColor($r('app.color.white'))
           .fontSize("27lpx")
           .lineHeight("38lpx")
+          .textAlign(TextAlign.Center)
     }.borderRadius(`${this.bgBorderRadius}lpx`)
     .constraintSize({maxWidth:"86%"})
     .padding({top:"23lpx",bottom:'23lpx',left:"35lpx",right:"35lpx"})

@@ -270,6 +270,7 @@ export struct MultiPictureDetailPageComponent {
       .indicator(false)
       .displayCount(1)
       .loop(false)
+      .effectMode(EdgeEffect.None)
       .id('e_swiper_content')
       .alignRules({
         center: { anchor: "__container__", align: VerticalAlign.Center },

@@ -38,6 +38,8 @@ export struct Card6Component {
           Stack() {
             if (this.contentDTO.newTags) {
               Notes({ newTags: this.contentDTO.newTags })
+            } else if (this.contentDTO.objectType == '5') {
+              Notes({ objectType: this.contentDTO.objectType })
             }
 
             Text(`${this.contentDTO.newsTitle}`)
@@ -48,7 +50,8 @@ export struct Card6Component {
               .alignSelf(ItemAlign.Start)
               .textOverflow({ overflow: TextOverflow.Ellipsis })// 超出的部分显示省略号。
               .textIndent(this.contentDTO.newTags?.length < 5 && this.contentDTO.newTags?.length > 2 ? 60 :
-                this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length < 3 ? 30 : 0)
+                (this.contentDTO.newTags?.length != 0 && this.contentDTO.newTags?.length) ||
+                  this.contentDTO.objectType == '5' ? 30 : 0)
           }.alignContent(Alignment.TopStart)
 
         }.height("80%")
@@ -64,7 +67,7 @@ export struct Card6Component {
 
       Stack() {
         Image(this.loadImg ? this.contentDTO.coverUrl : '')
-          .backgroundColor( this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
+          .backgroundColor(this.loadImg ? $r('app.color.color_B0B0B0') : 0xf5f5f5)
           .borderRadius(5)
           .aspectRatio(this.contentDTO.appStyle === CompStyle.Card_13 ? 3 / 2 : 3 / 4)
           .height(this.contentDTO.appStyle === CompStyle.Card_13 ? 90 : 180)

@@ -136,13 +136,13 @@ export struct Card9Component {
               .textOverflow({ overflow: TextOverflow.Ellipsis })
               .alignSelf(ItemAlign.Center)
               .margin({ left: 12 })
-            if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
-              Image(this.loadImg? item.fullColumnImgUrls[0].url : '')
-                .backgroundColor(0xf5f5f5)
-                .width(90)
-                .height(60)
-                .borderRadius($r('app.float.image_border_radius'))
-            }
+            // if (item.fullColumnImgUrls[0] && item.fullColumnImgUrls[0].url) {
+            //   Image(this.loadImg? item.fullColumnImgUrls[0].url : '')
+            //     .backgroundColor(0xf5f5f5)
+            //     .width(90)
+            //     .height(60)
+            //     .borderRadius($r('app.float.image_border_radius'))
+            // }
           }
         }
       }

@@ -37,8 +37,6 @@ struct ForgetPasswordPage {
     }),
     autoCancel: false,
     alignment: DialogAlignment.Center,
-    offset: { dx: 0, dy: -20 },
-    gridCount: 1,
     customStyle: true,
     maskColor:"#00000000"
   })

@@ -53,8 +53,6 @@ struct LoginPage {
     }),
     autoCancel: false,
     alignment: DialogAlignment.Center,
-    offset: { dx: 0, dy: -20 },
-    gridCount: 1,
     customStyle: true,
     maskColor:"#00000000"
   })

@@ -24,8 +24,6 @@ struct ModifyPasswordPage {
     }),
     autoCancel: false,
     alignment: DialogAlignment.Center,
-    offset: { dx: 0, dy: -20 },
-    gridCount: 1,
     customStyle: true,
     maskColor:"#00000000"
   })

@@ -64,8 +64,6 @@ export struct SettingPasswordLayout {
     }),
     autoCancel: false,
     alignment: DialogAlignment.Center,
-    offset: { dx: 0, dy: -20 },
-    gridCount: 1,
     customStyle: true,
     maskColor:"#00000000"
   })
@@ -327,7 +325,7 @@ export struct SettingPasswordLayout {
         return
       }
       if (this.password01 != this.password02) {
-        this.showToastTip('密码不一致')
+        this.showToastTip('两次输入的密码不一致，请重新输入')
         return
       }
       if(this.pageId == 1){ //设置密码