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 = `<img src="${path}" style="with:30px;height:30px;
 		margin: 0 -2px;vertical-align:bottom;"/>`;
 	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 @@
 					<view class="chat-msg-image" v-if="msgInfo.type == $enums.MESSAGE_TYPE.IMAGE">
 						<long-press-menu :items="menuItems" @select="onSelectMenu">
 							<view class="img-load-box">
-								<image class="send-image" mode="widthFix" :src="JSON.parse(msgInfo.content).thumbUrl"
+								<image class="send-image" mode="heightFix" :src="JSON.parse(msgInfo.content).thumbUrl"
 									lazy-load="true" @click.stop="onShowFullImage()">
 								</image>
 								<loading v-if="loading"></loading>
@@ -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 @@
 					<view class="user-item">
 						<head-image :id="user.id" :name="user.nickName" :online="user.online"
 							:url="user.headImage"></head-image>
-						<view class="user-name">{{ user.nickName }}</view>
+						<view class="user-info">
+							<view class="user-name">
+								<view>{{ user.userName }}</view>
+								<uni-tag v-if="user.status == 1" circle type="error" text="已注销" size="small"></uni-tag>
+							</view>
+							<view class="nick-name">{{ `昵称:${user.nickName}`}}</view>
+						</view>
 						<view class="user-btns">
 							<button type="primary" v-show="!isFriend(user.id)" size="mini"
 								@click.stop="onAddFriend(user)">加为好友</button>
@@ -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 @@
 			<view v-if="!group.quit" class="group-edit" @click="onEditGroup()">修改群聊资料 > </view>
 		</view>
 		<bar-group v-if="!group.quit">
-			<btn-bar type="primary" title="发送消息" @click="onSendMessage()"></btn-bar>
-			<btn-bar v-if="!isOwner" type="danger" title="退出群聊" @click="onQuitGroup()"></btn-bar>
-			<btn-bar v-if="isOwner" type="danger" title="解散群聊" @click="onDissolveGroup()"></btn-bar>
+			<btn-bar type="primary" title="发送消息" @tap="onSendMessage()"></btn-bar>
+			<btn-bar v-if="!isOwner" type="danger" title="退出群聊" @tap="onQuitGroup()"></btn-bar>
+			<btn-bar v-if="isOwner" type="danger" title="解散群聊" @tap="onDissolveGroup()"></btn-bar>
 		</bar-group>
 	</view>
 </template>
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 @@
 <template>
 	<view class="login">
 		<view class="title">欢迎登录</view>
-		<uni-forms class="form" :modelValue="loginForm" :rules="rules" validate-trigger="bind">
+		<uni-forms :modelValue="loginForm" :rules="rules" validate-trigger="bind">
 			<uni-forms-item name="userName">
 				<uni-easyinput type="text" v-model="loginForm.userName" prefix-icon="person" placeholder="用户名" />
 			</uni-forms-item>
@@ -69,7 +69,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .login {
 	.title {
 		padding-top: 150rpx;
@@ -80,7 +80,7 @@ export default {
 		font-weight: bold;
 	}
 
-	.form {
+	.uni-forms {
 		padding: 50rpx;
 
 		.btn-submit {
diff --git a/im-uniapp/pages/mine/mine.vue b/im-uniapp/pages/mine/mine.vue
index 1c0c0d4..a2f6d4c 100644
--- a/im-uniapp/pages/mine/mine.vue
+++ b/im-uniapp/pages/mine/mine.vue
@@ -31,16 +31,13 @@
 						</view>
 					</view>
 				</view>
-				<view class="info-arrow">
-
-				</view>
 			</view>
 		</uni-card>
 		<bar-group>
-			<arrow-bar title="修改密码" @click="onModifyPassword()"></arrow-bar>
+			<arrow-bar title="修改密码" @tap="onModifyPassword()"></arrow-bar>
 		</bar-group>
 		<bar-group>
-			<btn-bar title="退出登录" type="danger" @click="onQuit()"></btn-bar>
+			<btn-bar title="退出登录" type="danger" @tap="onQuit()"></btn-bar>
 		</bar-group>
 	</view>
 </template>
diff --git a/im-uniapp/pages/register/register.vue b/im-uniapp/pages/register/register.vue
index 4572844..4e4eb32 100644
--- a/im-uniapp/pages/register/register.vue
+++ b/im-uniapp/pages/register/register.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="register">
 		<view class="title">欢迎注册</view>
-		<uni-forms class="form" ref="form" :modelValue="dataForm" :rules="rules" validate-trigger="bind" label-width="80px">
+		<uni-forms  ref="form" :modelValue="dataForm" :rules="rules" validate-trigger="bind" label-width="80px">
 			<uni-forms-item name="userName" label="用户名">
 				<uni-easyinput type="text" v-model="dataForm.userName" placeholder="用户名" />
 			</uni-forms-item>
@@ -111,7 +111,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .register {
 	.title {
 		padding-top: 150rpx;
@@ -122,7 +122,7 @@ export default {
 		font-weight: 600;
 	}
 
-	.form {
+	.uni-forms {
 		padding: 50rpx;
 
 		.btn-submit {