diff --git a/.DS_Store b/.DS_Store
index 2a302a8..29b9dbd 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/lib/emoji.js b/lib/emoji.js
new file mode 100644
index 0000000..53a62a2
--- /dev/null
+++ b/lib/emoji.js
@@ -0,0 +1,33 @@
+export default [
+    "😀", "😁", "😃", "😄", "😅", "😆", "😉", "😊", "😋", "😎", "😍",
+    "😘", "😗", "😙", "😚", "☺", "😇", "😐", "😑", "😶", "😏", "😣", "😥", "😮", "😯", "😪",
+    "😫", "😴", "😌", "😛", "😜", "😝", "😒", "😓", "😔", "😕", "😲", "😷", "😖", "😞", "😟",
+    "😤", "😢", "😭", "😦", "😧", "😨", "😬", "😰", "😱", "😳", "😵", "😡", "😠",
+    "👦", "👧", "👨", "👩", "👴", "👵", "👶", "👱", "👮", "👲", "👳", "👷", "👸", "💂", "🎅", "👰", "👼",
+    "💆", "💇", "🙍", "🙎", "🙅", "🙆", "💁", "🙋", "🙇", "🙌", "🙏", "👤", "👥", "🚶", "🏃", "👯",
+    "💃", "👫", "👬", "👭", "💏", "💑", "👪", "💪", "👈", "👉", "☝", "👆", "👇", "✌", "✋", "👌",
+    "👍", "👎", "✊", "👊", "👋", "👏", "👐", "✍", "👣", "👀", "👂", "👃", "👅", "👄", "💋", "👓",
+    "👔", "👙", "👛", "👜", "👝", "🎒", "💼", "👞", "👟", "👠", "👡", "👢", "👑",
+    "👒", "🎩", "🎓", "💄", "💅", "💍", "🌂", "📶", "📳", "📴", "♻", "🏧","🚮", "🚰", "♿", "🚹", "🚺",
+    "🚻", "🚼", "🚾", "⚠", "🚸", "⛔", "🚫", "🚳", "🚭", "🚯", "🚱", "🚷", "🔞", "💈",
+    "🙈", "🐒", "🐶", "🐕", "🐩", "🐺", "🐱","🐈", "🐯", "🐅", "🐆", "🐴", "🐎", "🐮", "🐂",
+    "🐃","🐄","🐷","🐖","🐗","🐽","🐏","🐑","🐐","🐪","🐫","🐘","🐭",
+    "🐁","🐀","🐹","🐰","🐇","🐻","🐨","🐼","🐾","🐔","🐓","🐣","🐤","🐥",
+    "🐦", "🐧", "🐸", "🐊","🐢", "🐍", "🐲", "🐉", "🐳", "🐋", "🐬", "🐟", "🐠", "🐡",
+    "🐙", "🐚", "🐌", "🐛", "🐜", "🐝", "🐞", "🦋",  "💐", "🌸", "💮", "🌹", "🌺",
+    "🌻", "🌼", "🌷", "🌱", "🌲", "🌳", "🌴", "🌵", "🌾", "🌿", "🍀", "🍁", "🍂", "🍃",
+    "🌍","🌎","🌏","🌐","🌑","🌒","🌓","🌔","🌕","🌖","🌗","🌘","🌙","🌚",
+    "🌛","🌜","☀","🌝","🌞","⭐","🌟","🌠","☁","⛅","☔","⚡","❄","🔥","💧","🌊",
+    "🏀", "🏈", "🏉", "🎾", "🎱", "🎳", "⛳", "🎣", "🎽", "🎿",
+    "😈", "👿", "👹", "👺", "💀", "☠", "👻", "👽", "👾", "💣",
+    "🌋", "🗻", "🏠", "🏡", "🏢", "🏣", "🏤", "🏥", "🏦", "🏨",
+    "⛲", "🌁", "🌃", "🌆", "🌇", "🎠", "🎡", "🎢", "🚂",
+    "🚌", "🚍", "🚎", "🚏", "🚐", "🚑", "🚒", "🚓", "🚔", "🚕", "🚖", "🚗", "🚘",
+    "💌", "💎", "🔪", "💈", "🚪", "🚽", "🚿", "🛁", "⌛", "⏳", "⌚", "⏰", "🎈", "🎉",
+    "💤", "💢", "💬", "💭", "♨", "🌀", "🔔", "🔕", "✡", "✝", "🔯", "📛", "🔰", "🔱", "⭕", "✅",
+    "☑", "✔", "✖", "❌", "❎", "➕", "➖", "➗", "➰", "➿", "〽", "✳", "✴", "❇", "‼", "⁉", "❓", "❔", "❕", "❗",
+    "🕛", "🕧", "🕐", "🕜", "🕑", "🕝", "🕒", "🕞", "🕓", "🕟", "🕔", "🕠", "🕕", "🕡",
+    "🕖", "🕢", "🕗", "🕣", "🕘", "🕤", "🕙", "🕥", "🕚", "🕦", "⏱", "⏲", "🕰",
+    "💘", "❤", "💓", "💔", "💕", "💖", "💗", "💙", "💚", "💛", "💜", "💝", "💞", "💟❣",
+    "🍇", "🍈", "🍉", "🍊", "🍋", "🍌", "🍍", "🍎", "🍏", "🍐", "🍑", "🍒", "🍓",
+]
\ No newline at end of file
diff --git a/pages/im/components/sentText.nvue b/pages/im/components/sentText.nvue
index 4bea6a9..c787f6f 100644
--- a/pages/im/components/sentText.nvue
+++ b/pages/im/components/sentText.nvue
@@ -1,6 +1,15 @@
 <template>
     <view class="sent--text">
-        <input class="input" type="text" @focus="focus" @blur="blur" v-model="inputTxt" confirm-type="send" @confirm="sent" cursor-spacing="10" />
+        <input
+            class="input"
+            type="text"
+            @focus="focus"
+            @blur="blur"
+            v-model="inputTxt"
+            confirm-type="send"
+            @confirm="sent"
+            cursor-spacing="10"
+        />
         <!-- <button class="button" size="mini" :disabled="disabled" @click="sent">发送</button> -->
     </view>
 </template>
@@ -71,7 +80,7 @@
         .input {
             background: #F3F6FB;
             height: 70rpx;
-            width: 460rpx;
+            width: 500rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
             padding: 0 20rpx;
diff --git a/pages/im/components/sentVoice.nvue b/pages/im/components/sentVoice.nvue
index 197d54a..8ab1148 100644
--- a/pages/im/components/sentVoice.nvue
+++ b/pages/im/components/sentVoice.nvue
@@ -102,7 +102,7 @@
             line-height: 70rpx;
             justify-content: center;
             align-items: center;
-            width: 460rpx;
+            width: 500rpx;
             border-radius: 10rpx;
             margin-right: 15rpx;
 
diff --git a/pages/im/private/chat.nvue b/pages/im/private/chat.nvue
index f91fb03..f94ae6c 100644
--- a/pages/im/private/chat.nvue
+++ b/pages/im/private/chat.nvue
@@ -36,13 +36,12 @@
                 @success="getMessageList" />
             <sent-text v-if="chatType === 1" :conversationType="conversationType" :targetId="targetId"
                 @success="getMessageList" />
-            <view class="msg-type" @click="showPopups = !showPopups">
+            <view class="msg-type msg-popups" @click="scrollBottom('msgPopups')">
                 <image class="icon" src="@/static/icon/popups-icon.png"></image>
             </view>
         </view>
         <!-- 弹出层 -->
-        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId"
-            @success="() => {showPopups = false, getMessageList()}"></sent-popups>
+        <sent-popups :show="showPopups" :conversationType="conversationType" :targetId="targetId" @success="() => {showPopups = false, getMessageList()}"></sent-popups>
     </view>
 </template>
 
@@ -148,10 +147,14 @@
                 })
             },
             // 滚动到底部
-            scrollBottom() {
+            scrollBottom(type) {
+                if(type === 'msgPopups'){
+                    this.showPopups = !this.showPopups
+                }
                 setTimeout(() => {
                     let el = this.$refs.chatBottom
-                    ChatList.scrollToElement(el, {
+                    ChatList.scrollToElement(el, {
+                        offset: 0,
                         animated: false
                     })
                 }, 50)
@@ -165,19 +168,14 @@
     .chat {
         background: $window-color;
         flex: 1;
-
-
-        .body {
-            flex: 1;
-
-            .cell {
+        .body {
+            flex: 1;
+            .cell {
                 padding: 10rpx 30rpx;
-
                 .time {
                     justify-content: center;
                     align-items: center;
-                    padding-bottom: 20rpx;
-
+                    padding-bottom: 20rpx;
                     .text {
                         background: #fff;
                         font-size: 24rpx;
@@ -238,12 +236,10 @@
             padding: 20rpx 30rpx;
             display: flex;
             justify-content: space-between;
-            flex-direction: row;
-
+            flex-direction: row;
             .msg-type {
                 width: 70rpx;
                 height: 70rpx;
-
                 .icon {
                     margin: 5rpx;
                     width: 60rpx;
diff --git a/static/.DS_Store b/static/.DS_Store
index 9cef02d..a81ade7 100644
Binary files a/static/.DS_Store and b/static/.DS_Store differ