Merge commit 'ae66faa9'

@@ -366,6 +366,7 @@ export struct MultiPictureDetailPageComponent {
             publishCommentModel: this.publishCommentModel,
             operationButtonList: this.operationButtonList,
             styleType: 2,
+            componentType:5,
           })
         }
         .transition(TransitionEffect.OPACITY.animation({ duration: this.duration, curve: Curve.Ease }).combine(

@@ -19,19 +19,25 @@ struct EditUserIntroductionPage {
           .width('100%')
           .height(80)
           .backgroundColor(Color.White)
+          .placeholderColor('#999999')
           .onChange(value => {
             this.numCount = value.length
             if (this.numCount === 60) {
               this.textColor = '#ED2800'
+            }else if(this.numCount === 0){
+              this.textColor = '#999999'
             }else {
               this.textColor = '#222222'
             }
             this.introduction = value
           })
 
-        Text(this.numCount.toString() + '/60')
-          .fontColor(this.textColor)
-          .margin({left: -50})
+        Row(){
+          Text(this.numCount.toString())
+            .fontColor(this.textColor)
+          Text('/60')
+            .fontColor('#999999')
+        }.margin({left: -50})
       }
       .alignItems(VerticalAlign.Bottom)
 
@@ -42,7 +48,7 @@ struct EditUserIntroductionPage {
       Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多60个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
-        .fontColor(Color.Gray)
+        .fontColor(Color.Gray).lineHeight(25)
 
       Button('保存')
         .type(ButtonType.Normal)

@@ -22,19 +22,25 @@ struct EditUserNikeNamePage {
           .maxLength(16)
           .height(50)
           .backgroundColor(Color.White)
+          .placeholderColor('#999999')
           .onChange(value => {
             this.numCount = value.length
             if (this.numCount === 16) {
               this.textColor = '#ED2800'
+            }else if(this.numCount === 0){
+              this.textColor = '#999999'
             }else {
               this.textColor = '#222222'
             }
             this.nikeName = value
           })
 
-        Text(this.numCount.toString() + '/16')
-          .fontColor(this.textColor)
-          .margin({left: -50})
+        Row(){
+          Text(this.numCount.toString())
+            .fontColor(this.textColor)
+          Text('/16')
+            .fontColor('#999999')
+        }.margin({left: -50})
       }
       .alignItems(VerticalAlign.Center)
 
@@ -44,7 +50,7 @@ struct EditUserNikeNamePage {
       Text('1、账号中（头像、昵称等）不允许含有违禁违规内容；\n2、最多16个字，只能输入中文、数字、英文字母。')
         .fontSize(13)
         .padding(12)
-        .fontColor(Color.Gray)
+        .fontColor(Color.Gray).lineHeight(25)
 
       Button('保存')
         .type(ButtonType.Normal)

@@ -41,7 +41,6 @@ export struct LikeComponent {
       //获取点赞数
       this.getLikeCount()
     }
-
   }
 
   build() {
@@ -55,7 +54,10 @@ export struct LikeComponent {
     } else if (this.componentType == 4) {
       // 直播，点赞按钮底测有灰色圆角背景+右上点赞数量
       this.likeCompStyle4()
-    } else {
+    }  else if (this.componentType == 5) {
+      // 图集点赞，展示标识
+      this.likeCompStyle5()
+    }else {
       //1: 底部栏目样式  默认样式
       this.likeCompStyle1()
     }
@@ -161,6 +163,36 @@ export struct LikeComponent {
   }
 
   @Builder
+  likeCompStyle5() {
+    //1: 底部栏目样式  默认样式
+    Stack({ alignContent: Alignment.Bottom }) {
+      Column() {
+        // Image(this.likeStatus ? $r('app.media.icon_like_select') : $r('app.media.icon_like_default'))
+        Image(this.transLikeStyle().url)
+          .width(24)
+          .height(24)
+          .onClick(() => {
+            this.clickButtonEvent()
+          })
+      }
+
+      Row() {
+        Text(NumberFormatterUtils.formatNumberWithWan(this.likeCount || ''))
+          .fontSize(8)
+          .fontColor(Color.White)
+          .padding({ left: 4, right: 2 })
+      }
+      .height(12)
+      .alignItems(VerticalAlign.Center)
+      .position({ x: '100%', })
+      .markAnchor({ x: '100%' })
+      .backgroundImage(this.likeStatus? $r('app.media.ic_like_back_Select'):$r('app.media.ic_like_back'))
+      .backgroundImageSize(ImageSize.Auto)
+      .visibility(this.likeCount > 0 ? Visibility.Visible : Visibility.Hidden)
+    }.width(24).height(24)
+  }
+
+  @Builder
   likeCompStyle4() {
     Stack({ alignContent: Alignment.Bottom }) {
       Column() {