From 22967cd0f9e8d182b6c9a090dcb20a020bbe73d1 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sun, 1 Dec 2024 22:02:53 +0800 Subject: [PATCH 01/17] =?UTF-8?q?fix:=20=E7=99=BB=E9=99=86=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20=E7=99=BB=E9=99=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bx/imcommon/enums/IMCmdType.java | 4 +- .../controller/LoginController.java | 4 +- .../interceptor/AuthInterceptor.java | 2 +- .../service/impl/UserServiceImpl.java | 2 +- .../netty/processor/LoginProcessor.java | 2 +- im-uniapp/App.vue | 2 +- im-uniapp/manifest.json | 167 +++++++++--------- im-uniapp/pages/mine/mine.vue | 2 +- im-uniapp/pages/register/register.vue | 4 +- im-web/src/view/Home.vue | 2 +- im-web/src/view/Login.vue | 6 +- 11 files changed, 97 insertions(+), 100 deletions(-) diff --git a/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java b/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java index a6731ec..74793ec 100644 --- a/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java +++ b/im-common/src/main/java/com/bx/imcommon/enums/IMCmdType.java @@ -6,9 +6,9 @@ import lombok.AllArgsConstructor; public enum IMCmdType { /** - * 登陆 + * 登录 */ - LOGIN(0, "登陆"), + LOGIN(0, "登录"), /** * 心跳 */ diff --git a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java index e889e40..36a7a43 100644 --- a/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java +++ b/im-platform/src/main/java/com/bx/implatform/controller/LoginController.java @@ -13,7 +13,7 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; -@Tag(name = "注册登陆") +@Tag(name = "注册登录") @RestController @RequiredArgsConstructor public class LoginController { @@ -21,7 +21,7 @@ public class LoginController { private final UserService userService; @PostMapping("/login") - @Operation(summary = "用户登陆", description = "用户登陆") + @Operation(summary = "用户登录", description = "用户登录") public Result login(@Valid @RequestBody LoginDTO dto) { LoginVO vo = userService.login(dto); return ResultUtils.success(vo); diff --git a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java index 7b8d308..8cc0bf1 100644 --- a/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java +++ b/im-platform/src/main/java/com/bx/implatform/interceptor/AuthInterceptor.java @@ -32,7 +32,7 @@ public class AuthInterceptor implements HandlerInterceptor { //从 http 请求头中取出 token String token = request.getHeader("accessToken"); if (StrUtil.isEmpty(token)) { - log.error("未登陆，url:{}", request.getRequestURI()); + log.error("未登录，url:{}", request.getRequestURI()); throw new GlobalException(ResultCode.NO_LOGIN); } String strJson = JwtUtil.getInfo(token); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 72fdc7b..bf42251 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -81,7 +81,7 @@ public class UserServiceImpl extends ServiceImpl implements Us public LoginVO refreshToken(String refreshToken) { //验证 token if (!JwtUtil.checkSign(refreshToken, jwtProperties.getRefreshTokenSecret())) { - throw new GlobalException("您的登陆信息已过期，请重新登陆"); + throw new GlobalException("您的登录信息已过期，请重新登录"); } String strJson = JwtUtil.getInfo(refreshToken); Long userId = JwtUtil.getUserId(refreshToken); diff --git a/im-server/src/main/java/com/bx/imserver/netty/processor/LoginProcessor.java b/im-server/src/main/java/com/bx/imserver/netty/processor/LoginProcessor.java index c0258d3..6068a45 100644 --- a/im-server/src/main/java/com/bx/imserver/netty/processor/LoginProcessor.java +++ b/im-server/src/main/java/com/bx/imserver/netty/processor/LoginProcessor.java @@ -49,7 +49,7 @@ public class LoginProcessor extends AbstractMessageProcessor { // 不允许多地登录,强制下线 IMSendInfo sendInfo = new IMSendInfo<>(); sendInfo.setCmd(IMCmdType.FORCE_LOGUT.code()); - sendInfo.setData("您已在其他地方登陆，将被强制下线"); + sendInfo.setData("您已在其他地方登录，将被强制下线"); context.channel().writeAndFlush(sendInfo); log.info("异地登录，强制下线,userId:{}", userId); } diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue index f92ea61..cb6ece5 100644 --- a/im-uniapp/App.vue +++ b/im-uniapp/App.vue @@ -47,7 +47,7 @@ export default { if (cmd == 2) { // 异地登录，强制下线 uni.showModal({ - content: '您已在其他地方登陆，将被强制下线', + content: '您已在其他地方登录，将被强制下线', showCancel: false, }) this.exit(); diff --git a/im-uniapp/manifest.json b/im-uniapp/manifest.json index eb44f57..a0ed444 100644 --- a/im-uniapp/manifest.json +++ b/im-uniapp/manifest.json @@ -1,32 +1,32 @@ { - "name": "盒子IM", - "appid": "__UNI__69DD57A", - "description": "", - "versionName": "3.1.0", - "versionCode": 3100, - "transformPx": false, + "name" : "盒子IM", + "appid" : "__UNI__69DD57A", + "description" : "", + "versionName" : "3.1.0", + "versionCode" : 3100, + "transformPx" : false, /* 5+App特有相关 */ - "app-plus": { - "usingComponents": true, - "nvueStyleCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 + "app-plus" : { + "usingComponents" : true, + "nvueStyleCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 }, /* 模块配置 */ - "modules": { - "Camera": {}, - "Record": {}, - "Bluetooth": {} + "modules" : { + "Camera" : {}, + "Record" : {}, + "Bluetooth" : {} }, /* 应用发布信息 */ - "distribute": { + "distribute" : { /* android打包配置 */ - "android": { - "permissions": [ + "android" : { + "permissions" : [ "", "", "", @@ -45,90 +45,87 @@ "", "" ], - "abiFilters": [ - "armeabi-v7a", - "arm64-v8a", - "x86" - ], - "minSdkVersion": 21 + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ], + "minSdkVersion" : 21 }, /* ios打包配置 */ - "ios": { - "dSYMs": false, - "privacyDescription": { - "NSMicrophoneUsageDescription": "", - "NSCameraUsageDescription": "" + "ios" : { + "dSYMs" : false, + "privacyDescription" : { + "NSMicrophoneUsageDescription" : "", + "NSCameraUsageDescription" : "" }, - "idfa": false + "idfa" : false }, /* SDK配置 */ - "sdkConfigs": { - "ad": {}, - "speech": {} + "sdkConfigs" : { + "ad" : {}, + "speech" : {} }, - "icons": { - "android": { - "xhdpi": "unpackage/res/icons/96x96.png", - "hdpi": "unpackage/res/icons/72x72.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" + "icons" : { + "android" : { + "xhdpi" : "unpackage/res/icons/96x96.png", + "hdpi" : "unpackage/res/icons/72x72.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" } } } } }, /* 快应用特有相关 */ - "quickapp": {}, + "quickapp" : {}, /* 小程序特有相关 */ - "mp-weixin": { - "appid": "wxda94f40bfad0262c", - "libVersion": "latest", - "setting": { - "urlCheck": false + "mp-weixin" : { + "appid" : "wxda94f40bfad0262c", + "libVersion" : "latest", + "setting" : { + "urlCheck" : false }, - "usingComponents": true + "usingComponents" : true }, - "mp-alipay": { - "usingComponents": true + "mp-alipay" : { + "usingComponents" : true }, - "mp-baidu": { - "usingComponents": true + "mp-baidu" : { + "usingComponents" : true }, - "mp-toutiao": { - "usingComponents": true + "mp-toutiao" : { + "usingComponents" : true }, - "uniStatistics": { - "enable": false + "uniStatistics" : { + "enable" : false }, - "vueVersion": "3", - "h5": { - "title": "盒子IM", - "router": { - "base": "/h5/" + "vueVersion" : "3", + "h5" : { + "title" : "盒子IM", + "router" : { + "base" : "/h5/" } } } -/* ios打包配置 */ /* SDK配置 */ \ No newline at end of file +/* ios打包配置 *//* SDK配置 */ + diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue index c863fda..1c0c0d4 100644 --- a/im-uniapp/pages/mine/mine.vue +++ b/im-uniapp/pages/mine/mine.vue @@ -40,7 +40,7 @@ - + diff --git a/im-uniapp/pages/register/register.vue b/im-uniapp/pages/register/register.vue index 0e8f7b8..4572844 100644 --- a/im-uniapp/pages/register/register.vue +++ b/im-uniapp/pages/register/register.vue @@ -14,10 +14,10 @@ - + diff --git a/im-web/src/view/Home.vue b/im-web/src/view/Home.vue index 050e2d8..a31e2fa 100644 --- a/im-web/src/view/Home.vue +++ b/im-web/src/view/Home.vue @@ -107,7 +107,7 @@ export default { // 关闭ws this.$wsApi.close(3000) // 异地登录，强制下线 - this.$alert("您已在其他地方登陆，将被强制下线", "强制下线通知", { + this.$alert("您已在其他地方登录，将被强制下线", "强制下线通知", { confirmButtonText: '确定', callback: action => { location.href = "/"; diff --git a/im-web/src/view/Login.vue b/im-web/src/view/Login.vue index b44c354..3ecf9f2 100644 --- a/im-web/src/view/Login.vue +++ b/im-web/src/view/Login.vue @@ -5,7 +5,7 @@ @keyup.enter.native="submitForm('loginForm')"> @@ -19,7 +19,7 @@ placeholder="密码"> - 登陆 + 登录 清空
@@ -86,7 +86,7 @@ export default { // 保存token sessionStorage.setItem("accessToken", data.accessToken); sessionStorage.setItem("refreshToken", data.refreshToken); - this.$message.success("登陆成功"); + this.$message.success("登录成功"); this.$router.push("/home/chat"); }) From e600aebd56acb1ee8e191cab5175c937fc14506e Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 7 Dec 2024 00:12:39 +0800 Subject: [PATCH 02/17] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=BB=9A=E5=8A=A8=E5=88=B0=E5=BA=95=E9=83=A8=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/components/chat-message-item/chat-message-item.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue index 1c2fd88..ba54d33 100644 --- a/im-uniapp/components/chat-message-item/chat-message-item.vue +++ b/im-uniapp/components/chat-message-item/chat-message-item.vue @@ -256,6 +256,7 @@ export default { color: $im-text-color-lighter; font-size: $im-font-size-smaller; line-height: $im-font-size-smaller; + height: $im-font-size-smaller; } .chat-msg-bottom { From a01408bf94da14b9d6983449502090cdb4fe9e64 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sat, 7 Dec 2024 01:27:31 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BC=98=E5=8C=96:=20h5=E5=BD=95?= =?UTF-8?q?=E9=9F=B3=E6=97=B6=E5=87=BA=E7=8E=B0=E7=94=B5=E6=B5=81=E5=A3=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/common/recorder-app.js | 1 - im-uniapp/common/recorder-h5.js | 89 +++++++++++-------- .../components/chat-record/chat-record.vue | 6 +- im-uniapp/package.json | 1 - 4 files changed, 53 insertions(+), 44 deletions(-) diff --git a/im-uniapp/common/recorder-app.js b/im-uniapp/common/recorder-app.js index e525ef4..0c8ff83 100644 --- a/im-uniapp/common/recorder-app.js +++ b/im-uniapp/common/recorder-app.js @@ -62,7 +62,6 @@ let upload = () => { export { start, - pause, close, upload } \ No newline at end of file diff --git a/im-uniapp/common/recorder-h5.js b/im-uniapp/common/recorder-h5.js index fdf828d..1425dd3 100644 --- a/im-uniapp/common/recorder-h5.js +++ b/im-uniapp/common/recorder-h5.js @@ -1,60 +1,73 @@ -import Recorder from 'js-audio-recorder'; import UNI_APP from '@/.env.js'; let rc = null; +let duration = 0; +let chunks = []; +let stream = null; let start = () => { - if (rc != null) { - close(); - } - rc = new Recorder(); - return rc.start(); -} + return navigator.mediaDevices.getUserMedia({ audio: true }).then(audioStream => { + const startTime = new Date().getTime(); + chunks = []; + stream = audioStream; + rc = new MediaRecorder(stream) + rc.ondataavailable = (e) => { + console.log("ondataavailable") + chunks.push(e.data) + } + rc.onstop = () => { + duration = (new Date().getTime() - startTime) / 1000; + console.log("时长：", duration) + } + rc.start() + }) -let pause = () => { - rc.pause(); } let close = () => { - rc.destroy(); - rc = null; + stream.getTracks().forEach((track) => { + track.stop() + }) + rc.stop() } + let upload = () => { return new Promise((resolve, reject) => { - const wavBlob = rc.getWAVBlob(); - const newbolb = new Blob([wavBlob], { type: 'audio/wav' }) - const name = new Date().getDate() + '.wav'; - const file = new File([newbolb], name) - uni.uploadFile({ - url: UNI_APP.BASE_URL + '/file/upload', - header: { - accessToken: uni.getStorageSync("loginInfo").accessToken - }, - file: file, - name: 'file', - success: (res) => { - let r = JSON.parse(res.data); - if (r.code != 200) { - console.log(res) - reject(r.message); - } else { - const data = { - duration: parseInt(rc.duration), - url: r.data + setTimeout(() => { + const newbolb = new Blob(chunks, { 'type': 'audio/mpeg' }); + const name = new Date().getDate() + '.mp3'; + const file = new File([newbolb], name) + console.log("upload") + uni.uploadFile({ + url: UNI_APP.BASE_URL + '/file/upload', + header: { + accessToken: uni.getStorageSync("loginInfo").accessToken + }, + file: file, + name: 'file', + success: (res) => { + let r = JSON.parse(res.data); + if (r.code != 200) { + console.log(res) + reject(r.message); + } else { + const data = { + duration: parseInt(duration), + url: r.data + } + resolve(data); } - resolve(data); + }, + fail: (e) => { + reject(e); } - }, - fail: (e) => { - reject(e); - } - }) + }) + }, 100) }) } export { start, - pause, close, upload } \ No newline at end of file diff --git a/im-uniapp/components/chat-record/chat-record.vue b/im-uniapp/components/chat-record/chat-record.vue index 659d95f..bde3454 100644 --- a/im-uniapp/components/chat-record/chat-record.vue +++ b/im-uniapp/components/chat-record/chat-record.vue @@ -71,13 +71,12 @@ export default { }, onEndRecord() { this.recording = false; - // 停止录音 - this.$rc.pause(); // 停止计时 this.StopTimer(); + // 停止录音 + this.$rc.close(); // 触屏位置是否移动到了取消区域 if (this.moveToCancel) { - this.$rc.close(); console.log("录音取消") return; } @@ -87,7 +86,6 @@ export default { title: "说话时间太短", icon: 'none' }) - this.$rc.close(); return; } this.$rc.upload().then((data) => { diff --git a/im-uniapp/package.json b/im-uniapp/package.json index 2ada879..3e8bf34 100644 --- a/im-uniapp/package.json +++ b/im-uniapp/package.json @@ -4,7 +4,6 @@ "scripts": {} }, "dependencies": { - "js-audio-recorder": "^1.0.7", "pinyin-pro": "^3.23.1", "vconsole": "^3.15.1" } From 553198bc6065a5a540784b14d0bc863edd41dde7 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sun, 8 Dec 2024 12:10:01 +0800 Subject: [PATCH 04/17] 1 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 743372c..7d5a585 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - 后台管理端上线,后台管理代码仓库地址:https://gitee.com/bluexsx/box-im-admin - 框架和组件版本全面升级: jdk17、springboot3.3、node18等 -- 部分界面，功能、性能优化 +- 部分界面，功能、性能优化1 #### 在线体验 From 3f59d79d17ac0b23199ba8947fe3db2600da02d6 Mon Sep 17 00:00:00 2001 From: xsx <825657193@qq.com> Date: Sun, 8 Dec 2024 15:49:59 +0800 Subject: [PATCH 05/17] =?UTF-8?q?wx=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- im-uniapp/common/emotion.js | 4 -- .../chat-message-item/chat-message-item.vue | 3 +- im-uniapp/im.scss | 33 ++++++++++++++++ im-uniapp/pages/friend/friend-add.vue | 39 ++++++++++++++++--- im-uniapp/pages/group/group-info.vue | 6 +-- im-uniapp/pages/login/login.vue | 6 +-- im-uniapp/pages/mine/mine.vue | 7 +--- im-uniapp/pages/register/register.vue | 6 +-- 8 files changed, 80 insertions(+), 24 deletions(-) diff --git a/im-uniapp/common/emotion.js b/im-uniapp/common/emotion.js index 7e567e3..8937732 100644 --- a/im-uniapp/common/emotion.js +++ b/im-uniapp/common/emotion.js @@ -21,10 +21,6 @@ let textToImg = (emoText) => { return emoText; } let path = textToPath(emoText); - // #ifdef MP - // 微信小程序不能有前面的'/' - path = path.slice(1); - // #endif let img = ``; return img; diff --git a/im-uniapp/components/chat-message-item/chat-message-item.vue b/im-uniapp/components/chat-message-item/chat-message-item.vue index ba54d33..2f43b00 100644 --- a/im-uniapp/components/chat-message-item/chat-message-item.vue +++ b/im-uniapp/components/chat-message-item/chat-message-item.vue @@ -23,7 +23,7 @@ - @@ -306,6 +306,7 @@ export default { .send-image { min-width: 200rpx; max-width: 420rpx; + height: 350rpx; cursor: pointer; border-radius: 4px; } diff --git a/im-uniapp/im.scss b/im-uniapp/im.scss index 1f2856c..53bd6c6 100644 --- a/im-uniapp/im.scss +++ b/im-uniapp/im.scss @@ -28,6 +28,39 @@ uni-button[size='mini'] { font-size: $im-font-size-smaller !important; } +// #ifdef MP-WEIXIN +// wx小程序只有button,没有uni-botton +button { + font-size: $im-font-size !important; +} + +button[type='primary'] { + color: #fff !important; + background-color: $im-color-primary !important; +} + +button[type='primary'][plain] { + color: $im-color-primary !important; + border: 1px solid $im-color-primary; + background-color: transparent; +} + +button[type='warn'] { + color: #fff !important; + background-color: $im-color-danger !important; +} + +button[type='warn'][plain] { + color: $im-color-danger !important; + border: 1px solid $im-color-danger !important; + background-color: transparent !important; +} + +button[size='mini'] { + font-size: $im-font-size-smaller !important; +} +// #endif + .button-hover[type='primary'] { color: #fff !important; background-color: $im-color-primary-dark-1 !important; diff --git a/im-uniapp/pages/friend/friend-add.vue b/im-uniapp/pages/friend/friend-add.vue index 15231f0..ea21de4 100644 --- a/im-uniapp/pages/friend/friend-add.vue +++ b/im-uniapp/pages/friend/friend-add.vue @@ -13,7 +13,13 @@ - {{ user.nickName }} + @@ -90,22 +96,45 @@ export default { overflow: hidden; .user-item { - height: 120rpx; + height: 100rpx; display: flex; margin-bottom: 1rpx; position: relative; - padding: 0 30rpx; + padding: 18rpx 20rpx; align-items: center; background-color: white; white-space: nowrap; - .user-name { + .user-info { flex: 1; + display: flex; + flex-direction: column; padding-left: 20rpx; font-size: $im-font-size; - line-height: 60rpx; white-space: nowrap; overflow: hidden; + + .user-name { + display: flex; + flex: 1; + font-size: $im-font-size-large; + white-space: nowrap; + overflow: hidden; + align-items: center; + + .uni-tag { + text-align: center; + margin-left: 5rpx; + padding: 1px 5px; + } + } + + .nick-name { + display: flex; + font-size: $im-font-size-smaller; + color: $im-text-color-lighter; + padding-top: 8rpx; + } } } diff --git a/im-uniapp/pages/group/group-info.vue b/im-uniapp/pages/group/group-info.vue index 9944bd4..1477d4d 100644 --- a/im-uniapp/pages/group/group-info.vue +++ b/im-uniapp/pages/group/group-info.vue @@ -46,9 +46,9 @@ 修改群聊资料 > - - - + + + diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue index b8e5faf..a6f65c9 100644 --- a/im-uniapp/pages/login/login.vue +++ b/im-uniapp/pages/login/login.vue @@ -1,7 +1,7 @@