diff --git a/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java b/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java index f298808..f6998e9 100644 --- a/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java +++ b/im-platform/src/main/java/com/bx/implatform/dto/RegisterDTO.java @@ -9,7 +9,7 @@ import org.hibernate.validator.constraints.Length; @Schema(description = "用户注册DTO") public class RegisterDTO { - @Length(max = 64, message = "用户名不能大于64字符") + @Length(max = 20, message = "用户名不能大于20字符") @NotEmpty(message = "用户名不可为空") @Schema(description = "用户名") private String userName; @@ -19,7 +19,7 @@ public class RegisterDTO { @Schema(description = "用户密码") private String password; - @Length(max = 64, message = "昵称不能大于64字符") + @Length(max = 20, message = "昵称不能大于20字符") @NotEmpty(message = "用户昵称不可为空") @Schema(description = "用户昵称") private String nickName; diff --git a/im-uniapp/components/chat-at-box/chat-at-box.vue b/im-uniapp/components/chat-at-box/chat-at-box.vue index d4b7c30..8f7c257 100644 --- a/im-uniapp/components/chat-at-box/chat-at-box.vue +++ b/im-uniapp/components/chat-at-box/chat-at-box.vue @@ -20,10 +20,12 @@ @@ -152,11 +154,11 @@ export default { background-color: white; white-space: nowrap; margin-bottom: 1px; - - &.checked { - background-color: $im-color-primary-light-9; + + &:hover { + background-color: $im-bg-active; } - + .member-name { flex: 1; padding-left: 20rpx; diff --git a/im-uniapp/components/friend-item/friend-item.vue b/im-uniapp/components/friend-item/friend-item.vue index cd6627a..6983056 100644 --- a/im-uniapp/components/friend-item/friend-item.vue +++ b/im-uniapp/components/friend-item/friend-item.vue @@ -7,6 +7,7 @@ + @@ -51,11 +52,11 @@ export default { .friend-info { flex: 1; display: flex; - flex-direction: column; padding-left: 20rpx; text-align: left; .friend-name { + flex: 1; font-size: $im-font-size; white-space: nowrap; overflow: hidden; diff --git a/im-uniapp/im.scss b/im-uniapp/im.scss index 4059c19..e5aefe7 100644 --- a/im-uniapp/im.scss +++ b/im-uniapp/im.scss @@ -102,9 +102,34 @@ button[size='mini'] { } } + +.uni-radio-input svg{ + border-color: white !important; + background-color: $im-color-primary !important; +} + +.uni-radio-input svg { + background-color: $im-color-primary !important; + border-color: $im-color-primary !important; + background-clip: content-box !important; + box-sizing: border-box; + border-radius: 50%; + transform: translate(-50%, -50%) scale(0.7)!important; +} + +.uni-radio-input svg path{ + fill: $im-color-primary !important; +} + .uni-radio-input { - //border-color: $im-color-primary !important; - //background-color: $im-color-primary !important; + background-color: white !important; + border-color: $im-color-primary !important; +} + +.uni-radio-input-disabled { + background-color: rgb(225, 225, 225) !important; + border-color: rgb(209, 209, 209) !important; + opacity: 0.5; } .uni-section__content-title { diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue index eebf384..d0a8dfb 100644 --- a/im-uniapp/pages/chat/chat-box.vue +++ b/im-uniapp/pages/chat/chat-box.vue @@ -1,5 +1,5 @@