diff --git a/im-uniapp/.env.js b/im-uniapp/.env.js index 9c7c7784a339b6f79c91e60a56c1df175a3df5e9..b6b9ff404bb0197b5b268c554e5344f898cdda51 100644 --- a/im-uniapp/.env.js +++ b/im-uniapp/.env.js @@ -2,8 +2,8 @@ const ENV = "DEV"; const UNI_APP = {} if(ENV=="DEV"){ - UNI_APP.BASE_URL = "http://192.168.43.199:8888"; - UNI_APP.WS_URL = "ws://192.168.43.199:8878/im"; + UNI_APP.BASE_URL = "http://127.0.0.1:8888"; + UNI_APP.WS_URL = "ws://127.0.0.1:8878/im"; // H5 走本地代理解决跨域问题 // #ifdef H5 UNI_APP.BASE_URL = "/api"; diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue index eafdf26cd49b071c03e26f4c7ee432524d96532a..7dcf1c11490ace9e364e750fb5600c87d9b4aab1 100644 --- a/im-uniapp/components/chat-item/chat-item.vue +++ b/im-uniapp/components/chat-item/chat-item.vue @@ -7,11 +7,9 @@ - - - - {{chat.showName}} + {{chat.showName}} + {{$date.toTimeText(chat.lastSendTime,true)}} @@ -44,7 +42,7 @@ } }, methods: { - + showChatBox() { uni.navigateTo({ url: "/pages/chat/chat-box?chatIdx=" + this.index @@ -127,18 +125,26 @@ line-height: 44rpx; height: 44rpx; - .chat-tag { - display: flex; - align-items: center; - margin-right: 5rpx; - } - .chat-name-text { flex: 1; font-size: 30rpx; font-weight: 600; white-space: nowrap; overflow: hidden; + display: flex; + align-items: center; + + .uni-tag { + text-align: center; + margin-left: 5rpx; + border: 0; + height: 30rpx; + line-height: 30rpx; + font-size: 20rpx; + padding: 1px 5px; + background-color: #de1c1c; + opacity: 0.8; + } } .chat-time { diff --git a/im-uniapp/components/head-image/head-image.vue b/im-uniapp/components/head-image/head-image.vue index ff9c41af5493d855c59e7287cbab3acb53cbc7e6..f8298c2131d9a1ff41c71f320a36788a7961ce77 100644 --- a/im-uniapp/components/head-image/head-image.vue +++ b/im-uniapp/components/head-image/head-image.vue @@ -15,9 +15,8 @@ name: "head-image", data() { return { - colors: ["#7dd24b", "#c7515a", "#db68ef", "#15d29b", "#85029b", - "#c9b455", "#fb2609", "#bda818", "#af0831", "#326eb6" - ] + colors: ["#5daa31", "#c7515a", "#e03697", "#85029b", + "#c9b455", "#326eb6"] } }, props: { @@ -50,15 +49,17 @@ } }, computed: { - avatarImageStyle() { - return `width:${this.size}rpx; height:${this.size}rpx;` - }, - avatarTextStyle() { - return `width: ${this.size}rpx;height:${this.size}rpx; - color:${this.textColor};font-size:${this.size*0.5}rpx; - border: 2px solid ${this.textColor}; - box-shadow: 0px 0px 5rpx ${this.textColor}` - }, + avatarImageStyle() { + return `width:${this.size}rpx; + height:${this.size}rpx;` + }, + avatarTextStyle() { + return `width: ${this.size}rpx; + height:${this.size}rpx; + background-color:${this.textColor}; + font-size:${this.size*0.5}rpx; + ` + }, textColor() { let hash = 0; for (var i = 0; i < this.name.length; i++) { @@ -79,13 +80,11 @@ position: relative; overflow: hidden; border-radius: 50%; - border: 2px solid #6664eb; vertical-align: bottom; - box-shadow: 0px 0px 10rpx #6664eb; } .avatar-text { - background-color: #f2f2f2; + color: white; border-radius: 50%; display: flex; align-items: center; diff --git a/im-uniapp/components/pop-menu/pop-menu.vue b/im-uniapp/components/pop-menu/pop-menu.vue index e488cb004247c9cfa47062e4101754fd18d8add8..b24a4ce0a8f3666cd064f70f5d9fd41cfc3ae70b 100644 --- a/im-uniapp/components/pop-menu/pop-menu.vue +++ b/im-uniapp/components/pop-menu/pop-menu.vue @@ -1,10 +1,9 @@ - + 修改群聊资料 > @@ -198,7 +198,7 @@ .group-members { padding: 30rpx; background: white; - + .member-items { display: flex; flex-wrap: wrap; @@ -237,9 +237,10 @@ } .member-more { - padding: 20rpx; + padding-top: 30rpx; text-align: center; - font-size: 16px; + font-size: 32rpx; + color: #333; } } @@ -248,15 +249,17 @@ margin-top: 30rpx; padding: 30rpx; background: white; - + .detail-text{ font-size: 28rpx; font-weight: 600; } + .group-edit { - padding: 20rpx; + padding-top: 30rpx; text-align: center; - font-size: 30rpx; + font-size: 32rpx; + color: #333; } } diff --git a/im-uniapp/pages/group/group-member.vue b/im-uniapp/pages/group/group-member.vue index fdf7c2db957fb813eff9c4542237990aa861b05f..1b42ee9e707189d0a2e6612f733b0c6fe2b8c883 100644 --- a/im-uniapp/pages/group/group-member.vue +++ b/im-uniapp/pages/group/group-member.vue @@ -1,7 +1,7 @@