From 008faa78a6867ef7caad949a88c5205a3319ae77 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Wed, 24 Apr 2024 00:21:32 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=8C=BA=E5=88=86app=E5=92=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=AB=AF=E7=9A=84storage=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/store/chatStore.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index b1cdfc9..2e1ff9d 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -302,7 +302,7 @@ export default {
 				return;
 			}
 			let userId = userStore.state.userInfo.id;
-			let key = "chats-" + userId;
+			let key = "chats-app-" + userId;
 			let chatsData = {
 				privateMsgMaxId: state.privateMsgMaxId,
 				groupMsgMaxId: state.groupMsgMaxId,
@@ -327,7 +327,7 @@ export default {
 			return new Promise((resolve, reject) => {
 				let userId = userStore.state.userInfo.id;
 				uni.getStorage({
-					key: "chats-" + userId,
+					key: "chats-app-" + userId,
 					success(res) {
 						context.commit("initChats", res.data);
 						resolve()

From e4d3cad822419eb0b4b049525af3438a922a7300 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Wed, 24 Apr 2024 23:10:31 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/App.vue               | 28 +++++++++++++++++++++-------
 im-uniapp/common/request.js     |  4 +++-
 im-uniapp/pages/login/login.vue | 16 +++++-----------
 3 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/im-uniapp/App.vue b/im-uniapp/App.vue
index ab6121d..8e8fdc7 100644
--- a/im-uniapp/App.vue
+++ b/im-uniapp/App.vue
@@ -243,18 +243,32 @@
 				// this.audioTip = uni.createInnerAudioContext();
 				// this.audioTip.src =  "/static/audio/tip.wav";
 				// this.audioTip.play();
-			}
+			},
+			isExpired(loginInfo){
+				if(!loginInfo || !loginInfo.expireTime){
+					return true;
+				}
+				return loginInfo.expireTime < new Date().getTime();
+			},
 		},
 		onLaunch() {
 			// 登录状态校验
-			if (uni.getStorageSync("loginInfo")) {
+			let loginInfo = uni.getStorageSync("loginInfo")
+			if (!this.isExpired(loginInfo)) {
+				console.log("初始化")
 				// 初始化
-				this.init()
-			} else {
-				// 跳转到登录页
-				uni.navigateTo({
-					url: "/pages/login/login"
+				this.init();
+				// 跳转到聊天页面
+				uni.switchTab({
+					url: "/pages/chat/chat"
 				})
+			} else{
+				// 跳转到登录页
+				// #ifdef H5
+					uni.navigateTo({
+						url: "/pages/login/login"
+					})
+				// #endif
 			}
 		}
 	}
diff --git a/im-uniapp/common/request.js b/im-uniapp/common/request.js
index 461ff6b..ea9ed94 100644
--- a/im-uniapp/common/request.js
+++ b/im-uniapp/common/request.js
@@ -41,7 +41,9 @@ const request = (options) => {
 						getApp().exit();
 						return;
 					}
-					uni.setStorageSync("loginInfo", res.data.data);
+					let newInfo = res.data.data;
+					newInfo.expireTime = new Date().getTime() + newInfo.refreshTokenExpiresIn*1000;
+					uni.setStorageSync("loginInfo", newInfo);
 					requestList.forEach(cb => cb());
 					requestList = [];
 					isRefreshToken = false;
diff --git a/im-uniapp/pages/login/login.vue b/im-uniapp/pages/login/login.vue
index b0b996f..e3146b0 100644
--- a/im-uniapp/pages/login/login.vue
+++ b/im-uniapp/pages/login/login.vue
@@ -3,7 +3,7 @@
 		<view class="login-title">欢迎登录</view>
 		<uni-forms style="margin-top: 100px;" :modelValue="loginForm" :rules="rules" validate-trigger="bind">
 			<uni-forms-item name="userName">
-				<uni-easyinput type="text" v-model="loginForm.userName" prefix-icon="person" focus placeholder="用户名" />
+				<uni-easyinput type="text" v-model="loginForm.userName" prefix-icon="person"  placeholder="用户名" />
 			</uni-forms-item>
 			<uni-forms-item name="password">
 				<uni-easyinput type="password" v-model="loginForm.password" prefix-icon="locked" placeholder="密码" />
@@ -45,11 +45,12 @@
 					url: '/login',
 					data: this.loginForm,
 					method: 'POST'
-				}).then(data => {
+				}).then(loginInfo => {
 					console.log("登录成功,自动跳转到聊天页面...")
 					uni.setStorageSync("userName", this.loginForm.userName);
 					uni.setStorageSync("password", this.loginForm.password);
-					uni.setStorageSync("loginInfo", data);
+					loginInfo.expireTime = new Date().getTime() + loginInfo.refreshTokenExpiresIn*1000;
+					uni.setStorageSync("loginInfo", loginInfo);
 					// 调用App.vue的初始化方法
 					getApp().init()
 					// 跳转到聊天页面   
@@ -59,17 +60,10 @@
 				})
 			}
 		},
+		
 		onLoad() {
 			this.loginForm.userName = uni.getStorageSync("userName");
 			this.loginForm.password = uni.getStorageSync("password");
-			let loginInfo = uni.getStorageSync("loginInfo");
-			if (loginInfo) {
-				// 跳转到聊天页面
-				uni.switchTab({
-					url: "/pages/chat/chat"
-				})
-				
-			}
 		}
 	}
 </script>

From 2bcb1e2de8647032dddc69b1506deb2b8a138b70 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Thu, 25 Apr 2024 23:13:30 +0800
Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BF=BB=E5=80=8D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-uniapp/store/chatStore.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index 2e1ff9d..75950af 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -27,6 +27,7 @@ export default {
 	mutations: {
 		initChats(state, chatsData) {
 			cacheChats = [];
+			state.chats = [];
 			for (let chat of chatsData.chats) {
 				// 已删除的会话直接丢弃
 				if (chat.delete) {
@@ -50,7 +51,7 @@ export default {
 					}
 				})
 			})
-
+			console.log(cacheChats.length)
 		},
 		openChat(state, chatInfo) {
 			let chats = this.getters.findChats();
@@ -294,6 +295,7 @@ export default {
 			});
 			// 将消息一次性装载回来
 			state.chats = cacheChats;
+			console.log(cacheChats.length)
 			this.commit("saveToStorage");
 		},
 		saveToStorage(state) {

From eb90c67802c88832ad1364be7efd9ddb0eb98560 Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Sat, 27 Apr 2024 21:18:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?web=E7=AB=AF=E6=A0=B7=E5=BC=8F=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   8 +-
 im-ui/src/App.vue                             |  98 ++++++++++++++----
 im-ui/src/assets/iconfont/iconfont.css        |  38 +++----
 im-ui/src/assets/iconfont/iconfont.ttf        | Bin 5040 -> 4740 bytes
 im-ui/src/components/chat/ChatBox.vue         |  51 +++++----
 im-ui/src/components/chat/ChatItem.vue        |  10 +-
 im-ui/src/components/friend/AddFriend.vue     |   9 +-
 im-ui/src/components/friend/FriendItem.vue    |   8 +-
 im-ui/src/components/group/AddGroupMember.vue |  13 +--
 im-ui/src/components/group/GroupItem.vue      |   8 +-
 im-ui/src/components/setting/Setting.vue      |   3 +-
 im-ui/src/view/Chat.vue                       |  16 ++-
 im-ui/src/view/Friend.vue                     |  80 +++++++-------
 im-ui/src/view/Group.vue                      |  74 +++++++------
 im-ui/src/view/Home.vue                       |  66 ++++++------
 im-ui/src/view/Login.vue                      |   9 +-
 16 files changed, 291 insertions(+), 200 deletions(-)

diff --git a/README.md b/README.md
index 103a7f5..be2d811 100644
--- a/README.md
+++ b/README.md
@@ -249,13 +249,6 @@ wsApi.onClose((e) => {
 
 欢迎进群与小伙们一起交流， **申请加群前请务必先star哦** 
 
-
-#### 嘿嘿
-![输入图片说明](%E6%88%AA%E5%9B%BE/%E5%BE%AE%E4%BF%A1%E6%94%B6%E6%AC%BE%E7%A0%81.png)
-
-悄悄放个二维码在这，宝子们..你懂我意思吧
-
-
 #### 点下star吧
 如果项目对您有帮助，请点亮右上方的star，支持一下作者吧！
 
@@ -264,4 +257,5 @@ wsApi.onClose((e) => {
 1. 本系统允许用于商业用途，且不收费（自愿投币）。**但切记不要用于任何非法用途** ，本软件作者不会为此承担任何责任
 1. 基于本系统二次开发后再次开源的项目，请注明引用出处，以避免引发不必要的误会
 1. 如果您也想体验开源(bei bai piao)的快感，成为本项目的贡献者，欢迎提交PR。开发前最好提前联系作者，避免功能重复开发
+1. 作者目前不打算接项目，如果能接受1k/天以上的报价，也可以聊聊
 
diff --git a/im-ui/src/App.vue b/im-ui/src/App.vue
index 11f715d..340ff3d 100644
--- a/im-ui/src/App.vue
+++ b/im-ui/src/App.vue
@@ -1,33 +1,89 @@
 <template>
-  <div id="app">
+	<div id="app">
 		<router-view></router-view>
-  </div>
+	</div>
 </template>
 
 <script>
+	export default {
+		name: 'App',
+		components: {}
+	}
+</script>
 
+<style lang="scss">
+@import './assets/style/global.css';
 
-export default {
-  name: 'App',
-  components: {
-  }
+#app {
+	font-family: 'Avenir', Helvetica, Arial, sans-serif;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+	color: #2c3e50;
+	position: absolute;
+	height: 100%;
+	width: 100%;
 }
-</script>
 
-<style>
- @import './assets/style/global.css';
- 
-#app {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-  position: absolute;
-  height: 100%;
-  width: 100%;
+.el-message {
+	z-index: 99999999 !important;
+}
+
+.el-scrollbar__thumb {
+	background-color: #A0A8AF !important;
+}
+
+.el-dialog {
+	border-radius: 8px !important;
+	overflow: hidden !important;
+}
+
+.el-dialog__header {
+	background-color: #5870e6 !important;
+	
+}
+
+.el-dialog__title {
+	color: #f8f8f8 !important;
+}
+
+.el-dialog__close {
+	color: white !important;
+	font-size: 20px;
+}
+
+.el-checkbox__inner {
+	border-radius: 50% !important;
+}
+
+.el-input__inner {
+	border-radius: 5px !important;
+	border: #587FF0 1px solid !important;
+}
+
+.el-textarea__inner{
+	border-radius: 5px !important;
+	border: #587FF0 1px solid !important;
+}
+
+.el-icon-search {
+	color:#587FF0 !important;
+}
+
+.el-button--primary {
+    background-color: #687Ff0 !important;
+	border-color: #687Ff0 !important;
+}
+
+.el-button--success {
+	background-color: #4cae1b !important;
+	border-color: #4cae1b !important;
+}
+.el-button--danger {
+	background-color: #ea4949 !important;
+	border-color: #ea4949 !important;
 }
 
-.el-message {
-  z-index: 99999999 !important;
+.el-button {
+	padding: 8px 15px !important;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/im-ui/src/assets/iconfont/iconfont.css b/im-ui/src/assets/iconfont/iconfont.css
index dbe25ef..ff4113e 100644
--- a/im-ui/src/assets/iconfont/iconfont.css
+++ b/im-ui/src/assets/iconfont/iconfont.css
@@ -1,6 +1,6 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3791506 */
-  src: url('iconfont.ttf?t=1711892447736') format('truetype');
+  src: url('iconfont.ttf?t=1714220334746') format('truetype');
 }
 
 .iconfont {
@@ -11,6 +11,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-chat:before {
+  content: "\e600";
+}
+
+.icon-setting:before {
+  content: "\e620";
+}
+
+.icon-friend:before {
+  content: "\e604";
+}
+
 .icon-exit:before {
   content: "\e9e4";
 }
@@ -31,34 +43,14 @@
   content: "\e61a";
 }
 
-.icon-biaoqing:before {
+.icon-emoji:before {
   content: "\e60c";
 }
 
-.icon-youyinpin:before {
-  content: "\e649";
-}
-
-.icon-audio:before {
-  content: "\e800";
-}
-
-.icon-group_fill:before {
+.icon-group:before {
   content: "\e7f4";
 }
 
-.icon-yinpin:before {
-  content: "\e68a";
-}
-
-.icon-emoji:before {
-  content: "\e6f6";
-}
-
-.icon-voiceprint:before {
-  content: "\e953";
-}
-
 .icon-phone-reject:before {
   content: "\e605";
 }
diff --git a/im-ui/src/assets/iconfont/iconfont.ttf b/im-ui/src/assets/iconfont/iconfont.ttf
index 81a162396ade1cbd65631cb744e9a14d9aaf3a3e..63ec967c2b7a9bbfc8dc6b19d650bedd6824092b 100644
GIT binary patch
delta 1568
zcmaJ>OKcle6utMo`S=rOCh^2^^Kon^9w*S|<2VzQ6jz8)(g?Z$q6TPGti<`0e5}+}
zQfTCUSg<Hk#ULOO2v8#-p{fc>HWXALWx=lM4i+q`DsmbLl?4Sh$mYJ8fT$?U%$f7<
zefM+T^Bb=x-%4DG73-ec1i;Gx@Y?uXHviuCFS`INN_b^z_UvTGg#T3l=|ceD_H-^g
zk^HVmHrydt)8tU^@+&m{hR`-WS6EK-N`>nEM0R?1VLYqvuf0wA=g4lF%P!}!4OVGB
zOm=iWJC`f!R}ZZNXcWMv@(ZU6L-yz$fSPRz_yiDupRb&U6B3oJR3u4w9=ZaKhrE|P
z-=8_D9r_jgk`r+Eg^#a`fnZ9#AW8fJnI2%yG-)6XfZc-E5$s#oE>V4M-$&DKXTg_m
z>~-1%?u_;m`zYxKNbojghCwHfrvxRrR8?vyMN7S<YdZrw5ANOE-4<IwGt#4G?9W(z
zA5wl88vb<)RUG`_b#yAAf=pejs3)LeBQM+EqHI^VQv7sp6;+~>3!$?_kpfhOl)0dK
zP!e$jstlzD7t{kvQ5RxYO1&;XA-?8<6u{1a3(^8R4_p+*X572!f&{|uwhJNExlSO%
zH}DpVvUgdT4@phZrrabiiuuade2YH=5lBKe9HgaL5mq0nW@<GvlbzUa^;?3IW`>~=
zN?B<$uE>84RA*2m7ydD}c5VpqaQ^+{^}U(ryI-I3S;;!JCjAt{BWKqz(Po*Z)mE;U
z{U$x-grEc;#3RdB$3{O|I_BjvV~Q`vyhhbywFg&6$JX8)DrXuK2`iCkY)mF8p|O!_
zm?j-haf*0_PSHu2Es|=Ico;3S3p-Im#o@;>u4q_|U1&Pof+2^SX&o&X5pfPvp2Gu}
zvJPVgDb8WabNES2n;7rJbOuuqG^&wruliMGRAHW%Jo~&CeMOx$v7mp+ALLC;Cr6kj
zxO!Yw{i}Xmr<Y0wCui7q(M!SH38o~S?0w{CRLu=8>#31cYGgvZ@W<x=FGtO(TyxQF
z{>XZw`9Gxot+af<$89n((nEg<bPj%_k8%*YU;v(l7XcEq{G=&<{(h@3-HGvPtTXCE
z;#O2eWAqXm*&9n)MX^IXZl*2T!jPe~s{b+O%2&ZUkEXG@R=sIpa%plPS{wH<1!Ye|
z_=`xet|!hukN0$BG{ew-7q2bdF!U|0#?V&uU{Jp#eCxv=pHFL7V^-{m1H&svkET|J
zd!A0DH7U^U@%X*Nfp9}480+YW1zXZMs7G~r-f`)YOR({S^fULSEg?5<_Sv^R#>1A4
z-eb)HBS25MHWX?Ng=)Agb0*8>4_vpM_kOw2?C-{nfF?=Z0s6!^N+_d(Dtge1KJ;T1
z2Cy2W@#$<qJ)J8QX6C1q$;Fx6{Dj>TG&|(n+`_3Dd1`UtOui~Vy)d6Uu$ViQ8!zk`
M+41pQzCfSwpSpoIlK=n!

delta 1794
zcmaJ>eQZ-z6hG(PzW3IT*LG|BT8dlOm3Gi|TiN;nS;0kwu+3-*lfhgZ9s4S-Yr)No
z_|Yjd60!hE|4{z}A;d%^m=QyWQ4;+Jjbw=lA%rLr^2QPqF(4#HTF>hn$o|mR`@8p?
zbI<$Tdw=iT&iK#OAM@tjFPsO!Spe9*CzHxO)O}_G;8qikjEo%^jvwt!0_d&*7|)Fk
zr3UNYp7@+{ZxUjo6cB%A$H@MQuxd0jF_j>L_<o}<F_ztvvdhkO^!^3%Ycr{-90uTH
zns=%Gcq%iLx1LO#1F#;V1xIq(*C)30b-x2pb(a#p0R&*vrD^EXkxMl6X4&|+vy>wg
z{pgb$KlED?e}YlVz18gMSJSkyG^+zPOl}2mOE0TT7ASb|Eb@gbxVm8A<bsv65=@0!
z&Ng&)X|Z`=Wh+FZfp&0}_Hl|{t^q4W%nGlV6t~i<bSQ_FGs=U7wuSq5;Lg{J+ZS(_
zN&x>qU-*@)ein)AzkdJ{2*A@?BCW3jBOO6c2Qh<5-4_bP@mJw4r_a-uqes<Rea!0G
z8i)ZDnpHtuptv;<D=4iRh#!;=4YU#{hc&2YR?cWpzku>U1MLGA+BB%5F5K@`J6b>w
zaEAsJv`vyigSw%`?HXw7uy|X;lFR_za2j1WgIBmy+;^;wUDWN+-QeB)d;GPzS@CzK
zZ^AmkF1N(ug%d{mGH<|(l3k*Pt}0pf$#Ny*dB*X4@x#Xxg<8`W`EqTrLo8la(?|sX
zw$@7D(|9wR{Uw*9b~Br0vA-AbXmOI8dUO!47yat_OZS+YNpu)5gke4DZx=-8MvMfS
zQFPWI3;SA~v3RV$?8{DB6zc7cC}mI}uVx7KWm|Omxa(b;L&@&$Bx}@d?s|yWn5<s8
zvYK4>oXhESecBjVwJM?uu{F;;la?(OnRWLtoF4dcYvW5l-ny*jZ8={&8A^`rO^?0E
zLb^?TyLR^ZkYkOJ*&|U31T(L#klPY6+fKqWnET1pgn23ea!zx9ltow%9k2`bYeJwZ
zhObVHMw+kz>&#e<0UCvBw99SS5{p(wHX<1{=%~~p8|dUD0VM^<jI|+6@lX3LvV*Vl
zscKMCv^5^f%N~qVqQfT&Zyh|yy+1SaO4w-HklrvzFd5d?ghDmcHE(MkB!oO+3Ow2;
z>DTI|a>soj>B9y|GKBR~@dU@LLeOurZ+(89(JKaJlWlk)Sb^UcFJqkWs?JNS)V#U|
z&pl5=gC~i-L`$uBT6HN_{8nYYr#GY8Yo=L0$1MFJOJtM8TT(7_q>0L!t_vymE<>=x
z8rTS3uoJ*v*k%mo1A=HK4eFcFjP#MINMiwiOH7qVlh6CK!$D7HM=%r$c66S7Z1jxw
z_OwK!Ej_*SkByg2D@3_-N2fz{QytZePL0-xV)24xv$<_Hl(ey3WywFGDI46SWjtlV
zVnPs1{)Ps>QIy=qNFot2y1Q)BZem&9m2a^6Z_DMLToW5OVI_FLr_~8-bu3*PhcB+y
z%+~TP(wsO=?rv|VcC)>GdU>ND7cNetbP+Q}z~u4y5@0(8VER%C=8wZ%NfLCm7UYnj
z4tW$%#0u1-0gY%viPW{A6$;U+K%!zGoyzV@kB{gNWG4@#$8+g%J~cU*&KgGcXD4(0
f!|AaxVJSY8$?i=X-pHo+4CVHx$0rISRn`9hmEL{<

diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 06639fd..82a613b 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="chat-box" @click="closeRefBox()" @mousemove="readedMessage()">
 		<el-container>
-			<el-header height="60px">
+			<el-header height="56px">
 				<span>{{ title }}</span>
 				<span title="群聊信息" v-show="this.chat.type == 'GROUP'" class="btn-side el-icon-more"
 					@click="showSide = !showSide"></span>
@@ -25,7 +25,7 @@
 						</el-main>
 						<el-footer height="240px" class="im-chat-footer">
 							<div class="chat-tool-bar">
-								<div title="表情" class="icon iconfont icon-biaoqing" ref="emotion"
+								<div title="表情" class="icon iconfont icon-emoji" ref="emotion"
 									@click.stop="showEmotionBox()">
 								</div>
 								<div title="发送图片">
@@ -58,7 +58,7 @@
 								<div contenteditable="true" v-show="!sendImageUrl" ref="editBox" class="send-text-area"
 									:disabled="lockMessage" @paste.prevent="onEditorPaste"
 									@compositionstart="onEditorCompositionStart" @compositionend="onEditorCompositionEnd"
-									@input="onEditorInput" :placeholder="isReceipt ? '【回执消息】' : ''" @blur="onEditBoxBlur()"
+									@input="onEditorInput" :placeholder="placeholder" @blur="onEditBoxBlur()"
 									@keydown.down="onKeyDown" @keydown.up="onKeyUp" @keydown.enter.prevent="onKeyEnter">x
 								</div>
 
@@ -123,6 +123,7 @@ export default {
 			groupMembers: [],
 			sendImageUrl: "",
 			sendImageFile: "",
+			placeholder: "",
 			isReceipt: true,
 			showVoice: false, // 是否显示语音录制弹窗
 			showSide: false, // 是否显示群聊信息栏
@@ -191,6 +192,7 @@ export default {
 					this.atSearchText = this.focusNode.textContent.substring(stIdx + 1);
 				}
 			}
+			this.refreshPlaceHolder();
 
 		},
 		onEditorCompositionStart() {
@@ -238,6 +240,7 @@ export default {
 		},
 		onSwitchReceipt() {
 			this.isReceipt = !this.isReceipt;
+			this.refreshPlaceHolder();
 		},
 		createSendText() {
 			let sendText = this.isReceipt ? "【回执消息】" : "";
@@ -684,6 +687,17 @@ export default {
 				let div = document.getElementById("chatScrollBox");
 				div.scrollTop = div.scrollHeight;
 			});
+		},
+		refreshPlaceHolder(){
+			console.log("placeholder")
+			if(this.isReceipt){
+				this.placeholder = "【回执消息】"
+			}else if(this.$refs.editBox && this.$refs.editBox.innerHTML){
+				this.placeholder = ""
+			}else{
+				this.placeholder = "聊点什么吧~";
+			}
+			
 		}
 	},
 	computed: {
@@ -710,6 +724,7 @@ export default {
 			}
 			return this.chat.messages.length;
 		}
+		
 	},
 	watch: {
 		chat: {
@@ -735,6 +750,8 @@ export default {
 					this.resetEditor();
 					// 复位回执消息
 					this.isReceipt = false;
+					// 更新placeholder
+					this.refreshPlaceHolder();
 				}
 			},
 			immediate: true
@@ -763,30 +780,26 @@ export default {
 	border: #dddddd solid 1px;
 
 	.el-header {
-		padding: 5px;
-		background-color: white;
+		padding: 3px;
+		background-color: #5870e6;
 		line-height: 50px;
 		font-size: 20px;
 		font-weight: 600;
-		border: #dddddd solid 1px;
-
+		color: #f8f8f8;
+	
 		.btn-side {
 			position: absolute;
 			right: 20px;
-			line-height: 60px;
-			font-size: 22px;
+			line-height: 50px;
+			font-size: 25px;
 			cursor: pointer;
 
-			&:hover {
-				font-size: 30px;
-			}
 		}
 	}
 
 	.im-chat-main {
 		padding: 0;
-		border: #dddddd solid 1px;
-
+	
 		.im-chat-box {
 			>ul {
 				padding: 0 20px;
@@ -802,23 +815,21 @@ export default {
 		display: flex;
 		flex-direction: column;
 		padding: 0;
-		border: #dddddd solid 1px;
-
+		
 		.chat-tool-bar {
-
 			display: flex;
 			position: relative;
 			width: 100%;
 			height: 40px;
 			text-align: left;
 			box-sizing: border-box;
-			border: #dddddd solid 1px;
+			border-top: #ccc solid 1px;
 			padding: 2px;
-
+			background-color: #E8F2FF;
 			>div {
 				font-size: 22px;
 				cursor: pointer;
-				color: #333333;
+				color: black;
 				line-height: 34px;
 				width: 34px;
 				height: 34px;
diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue
index 3d49fe6..8fe65fe 100644
--- a/im-ui/src/components/chat/ChatItem.vue
+++ b/im-ui/src/components/chat/ChatItem.vue
@@ -100,19 +100,19 @@
 		padding: 5px;
 		padding-left: 10px;
 		align-items: center;
-		background-color: #fafafa;
+		background-color: white;
 		white-space: nowrap;
 		color: black;
 		cursor: pointer;
 
 		&:hover {
-			background-color: #eeeeee;
+			background-color: #F8FAFF;
 		}
-
+			
 		&.active {
-			background-color: #e8e8f0;
+			background-color: #F4F9FF;
 		}
-
+			
 		.chat-left {
 			position: relative;
 			display: flex;
diff --git a/im-ui/src/components/friend/AddFriend.vue b/im-ui/src/components/friend/AddFriend.vue
index 6f8ccae..77e1e2f 100644
--- a/im-ui/src/components/friend/AddFriend.vue
+++ b/im-ui/src/components/friend/AddFriend.vue
@@ -1,7 +1,8 @@
 <template>
 	<el-dialog title="添加好友" :visible.sync="dialogVisible" width="30%" :before-close="onClose">
-		<el-input  placeholder="输入用户名或昵称,最多展示20条" class="input-with-select" v-model="searchText" @keyup.enter.native="onSearch()">
-			<el-button slot="append" icon="el-icon-search" @click="onSearch()"></el-button>
+		<el-input  placeholder="输入用户名或昵称进行,最多展示20条" class="input-with-select" v-model="searchText" @keyup.enter.native="onSearch()">
+			 <i class="el-icon-search el-input__icon" slot="suffix"
+				@click="onSearch()"> </i>
 		</el-input>
 		<el-scrollbar style="height:400px">
 			<div v-for="(user) in users" :key="user.id" v-show="user.id != $store.state.userStore.userInfo.id">
@@ -21,8 +22,8 @@
 							<div>昵称:{{user.nickName}}</div>
 						</div>
 					</div>
-					 <el-button type="success" size="small" v-show="!isFriend(user.id)" plain @click="onAddFriend(user)">添加</el-button>
-					 <el-button type="info" size="small" v-show="isFriend(user.id)" plain disabled>已添加</el-button>
+					 <el-button type="success" size="mini" v-show="!isFriend(user.id)"  @click="onAddFriend(user)">添加</el-button>
+					 <el-button type="info" size="mini" v-show="isFriend(user.id)" plain disabled>已添加</el-button>
 				</div>
 			</div>
 		</el-scrollbar>
diff --git a/im-ui/src/components/friend/FriendItem.vue b/im-ui/src/components/friend/FriendItem.vue
index eccbc0f..1e86fe0 100644
--- a/im-ui/src/components/friend/FriendItem.vue
+++ b/im-ui/src/components/friend/FriendItem.vue
@@ -95,13 +95,13 @@
 		cursor: pointer;
 
 		&:hover {
-			background-color: #eeeeee;
+			background-color: #F8FAFF;
 		}
-
+			
 		&.active {
-			background-color: #dddddd;
+			background-color: #F4F9FF;
 		}
-
+			
 		.friend-avatar {
 			display: flex;
 			justify-content: center;
diff --git a/im-ui/src/components/group/AddGroupMember.vue b/im-ui/src/components/group/AddGroupMember.vue
index 6f57bcb..d60be28 100644
--- a/im-ui/src/components/group/AddGroupMember.vue
+++ b/im-ui/src/components/group/AddGroupMember.vue
@@ -2,9 +2,9 @@
 	<el-dialog title="邀请好友" :visible.sync="visible" width="50%" :before-close="onClose">
 		<div class="agm-container">
 			<div class="agm-l-box">
-				<el-input width="200px" placeholder="搜索好友" class="input-with-select" v-model="searchText"
+				<el-input placeholder="搜索好友" v-model="searchText"
 					@keyup.enter.native="onSearch()">
-					<el-button slot="append" icon="el-icon-search" @click="onSearch()"></el-button>
+					<i class="el-icon-search el-input__icon" slot="suffix"> </i>
 				</el-input>
 				<el-scrollbar style="height:400px;">
 					<div v-for="(friend,index) in friends" :key="friend.id">
@@ -132,9 +132,10 @@
 		display: flex;
 		.agm-l-box {
 			flex: 1;
-			border: #53a0e79c solid 1px;
+			border: #587FF0 solid 1px;
 			border-radius: 5px;
 			overflow: hidden;
+			
 			.el-checkbox {
 				display: flex;
 				align-items: center;
@@ -171,14 +172,14 @@
 			display: flex;
 			align-items: center;
 			font-size: 20px;
-			padding: 5px;
+			padding: 10px;
 			font-weight: 600;
-			color: #53a0e7cc;
+			color: #687Ff0;
 		}
 
 		.agm-r-box {
 			flex: 1;
-			border: #53a0e79c solid 1px;
+			border: #587FF0 solid 1px;
 			border-radius: 5px;
 
 			.agm-select-tip {
diff --git a/im-ui/src/components/group/GroupItem.vue b/im-ui/src/components/group/GroupItem.vue
index 05d1070..55def6a 100644
--- a/im-ui/src/components/group/GroupItem.vue
+++ b/im-ui/src/components/group/GroupItem.vue
@@ -41,14 +41,14 @@
 		padding: 5px;
 		padding-left: 10px;
 		align-items: center;
-		background-color: #fafafa;
+		background-color: white;
 		white-space: nowrap;
 		&:hover {
-			background-color: #eeeeee;
+			background-color: #F8FAFF;
 		}
 	
 		&.active {
-			background-color: #dddddd;
+			background-color: #F4F9FF;
 		}
 	
 		.group-avatar {
@@ -63,7 +63,7 @@
 			line-height: 50px;
 			white-space: nowrap;
 			overflow: hidden;
-			font-size: 14px;
+			font-size: 15px;
 			font-weight: 600;
 		}
 	}
diff --git a/im-ui/src/components/setting/Setting.vue b/im-ui/src/components/setting/Setting.vue
index e1c46dd..410b05b 100644
--- a/im-ui/src/components/setting/Setting.vue
+++ b/im-ui/src/components/setting/Setting.vue
@@ -1,6 +1,6 @@
 <template>
 	<el-dialog class="setting" title="设置" :visible.sync="visible"  width="500px" :before-close="onClose">
-		<el-form :model="userInfo" label-width="80px" :rules="rules" ref="settingForm">
+		<el-form :model="userInfo" label-width="70px" :rules="rules" ref="settingForm">
 			<el-form-item label="头像">
 				<file-upload  class="avatar-uploader"
 				:action="imageAction" 
@@ -108,6 +108,7 @@
 
 <style lang="scss" >
 	.setting {
+		
 		.avatar-uploader {
 			
 			.el-upload {
diff --git a/im-ui/src/view/Chat.vue b/im-ui/src/view/Chat.vue
index b342196..e985c51 100644
--- a/im-ui/src/view/Chat.vue
+++ b/im-ui/src/view/Chat.vue
@@ -2,8 +2,8 @@
 	<el-container class="chat-page">
 		<el-aside width="260px" class="chat-list-box">
 			<div class="chat-list-header">
-				<el-input width="200px" placeholder="搜索" v-model="searchText">
-					<el-button slot="append" icon="el-icon-search"></el-button>
+				<el-input class="search-text" placeholder="搜索" v-model="searchText">
+					<i class="el-icon-search el-input__icon" slot="prefix"> </i>
 				</el-input>
 			</div>
 			<div class="chat-list-loadding"  v-if="loading" v-loading="true" element-loading-text="消息接收中..."
@@ -74,9 +74,15 @@
 			width: 3rem;
 
 			.chat-list-header {
-				padding: 5px;
-				background-color: white;
+				padding: 3px 8px;
+				background-color: #5870e6;
 				line-height: 50px;
+				
+				.el-input__inner {
+					border-radius: 10px !important;
+					background-color: #F8F8F8;
+				}
+				
 			}
 			
 			.chat-list-loadding{
@@ -90,6 +96,8 @@
 			
 			.chat-list-items {
 				flex: 1;
+				background: #F8F8F8;
+				margin: 0 3px;
 			}
 		}
 	}
diff --git a/im-ui/src/view/Friend.vue b/im-ui/src/view/Friend.vue
index f30dc7a..dca7a6f 100644
--- a/im-ui/src/view/Friend.vue
+++ b/im-ui/src/view/Friend.vue
@@ -2,19 +2,16 @@
 	<el-container class="friend-page">
 		<el-aside width="260px" class="friend-list-box">
 			<div class="friend-list-header">
-				<div class="friend-list-search">
-					<el-input width="200px" placeholder="搜索好友" v-model="searchText">
-						<el-button slot="append" icon="el-icon-search"></el-button>
-					</el-input>
-				</div>
-				<el-button plain icon="el-icon-plus" style="border: none; padding:12px; font-size: 20px;color: black;"
-					title="添加好友" @click="onShowAddFriend()"></el-button>
-				<add-friend :dialogVisible="showAddFriend" @close="onCloseAddFriend">
-				</add-friend>
+				<el-input class="search-text" placeholder="搜索" v-model="searchText">
+					<i class="el-icon-search el-input__icon" slot="prefix"> </i>
+				</el-input>
+				<el-button plain class="add-btn" icon="el-icon-plus" title="添加好友"
+					@click="onShowAddFriend()"></el-button>
+				<add-friend :dialogVisible="showAddFriend" @close="onCloseAddFriend"></add-friend>
 			</div>
 			<el-scrollbar class="friend-list-items">
 				<div v-for="(friend,index) in $store.state.friendStore.friends" :key="index">
-					<friend-item v-show="friend.nickName.startsWith(searchText)"  :index="index"
+					<friend-item v-show="friend.nickName.startsWith(searchText)" :index="index"
 						:active="friend === $store.state.friendStore.activeFriend" @chat="onSendMessage(friend)"
 						@delete="onDelItem(friend,index)" @click.native="onActiveItem(friend,index)">
 					</friend-item>
@@ -27,9 +24,7 @@
 			</div>
 			<div v-show="userInfo.id">
 				<div class="friend-detail">
-					<head-image  :size="200" 
-						:name="userInfo.nickName"
-						:url="userInfo.headImage"
+					<head-image :size="200" :name="userInfo.nickName" :url="userInfo.headImage"
 						@click.native="showFullImage()"></head-image>
 					<div>
 						<div class="info-item">
@@ -41,17 +36,20 @@
 								<el-descriptions-item label="性别">{{ userInfo.sex==0?"男":"女" }}</el-descriptions-item>
 								<el-descriptions-item label="签名">{{ userInfo.signature }}</el-descriptions-item>
 							</el-descriptions>
-							
+
 						</div>
 						<div class="frient-btn-group">
-							<el-button v-show="isFriend" icon="el-icon-chat-dot-round" type="primary"  @click="onSendMessage(userInfo)">发送消息</el-button>
-							<el-button v-show="!isFriend" icon="el-icon-plus" type="primary"  @click="onAddFriend(userInfo)">加为好友</el-button>
-							<el-button v-show="isFriend" icon="el-icon-delete"  type="danger" @click="onDelItem(userInfo,activeIdx)">删除好友</el-button>
+							<el-button v-show="isFriend" icon="el-icon-position" type="primary"
+								@click="onSendMessage(userInfo)">发消息</el-button>
+							<el-button v-show="!isFriend" icon="el-icon-plus" type="primary"
+								@click="onAddFriend(userInfo)">加为好友</el-button>
+							<el-button v-show="isFriend" icon="el-icon-delete" type="danger"
+								@click="onDelItem(userInfo,activeIdx)">删除好友</el-button>
 						</div>
 					</div>
 				</div>
 				<el-divider content-position="center"></el-divider>
-				
+
 			</div>
 		</el-container>
 	</el-container>
@@ -106,7 +104,7 @@
 					})
 				})
 			},
-			onAddFriend(user){
+			onAddFriend(user) {
 				this.$http({
 					url: "/friend/add",
 					method: "post",
@@ -116,12 +114,12 @@
 				}).then((data) => {
 					this.$message.success("添加成功，对方已成为您的好友");
 					let friend = {
-						id:user.id,
+						id: user.id,
 						nickName: user.nickName,
 						headImage: user.headImage,
 						online: user.online
 					}
-					this.$store.commit("addFriend",friend);
+					this.$store.commit("addFriend", friend);
 				})
 			},
 			onSendMessage(user) {
@@ -172,14 +170,14 @@
 			friendStore() {
 				return this.$store.state.friendStore;
 			},
-			isFriend(){
-				return this.friendStore.friends.find((f)=>f.id==this.userInfo.id);
+			isFriend() {
+				return this.friendStore.friends.find((f) => f.id == this.userInfo.id);
 			}
 		}
 	}
 </script>
 
-<style scoped lang="scss">
+<style lang="scss">
 	.friend-page {
 		.friend-list-box {
 			display: flex;
@@ -191,16 +189,29 @@
 				height: 50px;
 				display: flex;
 				align-items: center;
-				padding: 5px;
-				background-color: white;
-
-				.friend-list-search {
-					flex: 1;
+				padding: 3px 8px;
+				background-color: #5870e6;
+				
+				.el-input__inner {
+					border-radius: 10px !important;
+					background-color: #F8F8F8;
+				}
+				
+				.add-btn {
+					padding: 5px !important;
+					margin: 5px;
+					font-size: 20px;
+					color: #587FF0;
+					border: #587FF0 1px solid;
+					background-color: #F0F8FF;
+					border-radius: 50%;
 				}
 			}
 
 			.friend-list-items {
 				flex: 1;
+				margin: 0 3px;
+				background: #F8F8F8;
 			}
 		}
 
@@ -210,16 +221,14 @@
 			border: #dddddd solid 1px;
 
 			.friend-header {
-				width: 100%;
+				padding: 3px;	
 				height: 50px;
-				padding: 5px;
 				line-height: 50px;
 				font-size: 20px;
-				text-align: left;
-				text-indent: 10px;
 				font-weight: 600;
-				background-color: white;
-				border: #dddddd solid 1px;
+				text-align: center;
+				color: #f8f8f8;
+				background-color: #5870e6;
 			}
 
 			.friend-detail {
@@ -230,6 +239,7 @@
 				.info-item {
 					margin-left: 20px;
 					background-color: #ffffff;
+					border-radius: 10px ;
 				}
 
 				.description {
diff --git a/im-ui/src/view/Group.vue b/im-ui/src/view/Group.vue
index 0304045..9024e75 100644
--- a/im-ui/src/view/Group.vue
+++ b/im-ui/src/view/Group.vue
@@ -2,13 +2,11 @@
 	<el-container class="group-page">
 		<el-aside width="260px" class="group-list-box">
 			<div class="group-list-header">
-				<div class="group-list-search">
-					<el-input width="200px" placeholder="搜索群聊" v-model="searchText">
-						<el-button slot="append" icon="el-icon-search"></el-button>
-					</el-input>
-				</div>
-				<el-button plain icon="el-icon-plus" style="border: none; padding: 12px; font-size: 20px;color: black;"
-					title="创建群聊" @click="onCreateGroup()"></el-button>
+				<el-input class="search-text" placeholder="搜索" v-model="searchText">
+					<i class="el-icon-search el-input__icon" slot="prefix"> </i>
+				</el-input>
+				<el-button plain class="add-btn" icon="el-icon-plus" title="创建群聊"
+					@click="onCreateGroup()"></el-button>
 			</div>
 			<el-scrollbar class="group-list-items">
 				<div v-for="(group,index) in groupStore.groups" :key="index">
@@ -26,17 +24,17 @@
 				<div v-show="activeGroup.id">
 					<div class="group-info">
 						<div>
-							<file-upload  v-show="isOwner" class="avatar-uploader" :action="imageAction"
+							<file-upload v-show="isOwner" class="avatar-uploader" :action="imageAction"
 								:showLoading="true" :maxSize="maxSize" @success="onUploadSuccess"
 								:fileTypes="['image/jpeg', 'image/png', 'image/jpg','image/webp']">
 								<img v-if="activeGroup.headImage" :src="activeGroup.headImage" class="avatar">
 								<i v-else class="el-icon-plus avatar-uploader-icon"></i>
 							</file-upload>
-							<head-image  v-show="!isOwner" class="avatar" :size="200" 
-								:url="activeGroup.headImage"
+							<head-image v-show="!isOwner" class="avatar" :size="200" :url="activeGroup.headImage"
 								:name="activeGroup.remark">
 							</head-image>
-							<el-button class="send-btn" icon="el-icon-chat-dot-round" type="primary" @click="onSendMessage()">发送消息</el-button>
+							<el-button class="send-btn" icon="el-icon-position" type="primary"
+								@click="onSendMessage()">发消息</el-button>
 						</div>
 						<el-form class="group-form" label-width="130px" :model="activeGroup" :rules="rules"
 							ref="groupForm">
@@ -58,7 +56,7 @@
 									maxlength="1024" placeholder="群主未设置"></el-input>
 							</el-form-item>
 							<div>
-								<el-button type="success" @click="onSaveGroup()">提交</el-button>
+								<el-button type="success" @click="onSaveGroup()">保存</el-button>
 								<el-button type="danger" v-show="!isOwner" @click="onQuit()">退出群聊</el-button>
 								<el-button type="danger" v-show="isOwner" @click="onDissolve()">解散群聊</el-button>
 							</div>
@@ -69,8 +67,7 @@
 						<div class="group-member-list">
 							<div v-for="(member) in groupMembers" :key="member.id">
 								<group-member v-show="!member.quit" class="group-member" :member="member"
-									:showDel="isOwner&&member.userId!=activeGroup.ownerId"
-									@del="onKick"></group-member>
+									:showDel="isOwner&&member.userId!=activeGroup.ownerId" @del="onKick"></group-member>
 							</div>
 							<div class="group-invite">
 								<div class="invite-member-btn" title="邀请好友进群聊" @click="onInviteMember()">
@@ -159,7 +156,7 @@
 				this.showAddGroupMember = false;
 			},
 			onUploadSuccess(data) {
-				this.activeGroup.headImage =data.originUrl;
+				this.activeGroup.headImage = data.originUrl;
 				this.activeGroup.headImageThumb = data.thumbUrl;
 			},
 			onSaveGroup() {
@@ -249,9 +246,9 @@
 					this.groupMembers = members;
 				})
 			},
-			reset(){
-				this.activeGroup={};
-				this.groupMembers=[];
+			reset() {
+				this.activeGroup = {};
+				this.groupMembers = [];
 			}
 		},
 		computed: {
@@ -278,22 +275,34 @@
 			display: flex;
 			flex-direction: column;
 			border: #dddddd solid 1px;
-			background: white;
+			background: #F8F8F8;
 
 			.group-list-header {
 				height: 50px;
 				display: flex;
 				align-items: center;
-				padding: 5px;
-				background-color: white;
-
-				.group-list-search {
-					flex: 1;
+				padding: 3px 8px;
+				background-color: #5870e6;
+				
+				.el-input__inner {
+					border-radius: 10px !important;
+				}
+				
+				.add-btn {
+					padding: 5px !important;
+					margin: 5px;
+					font-size: 20px;
+					color: #587FF0;
+					border: #587FF0 1px solid;
+					background-color: #F0F8FF;
+					border-radius: 50%;
 				}
 			}
 
 			.group-list-items {
 				flex: 1;
+				margin: 0 3px;
+				background: #F8F8F8;
 			}
 		}
 
@@ -301,26 +310,25 @@
 			display: flex;
 			flex-direction: column;
 			border: #dddddd solid 1px;
-
 			.group-header {
-				width: 100%;
+				padding: 3px;
 				height: 50px;
-				padding: 5px;
 				line-height: 50px;
 				font-size: 20px;
 				font-weight: 600;
-				text-align: left;
-				text-indent: 10px;
-				background-color: white;
-				border: #dddddd solid 1px;
+				text-align: center;
+				color: #f8f8f8;
+				background-color: #5870e6;
 			}
 
 			.group-container {
-				padding: 20px;
+				margin: 20px;
+
 				.group-info {
 					display: flex;
 					padding: 5px 20px;
-
+					
+					
 					.group-form {
 						flex: 1;
 						padding-left: 40px;
diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index 6ad830a..66a936f 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -3,29 +3,29 @@
 		<el-aside width="80px" class="navi-bar">
 			<div class="user-head-image">
 				<head-image :name="$store.state.userStore.userInfo.nickName"
-					:url="$store.state.userStore.userInfo.headImageThumb" :size="60"
+					:url="$store.state.userStore.userInfo.headImageThumb" :size="50"
 					@click.native="showSettingDialog = true">
 				</head-image>
 			</div>
-			<el-menu background-color="#333333" text-color="#ddd" style="margin-top: 30px;">
+			<el-menu background-color="#19082f"  style="margin-top: 25px;">
 				<el-menu-item title="聊天">
-					<router-link v-bind:to="'/home/chat'">
-						<span class="el-icon-chat-dot-round"></span>
+					<router-link class="link" v-bind:to="'/home/chat'">
+						<span class="icon iconfont icon-chat"></span>
 						<div v-show="unreadCount > 0" class="unread-text">{{ unreadCount }}</div>
 					</router-link>
 				</el-menu-item>
 				<el-menu-item title="好友">
-					<router-link v-bind:to="'/home/friend'">
-						<span class="el-icon-user"></span>
+					<router-link class="link" v-bind:to="'/home/friend'">
+						<span class="icon iconfont icon-friend"></span>
 					</router-link>
 				</el-menu-item>
 				<el-menu-item title="群聊">
-					<router-link v-bind:to="'/home/group'">
-						<span class="icon iconfont icon-group_fill"></span>
+					<router-link class="link" v-bind:to="'/home/group'">
+						<span class="icon iconfont icon-group"></span>
 					</router-link>
 				</el-menu-item>
 				<el-menu-item title="设置" @click="showSetting()">
-					<span class="el-icon-setting"></span>
+					<span class="icon iconfont icon-setting"></span>
 				</el-menu-item>
 			</el-menu>
 			<div class="exit-box" @click="onExit()" title="退出">
@@ -322,8 +322,8 @@
 
 <style scoped lang="scss">
 	.navi-bar {
-		background: #333333;
-		padding: 10px;
+		background: #19082f;
+		padding: 15px;
 		padding-top: 50px;
 
 		.el-menu {
@@ -331,21 +331,25 @@
 			flex: 1;
 
 			.el-menu-item {
-				margin: 25px 0;
-
-				.router-link-exact-active span {
-					color: white !important;
-				}
-
-
-
-				span {
-					font-size: 24px !important;
-					color: #aaaaaa;
-
-					&:hover {
-						color: white !important;
+				margin: 20px 0;
+				background-color: #19082f !important;
+				padding: 0 !important;
+				text-align: center;
+				.link {
+					text-decoration: none;
+					
+					&.router-link-active .icon {
+						color: #d5894c;
 					}
+					
+					&:hover .icon{
+						color: white;
+					}
+				}
+				
+				.icon  {
+					font-size: 26px !important;
+					color: #ddd;
 				}
 
 				.unread-text {
@@ -365,30 +369,28 @@
 			}
 		}
 
-
-
 		.exit-box {
 			position: absolute;
 			width: 60px;
 			bottom: 40px;
-			color: #aaaaaa;
+			color: #ccc;
 			text-align: center;
 			cursor: pointer;
 
 			.icon {
 				font-size: 28px;
 			}
+			
 			&:hover {
-				color: white !important;
+				color: white;
 			}
 		}
 	}
 
 	.content-box {
 		padding: 0;
-		background-color: #E9EEF3;
-		color: #333;
+		background-color: #eee;
+		color: black;
 		text-align: center;
-
 	}
 </style>
\ No newline at end of file
diff --git a/im-ui/src/view/Login.vue b/im-ui/src/view/Login.vue
index c64b6d4..5e14eda 100644
--- a/im-ui/src/view/Login.vue
+++ b/im-ui/src/view/Login.vue
@@ -30,6 +30,13 @@
 						<li>uniapp移动端支持发送语音消息</li>
 					</ul>
 				</div>
+				<div>
+					<h3>最近更新(2024-04-27)：</h3>
+					<ul>
+						<li>uniapp端加载离线消息慢以及卡顿问题优化</li>
+						<li>web端样式风格调整</li>
+					</ul>
+				</div>
 				<div>
 					<h3>如果本项目对您有帮助,请在gitee上帮忙点个star</h3>
 				</div>
@@ -178,7 +185,7 @@
 	.login-view {
 		width: 100%;
 		height: 100%;
-		background: rgb(232, 242, 255);
+		background: #E8F2FF;
 		background-size: cover;
 		box-sizing: border-box;
 

From 7b5285e781203e0cf7bd16185135edea6dfaf91e Mon Sep 17 00:00:00 2001
From: blue <825657193@qq.com>
Date: Sat, 27 Apr 2024 21:35:45 +0800
Subject: [PATCH 5/7] =?UTF-8?q?web=E7=AB=AF=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/chat/ChatBox.vue | 2 +-
 im-ui/src/view/Chat.vue               | 1 -
 im-ui/src/view/Friend.vue             | 3 +--
 im-ui/src/view/Group.vue              | 1 -
 im-ui/src/view/Home.vue               | 6 +-----
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue
index 82a613b..bbfb698 100644
--- a/im-ui/src/components/chat/ChatBox.vue
+++ b/im-ui/src/components/chat/ChatBox.vue
@@ -778,7 +778,7 @@ export default {
 	width: 100%;
 	background: #f8f8f8;
 	border: #dddddd solid 1px;
-
+	
 	.el-header {
 		padding: 3px;
 		background-color: #5870e6;
diff --git a/im-ui/src/view/Chat.vue b/im-ui/src/view/Chat.vue
index e985c51..6d6d2a6 100644
--- a/im-ui/src/view/Chat.vue
+++ b/im-ui/src/view/Chat.vue
@@ -75,7 +75,6 @@
 
 			.chat-list-header {
 				padding: 3px 8px;
-				background-color: #5870e6;
 				line-height: 50px;
 				
 				.el-input__inner {
diff --git a/im-ui/src/view/Friend.vue b/im-ui/src/view/Friend.vue
index dca7a6f..aecbcff 100644
--- a/im-ui/src/view/Friend.vue
+++ b/im-ui/src/view/Friend.vue
@@ -190,8 +190,7 @@
 				display: flex;
 				align-items: center;
 				padding: 3px 8px;
-				background-color: #5870e6;
-				
+
 				.el-input__inner {
 					border-radius: 10px !important;
 					background-color: #F8F8F8;
diff --git a/im-ui/src/view/Group.vue b/im-ui/src/view/Group.vue
index 9024e75..0afeeb0 100644
--- a/im-ui/src/view/Group.vue
+++ b/im-ui/src/view/Group.vue
@@ -282,7 +282,6 @@
 				display: flex;
 				align-items: center;
 				padding: 3px 8px;
-				background-color: #5870e6;
 				
 				.el-input__inner {
 					border-radius: 10px !important;
diff --git a/im-ui/src/view/Home.vue b/im-ui/src/view/Home.vue
index 66a936f..d6672fd 100644
--- a/im-ui/src/view/Home.vue
+++ b/im-ui/src/view/Home.vue
@@ -341,10 +341,6 @@
 					&.router-link-active .icon {
 						color: #d5894c;
 					}
-					
-					&:hover .icon{
-						color: white;
-					}
 				}
 				
 				.icon  {
@@ -389,7 +385,7 @@
 
 	.content-box {
 		padding: 0;
-		background-color: #eee;
+		background-color: #f8f8f8;
 		color: black;
 		text-align: center;
 	}

From 3fcda25588224da43df504e93c664097fbbaf30f Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sat, 27 Apr 2024 22:48:09 +0800
Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BC=9A=E8=AF=9D=E4=B8=ADemo?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E9=98=BB=E6=96=AD=E6=97=B6=E9=97=B4=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bx/imserver/netty/ws/WebSocketServer.java  |  2 +-
 im-uniapp/components/chat-item/chat-item.vue       | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java b/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
index 2ed9b58..ffd0e4e 100644
--- a/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
+++ b/im-server/src/main/java/com/bx/imserver/netty/ws/WebSocketServer.java
@@ -61,7 +61,7 @@ public class WebSocketServer implements IMServer {
                     protected void initChannel(Channel ch) {
                         // 获取职责链
                         ChannelPipeline pipeline = ch.pipeline();
-                        pipeline.addLast(new IdleStateHandler(120, 0, 0, TimeUnit.SECONDS));
+                        pipeline.addLast(new IdleStateHandler(60, 0, 0, TimeUnit.SECONDS));
                         pipeline.addLast("http-codec", new HttpServerCodec());
                         pipeline.addLast("aggregator", new HttpObjectAggregator(65535));
                         pipeline.addLast("http-chunked", new ChunkedWriteHandler());
diff --git a/im-uniapp/components/chat-item/chat-item.vue b/im-uniapp/components/chat-item/chat-item.vue
index aade43c..d328e51 100644
--- a/im-uniapp/components/chat-item/chat-item.vue
+++ b/im-uniapp/components/chat-item/chat-item.vue
@@ -1,5 +1,7 @@
 <template>
-	<view class="chat-item" :class="active?'active':''" @click="showChatBox()">
+	<view class="chat-item" :class="active?'active':''" >
+		<!--rich-text中的表情包会屏蔽事件，所以这里用一个遮罩层捕获点击事件 -->
+		<view class="mask" @tap="showChatBox()"></view>
 		<view class="left">
 			<head-image :url="chat.headImage" :name="chat.showName" :size="90"></head-image>
 			<view v-if="chat.unreadCount>0" class="unread-text">{{chat.unreadCount}}</view>
@@ -12,7 +14,7 @@
 			<view class="chat-content">
 				<view class="chat-at-text">{{atText}}</view>
 				<view class="chat-send-name" v-show="chat.sendNickName">{{chat.sendNickName+':&nbsp;'}}</view>
-				<rich-text class="chat-content-text" :nodes="$emo.transform(chat.lastContent)"></rich-text>
+				<rich-text class="chat-content-text"  :nodes="$emo.transform(chat.lastContent)"></rich-text>
 			</view>
 		</view>
 	</view>
@@ -75,7 +77,13 @@
 		&.active {
 			background-color: #eeeeee;
 		}
-
+		
+		
+		.mask {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+		}
 		.left {
 			position: relative;
 			display: flex;

From 2f0b69a2e0e5f8b1d260438f48a5aad6a279734f Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sat, 27 Apr 2024 23:19:54 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=B0=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-ui/src/components/group/GroupItem.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/im-ui/src/components/group/GroupItem.vue b/im-ui/src/components/group/GroupItem.vue
index 55def6a..7e5f30c 100644
--- a/im-ui/src/components/group/GroupItem.vue
+++ b/im-ui/src/components/group/GroupItem.vue
@@ -43,6 +43,8 @@
 		align-items: center;
 		background-color: white;
 		white-space: nowrap;
+		cursor: pointer;
+		
 		&:hover {
 			background-color: #F8FAFF;
 		}