diff --git a/im-ui/src/api/emotion.js b/im-ui/src/api/emotion.js
index fb4d0d1..89fc18c 100644
--- a/im-ui/src/api/emotion.js
+++ b/im-ui/src/api/emotion.js
@@ -1,4 +1,10 @@
-const emoTextList = ['微笑', '撇嘴', '色', '发呆', '得意', '流泪', '害羞', '闭嘴', '睡', '大哭', '尴尬', '发怒', '调皮', '呲牙', '惊讶', '难过', '酷', '冷汗', '抓狂', '吐', '偷笑', '可爱', '白眼', '傲慢', '饥饿', '困', '惊恐', '流汗', '憨笑', '大兵', '奋斗', '咒骂', '疑问', '嘘', '晕', '折磨', '衰', '骷髅', '敲打', '再见', '擦汗', '抠鼻', '鼓掌', '糗大了', '坏笑', '左哼哼', '右哼哼', '哈欠', '鄙视', '委屈', '快哭了', '阴险', '亲亲', '吓', '可怜', '菜刀', '西瓜', '啤酒', '篮球', '乒乓', '咖啡', '饭', '猪头', '玫瑰', '凋谢', '示爱', '爱心', '心碎', '蛋糕', '闪电', '炸弹', '刀', '足球', '瓢虫', '便便', '月亮', '太阳', '礼物', '拥抱', '强', '弱', '握手', '胜利', '抱拳', '勾引', '拳头', '差劲', '爱你', 'NO', 'OK', '爱情', '飞吻', '跳跳', '发抖', '怄火', '转圈', '磕头', '回头', '跳绳', '挥手', '激动', '街舞', '献吻', '左太极', '右太极'];
+const emoTextList = ['憨笑', '媚眼', '开心', '坏笑', '可怜', '爱心', '笑哭', '拍手', '惊喜', '打气',
+ '大哭', '流泪', '饥饿', '难受', '健身', '示爱', '色色', '眨眼', '暴怒', '惊恐',
+ '思考', '头晕', '大吐', '酷笑', '翻滚', '享受', '鼻涕', '快乐', '雀跃', '微笑',
+ '贪婪', '红心', '粉心', '星星', '大火', '眼睛', '音符', "叹号", "问号", "绿叶",
+ "燃烧", "喇叭", "警告", "信封", "房子", "礼物", "点赞", "举手", "拍手", "点头",
+ "摇头", "偷瞄", "庆祝", "疾跑", "打滚", "惊吓", "起跳"
+];
let transform = (content) => {
@@ -10,7 +16,7 @@ let textToImg = (emoText) => {
let word = emoText.replace(/\#|\;/gi, '');
let idx = emoTextList.indexOf(word);
let url = require(`@/assets/emoji/${idx}.gif`);
- return `
`
+ return ``
}
diff --git a/im-ui/src/assets/emoji/0.gif b/im-ui/src/assets/emoji/0.gif
index 5be27cb..7a0aadf 100644
Binary files a/im-ui/src/assets/emoji/0.gif and b/im-ui/src/assets/emoji/0.gif differ
diff --git a/im-ui/src/assets/emoji/1.gif b/im-ui/src/assets/emoji/1.gif
index a2644a9..c1da88a 100644
Binary files a/im-ui/src/assets/emoji/1.gif and b/im-ui/src/assets/emoji/1.gif differ
diff --git a/im-ui/src/assets/emoji/10.gif b/im-ui/src/assets/emoji/10.gif
index 905c15b..936e086 100644
Binary files a/im-ui/src/assets/emoji/10.gif and b/im-ui/src/assets/emoji/10.gif differ
diff --git a/im-ui/src/assets/emoji/100.gif b/im-ui/src/assets/emoji/100.gif
deleted file mode 100644
index 92ad35d..0000000
Binary files a/im-ui/src/assets/emoji/100.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/101.gif b/im-ui/src/assets/emoji/101.gif
deleted file mode 100644
index 1f27663..0000000
Binary files a/im-ui/src/assets/emoji/101.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/102.gif b/im-ui/src/assets/emoji/102.gif
deleted file mode 100644
index 748ded1..0000000
Binary files a/im-ui/src/assets/emoji/102.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/103.gif b/im-ui/src/assets/emoji/103.gif
deleted file mode 100644
index be9eaa0..0000000
Binary files a/im-ui/src/assets/emoji/103.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/104.gif b/im-ui/src/assets/emoji/104.gif
deleted file mode 100644
index d7c2066..0000000
Binary files a/im-ui/src/assets/emoji/104.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/11.gif b/im-ui/src/assets/emoji/11.gif
index b512dd5..bfe8b71 100644
Binary files a/im-ui/src/assets/emoji/11.gif and b/im-ui/src/assets/emoji/11.gif differ
diff --git a/im-ui/src/assets/emoji/12.gif b/im-ui/src/assets/emoji/12.gif
index 547529c..4547801 100644
Binary files a/im-ui/src/assets/emoji/12.gif and b/im-ui/src/assets/emoji/12.gif differ
diff --git a/im-ui/src/assets/emoji/13.gif b/im-ui/src/assets/emoji/13.gif
index 3475300..0eaf742 100644
Binary files a/im-ui/src/assets/emoji/13.gif and b/im-ui/src/assets/emoji/13.gif differ
diff --git a/im-ui/src/assets/emoji/14.gif b/im-ui/src/assets/emoji/14.gif
index 6a788f8..f10fbf7 100644
Binary files a/im-ui/src/assets/emoji/14.gif and b/im-ui/src/assets/emoji/14.gif differ
diff --git a/im-ui/src/assets/emoji/15.gif b/im-ui/src/assets/emoji/15.gif
index debab8e..7eecf3f 100644
Binary files a/im-ui/src/assets/emoji/15.gif and b/im-ui/src/assets/emoji/15.gif differ
diff --git a/im-ui/src/assets/emoji/16.gif b/im-ui/src/assets/emoji/16.gif
index ed5d29f..f7608c4 100644
Binary files a/im-ui/src/assets/emoji/16.gif and b/im-ui/src/assets/emoji/16.gif differ
diff --git a/im-ui/src/assets/emoji/17.gif b/im-ui/src/assets/emoji/17.gif
index 85886fe..bd7e2c3 100644
Binary files a/im-ui/src/assets/emoji/17.gif and b/im-ui/src/assets/emoji/17.gif differ
diff --git a/im-ui/src/assets/emoji/18.gif b/im-ui/src/assets/emoji/18.gif
index b6af218..88fbb58 100644
Binary files a/im-ui/src/assets/emoji/18.gif and b/im-ui/src/assets/emoji/18.gif differ
diff --git a/im-ui/src/assets/emoji/19.gif b/im-ui/src/assets/emoji/19.gif
index e045ff2..921a19e 100644
Binary files a/im-ui/src/assets/emoji/19.gif and b/im-ui/src/assets/emoji/19.gif differ
diff --git a/im-ui/src/assets/emoji/2.gif b/im-ui/src/assets/emoji/2.gif
index 40cfda4..f8af503 100644
Binary files a/im-ui/src/assets/emoji/2.gif and b/im-ui/src/assets/emoji/2.gif differ
diff --git a/im-ui/src/assets/emoji/20.gif b/im-ui/src/assets/emoji/20.gif
index efd650f..0dc4aac 100644
Binary files a/im-ui/src/assets/emoji/20.gif and b/im-ui/src/assets/emoji/20.gif differ
diff --git a/im-ui/src/assets/emoji/21.gif b/im-ui/src/assets/emoji/21.gif
index cb8cf6d..e434309 100644
Binary files a/im-ui/src/assets/emoji/21.gif and b/im-ui/src/assets/emoji/21.gif differ
diff --git a/im-ui/src/assets/emoji/22.gif b/im-ui/src/assets/emoji/22.gif
index 96b04df..6a6c1b6 100644
Binary files a/im-ui/src/assets/emoji/22.gif and b/im-ui/src/assets/emoji/22.gif differ
diff --git a/im-ui/src/assets/emoji/23.gif b/im-ui/src/assets/emoji/23.gif
index 96516b8..cb74929 100644
Binary files a/im-ui/src/assets/emoji/23.gif and b/im-ui/src/assets/emoji/23.gif differ
diff --git a/im-ui/src/assets/emoji/24.gif b/im-ui/src/assets/emoji/24.gif
index 5f925c7..e67dc83 100644
Binary files a/im-ui/src/assets/emoji/24.gif and b/im-ui/src/assets/emoji/24.gif differ
diff --git a/im-ui/src/assets/emoji/25.gif b/im-ui/src/assets/emoji/25.gif
index 97f8b1a..7ab3a13 100644
Binary files a/im-ui/src/assets/emoji/25.gif and b/im-ui/src/assets/emoji/25.gif differ
diff --git a/im-ui/src/assets/emoji/26.gif b/im-ui/src/assets/emoji/26.gif
index a7cded7..bb8c177 100644
Binary files a/im-ui/src/assets/emoji/26.gif and b/im-ui/src/assets/emoji/26.gif differ
diff --git a/im-ui/src/assets/emoji/27.gif b/im-ui/src/assets/emoji/27.gif
index bb46890..aaef929 100644
Binary files a/im-ui/src/assets/emoji/27.gif and b/im-ui/src/assets/emoji/27.gif differ
diff --git a/im-ui/src/assets/emoji/28.gif b/im-ui/src/assets/emoji/28.gif
index f59dd58..ae0acee 100644
Binary files a/im-ui/src/assets/emoji/28.gif and b/im-ui/src/assets/emoji/28.gif differ
diff --git a/im-ui/src/assets/emoji/29.gif b/im-ui/src/assets/emoji/29.gif
index 3c5227e..02ce3e2 100644
Binary files a/im-ui/src/assets/emoji/29.gif and b/im-ui/src/assets/emoji/29.gif differ
diff --git a/im-ui/src/assets/emoji/3.gif b/im-ui/src/assets/emoji/3.gif
index 6d6f762..0c3f676 100644
Binary files a/im-ui/src/assets/emoji/3.gif and b/im-ui/src/assets/emoji/3.gif differ
diff --git a/im-ui/src/assets/emoji/30.gif b/im-ui/src/assets/emoji/30.gif
index e24a180..302b058 100644
Binary files a/im-ui/src/assets/emoji/30.gif and b/im-ui/src/assets/emoji/30.gif differ
diff --git a/im-ui/src/assets/emoji/31.gif b/im-ui/src/assets/emoji/31.gif
index 073e743..13f13f0 100644
Binary files a/im-ui/src/assets/emoji/31.gif and b/im-ui/src/assets/emoji/31.gif differ
diff --git a/im-ui/src/assets/emoji/32.gif b/im-ui/src/assets/emoji/32.gif
index 772eff2..be5fc83 100644
Binary files a/im-ui/src/assets/emoji/32.gif and b/im-ui/src/assets/emoji/32.gif differ
diff --git a/im-ui/src/assets/emoji/33.gif b/im-ui/src/assets/emoji/33.gif
index 217c1c5..345d3cb 100644
Binary files a/im-ui/src/assets/emoji/33.gif and b/im-ui/src/assets/emoji/33.gif differ
diff --git a/im-ui/src/assets/emoji/34.gif b/im-ui/src/assets/emoji/34.gif
index e9d4213..0a7d848 100644
Binary files a/im-ui/src/assets/emoji/34.gif and b/im-ui/src/assets/emoji/34.gif differ
diff --git a/im-ui/src/assets/emoji/35.gif b/im-ui/src/assets/emoji/35.gif
index d6da2c3..650195e 100644
Binary files a/im-ui/src/assets/emoji/35.gif and b/im-ui/src/assets/emoji/35.gif differ
diff --git a/im-ui/src/assets/emoji/36.gif b/im-ui/src/assets/emoji/36.gif
index c1e6ac9..f6ba2c0 100644
Binary files a/im-ui/src/assets/emoji/36.gif and b/im-ui/src/assets/emoji/36.gif differ
diff --git a/im-ui/src/assets/emoji/37.gif b/im-ui/src/assets/emoji/37.gif
index 92efec6..5d48c9b 100644
Binary files a/im-ui/src/assets/emoji/37.gif and b/im-ui/src/assets/emoji/37.gif differ
diff --git a/im-ui/src/assets/emoji/38.gif b/im-ui/src/assets/emoji/38.gif
index 489f0f9..8e08969 100644
Binary files a/im-ui/src/assets/emoji/38.gif and b/im-ui/src/assets/emoji/38.gif differ
diff --git a/im-ui/src/assets/emoji/39.gif b/im-ui/src/assets/emoji/39.gif
index 734f6d8..2800730 100644
Binary files a/im-ui/src/assets/emoji/39.gif and b/im-ui/src/assets/emoji/39.gif differ
diff --git a/im-ui/src/assets/emoji/4.gif b/im-ui/src/assets/emoji/4.gif
index 6ccdaa2..3036d2f 100644
Binary files a/im-ui/src/assets/emoji/4.gif and b/im-ui/src/assets/emoji/4.gif differ
diff --git a/im-ui/src/assets/emoji/40.gif b/im-ui/src/assets/emoji/40.gif
index 24a8eb6..6961e5e 100644
Binary files a/im-ui/src/assets/emoji/40.gif and b/im-ui/src/assets/emoji/40.gif differ
diff --git a/im-ui/src/assets/emoji/41.gif b/im-ui/src/assets/emoji/41.gif
index 99139e1..5f46426 100644
Binary files a/im-ui/src/assets/emoji/41.gif and b/im-ui/src/assets/emoji/41.gif differ
diff --git a/im-ui/src/assets/emoji/42.gif b/im-ui/src/assets/emoji/42.gif
index f60897e..2617f27 100644
Binary files a/im-ui/src/assets/emoji/42.gif and b/im-ui/src/assets/emoji/42.gif differ
diff --git a/im-ui/src/assets/emoji/43.gif b/im-ui/src/assets/emoji/43.gif
index 4350491..95684d5 100644
Binary files a/im-ui/src/assets/emoji/43.gif and b/im-ui/src/assets/emoji/43.gif differ
diff --git a/im-ui/src/assets/emoji/44.gif b/im-ui/src/assets/emoji/44.gif
index 650d3dd..f68286b 100644
Binary files a/im-ui/src/assets/emoji/44.gif and b/im-ui/src/assets/emoji/44.gif differ
diff --git a/im-ui/src/assets/emoji/45.gif b/im-ui/src/assets/emoji/45.gif
index 5c8e071..9e7beea 100644
Binary files a/im-ui/src/assets/emoji/45.gif and b/im-ui/src/assets/emoji/45.gif differ
diff --git a/im-ui/src/assets/emoji/46.gif b/im-ui/src/assets/emoji/46.gif
index f3cb074..7c6ff0e 100644
Binary files a/im-ui/src/assets/emoji/46.gif and b/im-ui/src/assets/emoji/46.gif differ
diff --git a/im-ui/src/assets/emoji/47.gif b/im-ui/src/assets/emoji/47.gif
index 5b3057a..6333866 100644
Binary files a/im-ui/src/assets/emoji/47.gif and b/im-ui/src/assets/emoji/47.gif differ
diff --git a/im-ui/src/assets/emoji/48.gif b/im-ui/src/assets/emoji/48.gif
index 27a30c1..f98216e 100644
Binary files a/im-ui/src/assets/emoji/48.gif and b/im-ui/src/assets/emoji/48.gif differ
diff --git a/im-ui/src/assets/emoji/49.gif b/im-ui/src/assets/emoji/49.gif
index dcfa48a..e1870f4 100644
Binary files a/im-ui/src/assets/emoji/49.gif and b/im-ui/src/assets/emoji/49.gif differ
diff --git a/im-ui/src/assets/emoji/5.gif b/im-ui/src/assets/emoji/5.gif
index ab0b81b..eaf372b 100644
Binary files a/im-ui/src/assets/emoji/5.gif and b/im-ui/src/assets/emoji/5.gif differ
diff --git a/im-ui/src/assets/emoji/50.gif b/im-ui/src/assets/emoji/50.gif
index 029cf0f..26bf13a 100644
Binary files a/im-ui/src/assets/emoji/50.gif and b/im-ui/src/assets/emoji/50.gif differ
diff --git a/im-ui/src/assets/emoji/51.gif b/im-ui/src/assets/emoji/51.gif
index 69f183f..4df891d 100644
Binary files a/im-ui/src/assets/emoji/51.gif and b/im-ui/src/assets/emoji/51.gif differ
diff --git a/im-ui/src/assets/emoji/52.gif b/im-ui/src/assets/emoji/52.gif
index d41e8aa..813f4d4 100644
Binary files a/im-ui/src/assets/emoji/52.gif and b/im-ui/src/assets/emoji/52.gif differ
diff --git a/im-ui/src/assets/emoji/53.gif b/im-ui/src/assets/emoji/53.gif
index 56352dd..8140707 100644
Binary files a/im-ui/src/assets/emoji/53.gif and b/im-ui/src/assets/emoji/53.gif differ
diff --git a/im-ui/src/assets/emoji/54.gif b/im-ui/src/assets/emoji/54.gif
index b28d848..848b67b 100644
Binary files a/im-ui/src/assets/emoji/54.gif and b/im-ui/src/assets/emoji/54.gif differ
diff --git a/im-ui/src/assets/emoji/55.gif b/im-ui/src/assets/emoji/55.gif
index e18da84..ed8ddc8 100644
Binary files a/im-ui/src/assets/emoji/55.gif and b/im-ui/src/assets/emoji/55.gif differ
diff --git a/im-ui/src/assets/emoji/56.gif b/im-ui/src/assets/emoji/56.gif
index edf96f0..dfb3324 100644
Binary files a/im-ui/src/assets/emoji/56.gif and b/im-ui/src/assets/emoji/56.gif differ
diff --git a/im-ui/src/assets/emoji/57.gif b/im-ui/src/assets/emoji/57.gif
deleted file mode 100644
index 3f0e2b9..0000000
Binary files a/im-ui/src/assets/emoji/57.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/58.gif b/im-ui/src/assets/emoji/58.gif
deleted file mode 100644
index 47b1aaa..0000000
Binary files a/im-ui/src/assets/emoji/58.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/59.gif b/im-ui/src/assets/emoji/59.gif
deleted file mode 100644
index 918288b..0000000
Binary files a/im-ui/src/assets/emoji/59.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/6.gif b/im-ui/src/assets/emoji/6.gif
index ceab122..82b354c 100644
Binary files a/im-ui/src/assets/emoji/6.gif and b/im-ui/src/assets/emoji/6.gif differ
diff --git a/im-ui/src/assets/emoji/60.gif b/im-ui/src/assets/emoji/60.gif
deleted file mode 100644
index 66d2113..0000000
Binary files a/im-ui/src/assets/emoji/60.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/61.gif b/im-ui/src/assets/emoji/61.gif
deleted file mode 100644
index 034933e..0000000
Binary files a/im-ui/src/assets/emoji/61.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/62.gif b/im-ui/src/assets/emoji/62.gif
deleted file mode 100644
index 8d5c4fd..0000000
Binary files a/im-ui/src/assets/emoji/62.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/63.gif b/im-ui/src/assets/emoji/63.gif
deleted file mode 100644
index d58fcf6..0000000
Binary files a/im-ui/src/assets/emoji/63.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/64.gif b/im-ui/src/assets/emoji/64.gif
deleted file mode 100644
index c4e00bd..0000000
Binary files a/im-ui/src/assets/emoji/64.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/65.gif b/im-ui/src/assets/emoji/65.gif
deleted file mode 100644
index da23bfa..0000000
Binary files a/im-ui/src/assets/emoji/65.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/66.gif b/im-ui/src/assets/emoji/66.gif
deleted file mode 100644
index 310ec65..0000000
Binary files a/im-ui/src/assets/emoji/66.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/67.gif b/im-ui/src/assets/emoji/67.gif
deleted file mode 100644
index 51761ba..0000000
Binary files a/im-ui/src/assets/emoji/67.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/68.gif b/im-ui/src/assets/emoji/68.gif
deleted file mode 100644
index 345cb43..0000000
Binary files a/im-ui/src/assets/emoji/68.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/69.gif b/im-ui/src/assets/emoji/69.gif
deleted file mode 100644
index e0f28a0..0000000
Binary files a/im-ui/src/assets/emoji/69.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/7.gif b/im-ui/src/assets/emoji/7.gif
index 2f45399..0b6ec27 100644
Binary files a/im-ui/src/assets/emoji/7.gif and b/im-ui/src/assets/emoji/7.gif differ
diff --git a/im-ui/src/assets/emoji/70.gif b/im-ui/src/assets/emoji/70.gif
deleted file mode 100644
index 24284cf..0000000
Binary files a/im-ui/src/assets/emoji/70.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/71.gif b/im-ui/src/assets/emoji/71.gif
deleted file mode 100644
index a0ccf2e..0000000
Binary files a/im-ui/src/assets/emoji/71.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/72.gif b/im-ui/src/assets/emoji/72.gif
deleted file mode 100644
index 7e113ee..0000000
Binary files a/im-ui/src/assets/emoji/72.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/73.gif b/im-ui/src/assets/emoji/73.gif
deleted file mode 100644
index c0293c3..0000000
Binary files a/im-ui/src/assets/emoji/73.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/74.gif b/im-ui/src/assets/emoji/74.gif
deleted file mode 100644
index 1c52bde..0000000
Binary files a/im-ui/src/assets/emoji/74.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/75.gif b/im-ui/src/assets/emoji/75.gif
deleted file mode 100644
index 9cb9aa7..0000000
Binary files a/im-ui/src/assets/emoji/75.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/76.gif b/im-ui/src/assets/emoji/76.gif
deleted file mode 100644
index 27019f8..0000000
Binary files a/im-ui/src/assets/emoji/76.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/77.gif b/im-ui/src/assets/emoji/77.gif
deleted file mode 100644
index 8f882f5..0000000
Binary files a/im-ui/src/assets/emoji/77.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/78.gif b/im-ui/src/assets/emoji/78.gif
deleted file mode 100644
index d0d0856..0000000
Binary files a/im-ui/src/assets/emoji/78.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/79.gif b/im-ui/src/assets/emoji/79.gif
deleted file mode 100644
index 61652a7..0000000
Binary files a/im-ui/src/assets/emoji/79.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/8.gif b/im-ui/src/assets/emoji/8.gif
index f6c8834..bf7bc14 100644
Binary files a/im-ui/src/assets/emoji/8.gif and b/im-ui/src/assets/emoji/8.gif differ
diff --git a/im-ui/src/assets/emoji/80.gif b/im-ui/src/assets/emoji/80.gif
deleted file mode 100644
index 9a77936..0000000
Binary files a/im-ui/src/assets/emoji/80.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/81.gif b/im-ui/src/assets/emoji/81.gif
deleted file mode 100644
index 2329101..0000000
Binary files a/im-ui/src/assets/emoji/81.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/82.gif b/im-ui/src/assets/emoji/82.gif
deleted file mode 100644
index 644748a..0000000
Binary files a/im-ui/src/assets/emoji/82.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/83.gif b/im-ui/src/assets/emoji/83.gif
deleted file mode 100644
index fbf275b..0000000
Binary files a/im-ui/src/assets/emoji/83.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/84.gif b/im-ui/src/assets/emoji/84.gif
deleted file mode 100644
index 076f0c6..0000000
Binary files a/im-ui/src/assets/emoji/84.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/85.gif b/im-ui/src/assets/emoji/85.gif
deleted file mode 100644
index d254af4..0000000
Binary files a/im-ui/src/assets/emoji/85.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/86.gif b/im-ui/src/assets/emoji/86.gif
deleted file mode 100644
index 8f09d33..0000000
Binary files a/im-ui/src/assets/emoji/86.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/87.gif b/im-ui/src/assets/emoji/87.gif
deleted file mode 100644
index df70756..0000000
Binary files a/im-ui/src/assets/emoji/87.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/88.gif b/im-ui/src/assets/emoji/88.gif
deleted file mode 100644
index 4d8b15e..0000000
Binary files a/im-ui/src/assets/emoji/88.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/89.gif b/im-ui/src/assets/emoji/89.gif
deleted file mode 100644
index 05726dc..0000000
Binary files a/im-ui/src/assets/emoji/89.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/9.gif b/im-ui/src/assets/emoji/9.gif
index c2d8450..6ea3f8c 100644
Binary files a/im-ui/src/assets/emoji/9.gif and b/im-ui/src/assets/emoji/9.gif differ
diff --git a/im-ui/src/assets/emoji/90.gif b/im-ui/src/assets/emoji/90.gif
deleted file mode 100644
index adaf20e..0000000
Binary files a/im-ui/src/assets/emoji/90.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/91.gif b/im-ui/src/assets/emoji/91.gif
deleted file mode 100644
index 608d0ad..0000000
Binary files a/im-ui/src/assets/emoji/91.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/92.gif b/im-ui/src/assets/emoji/92.gif
deleted file mode 100644
index b909e16..0000000
Binary files a/im-ui/src/assets/emoji/92.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/93.gif b/im-ui/src/assets/emoji/93.gif
deleted file mode 100644
index 7f71a8c..0000000
Binary files a/im-ui/src/assets/emoji/93.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/94.gif b/im-ui/src/assets/emoji/94.gif
deleted file mode 100644
index 4f26d7d..0000000
Binary files a/im-ui/src/assets/emoji/94.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/95.gif b/im-ui/src/assets/emoji/95.gif
deleted file mode 100644
index 5ef6d38..0000000
Binary files a/im-ui/src/assets/emoji/95.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/96.gif b/im-ui/src/assets/emoji/96.gif
deleted file mode 100644
index 2b709e1..0000000
Binary files a/im-ui/src/assets/emoji/96.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/97.gif b/im-ui/src/assets/emoji/97.gif
deleted file mode 100644
index cf29be8..0000000
Binary files a/im-ui/src/assets/emoji/97.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/98.gif b/im-ui/src/assets/emoji/98.gif
deleted file mode 100644
index c70e7d3..0000000
Binary files a/im-ui/src/assets/emoji/98.gif and /dev/null differ
diff --git a/im-ui/src/assets/emoji/99.gif b/im-ui/src/assets/emoji/99.gif
deleted file mode 100644
index 05c1863..0000000
Binary files a/im-ui/src/assets/emoji/99.gif and /dev/null differ
diff --git a/im-ui/src/components/chat/ChatItem.vue b/im-ui/src/components/chat/ChatItem.vue
index b5726b8..12dffd0 100644
--- a/im-ui/src/components/chat/ChatItem.vue
+++ b/im-ui/src/components/chat/ChatItem.vue
@@ -52,7 +52,7 @@
}
-
diff --git a/im-uniapp/package.json b/im-uniapp/package.json
index 91b9952..da18df0 100644
--- a/im-uniapp/package.json
+++ b/im-uniapp/package.json
@@ -6,16 +6,16 @@
"browser":"chrome",
"env": {
"UNI_PLATFORM": "h5",
- "BASE_URL": "http://127.0.0.1:8888",
- "WS_URL": "ws://127.0.0.1:8878/im"
+ "BASE_URL": "http://192.168.1.5:8888",
+ "WS_URL": "ws://192.168.1.5:8878/im"
}
},
"dev-wx-mini": {
"title": "开发环境-微信小程序",
"env": {
"UNI_PLATFORM": "mp-weixin",
- "BASE_URL": "http://127.0.0.1:8888",
- "WS_URL": "ws://127.0.0.1:8878/im"
+ "BASE_URL": "http://192.168.1.5:8888",
+ "WS_URL": "ws://192.168.1.5:8878/im"
}
},
"prod-h5": {
diff --git a/im-uniapp/pages.json b/im-uniapp/pages.json
index 56107bd..f89243b 100644
--- a/im-uniapp/pages.json
+++ b/im-uniapp/pages.json
@@ -1,32 +1,14 @@
{
"pages": [{
- "path": "pages/login/login",
- "style": {
- "navigationBarTitleText": "盒子IM"
- }
+ "path": "pages/login/login"
}, {
- "path": "pages/chat/chat",
- "style": {
- "navigationBarTitleText": "聊天消息"
- }
+ "path": "pages/chat/chat"
}, {
- "path": "pages/friend/friend",
- "style": {
- "navigationBarTitleText": "好友列表",
- "enablePullDownRefresh": false
- }
+ "path": "pages/friend/friend"
}, {
- "path": "pages/group/group",
- "style": {
- "enablePullDownRefresh": false
- }
-
+ "path": "pages/group/group"
}, {
- "path": "pages/mine/mine",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
+ "path": "pages/mine/mine"
}, {
"path": "pages/friend/friend-search"
}, {
@@ -49,6 +31,7 @@
"path": "pages/mine/mine-password"
}],
"globalStyle": {
+ "navigationBarTitleText": "盒子IM",
"navigationBarTextStyle": "black",
"navigationBarBackgroundColor": "#F0F0F0",
"backgroundColor": "#fdfdfd"
diff --git a/im-uniapp/pages/chat/chat-box.vue b/im-uniapp/pages/chat/chat-box.vue
index a17c516..0f8a547 100644
--- a/im-uniapp/pages/chat/chat-box.vue
+++ b/im-uniapp/pages/chat/chat-box.vue
@@ -66,7 +66,7 @@
-
@@ -576,11 +576,11 @@
flex-wrap: wrap;
.emotion-item {
- width: 60rpx;
- height: 60rpx;
+ width: 40px;
+ height: 40px;
text-align: center;
cursor: pointer;
- padding: 15rpx;
+ padding: 6px;
}
}
}
diff --git a/im-uniapp/static/emoji/0.gif b/im-uniapp/static/emoji/0.gif
index 5be27cb..e7848ec 100644
Binary files a/im-uniapp/static/emoji/0.gif and b/im-uniapp/static/emoji/0.gif differ
diff --git a/im-uniapp/static/emoji/1.gif b/im-uniapp/static/emoji/1.gif
index a2644a9..cb5b26b 100644
Binary files a/im-uniapp/static/emoji/1.gif and b/im-uniapp/static/emoji/1.gif differ
diff --git a/im-uniapp/static/emoji/10.gif b/im-uniapp/static/emoji/10.gif
index 905c15b..53a6c67 100644
Binary files a/im-uniapp/static/emoji/10.gif and b/im-uniapp/static/emoji/10.gif differ
diff --git a/im-uniapp/static/emoji/100.gif b/im-uniapp/static/emoji/100.gif
deleted file mode 100644
index 92ad35d..0000000
Binary files a/im-uniapp/static/emoji/100.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/101.gif b/im-uniapp/static/emoji/101.gif
deleted file mode 100644
index 1f27663..0000000
Binary files a/im-uniapp/static/emoji/101.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/102.gif b/im-uniapp/static/emoji/102.gif
deleted file mode 100644
index 748ded1..0000000
Binary files a/im-uniapp/static/emoji/102.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/103.gif b/im-uniapp/static/emoji/103.gif
deleted file mode 100644
index be9eaa0..0000000
Binary files a/im-uniapp/static/emoji/103.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/104.gif b/im-uniapp/static/emoji/104.gif
deleted file mode 100644
index d7c2066..0000000
Binary files a/im-uniapp/static/emoji/104.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/11.gif b/im-uniapp/static/emoji/11.gif
index b512dd5..d718e6d 100644
Binary files a/im-uniapp/static/emoji/11.gif and b/im-uniapp/static/emoji/11.gif differ
diff --git a/im-uniapp/static/emoji/12.gif b/im-uniapp/static/emoji/12.gif
index 547529c..2362b45 100644
Binary files a/im-uniapp/static/emoji/12.gif and b/im-uniapp/static/emoji/12.gif differ
diff --git a/im-uniapp/static/emoji/13.gif b/im-uniapp/static/emoji/13.gif
index 3475300..4d8dc78 100644
Binary files a/im-uniapp/static/emoji/13.gif and b/im-uniapp/static/emoji/13.gif differ
diff --git a/im-uniapp/static/emoji/14.gif b/im-uniapp/static/emoji/14.gif
index 6a788f8..131c3d9 100644
Binary files a/im-uniapp/static/emoji/14.gif and b/im-uniapp/static/emoji/14.gif differ
diff --git a/im-uniapp/static/emoji/15.gif b/im-uniapp/static/emoji/15.gif
index debab8e..25c57ae 100644
Binary files a/im-uniapp/static/emoji/15.gif and b/im-uniapp/static/emoji/15.gif differ
diff --git a/im-uniapp/static/emoji/16.gif b/im-uniapp/static/emoji/16.gif
index ed5d29f..2711656 100644
Binary files a/im-uniapp/static/emoji/16.gif and b/im-uniapp/static/emoji/16.gif differ
diff --git a/im-uniapp/static/emoji/17.gif b/im-uniapp/static/emoji/17.gif
index 85886fe..4419ba2 100644
Binary files a/im-uniapp/static/emoji/17.gif and b/im-uniapp/static/emoji/17.gif differ
diff --git a/im-uniapp/static/emoji/18.gif b/im-uniapp/static/emoji/18.gif
index b6af218..478a421 100644
Binary files a/im-uniapp/static/emoji/18.gif and b/im-uniapp/static/emoji/18.gif differ
diff --git a/im-uniapp/static/emoji/19.gif b/im-uniapp/static/emoji/19.gif
index e045ff2..59261ea 100644
Binary files a/im-uniapp/static/emoji/19.gif and b/im-uniapp/static/emoji/19.gif differ
diff --git a/im-uniapp/static/emoji/2.gif b/im-uniapp/static/emoji/2.gif
index 40cfda4..b01cbcf 100644
Binary files a/im-uniapp/static/emoji/2.gif and b/im-uniapp/static/emoji/2.gif differ
diff --git a/im-uniapp/static/emoji/20.gif b/im-uniapp/static/emoji/20.gif
index efd650f..45becb4 100644
Binary files a/im-uniapp/static/emoji/20.gif and b/im-uniapp/static/emoji/20.gif differ
diff --git a/im-uniapp/static/emoji/21.gif b/im-uniapp/static/emoji/21.gif
index cb8cf6d..d3f1afe 100644
Binary files a/im-uniapp/static/emoji/21.gif and b/im-uniapp/static/emoji/21.gif differ
diff --git a/im-uniapp/static/emoji/22.gif b/im-uniapp/static/emoji/22.gif
index 96b04df..ee220d1 100644
Binary files a/im-uniapp/static/emoji/22.gif and b/im-uniapp/static/emoji/22.gif differ
diff --git a/im-uniapp/static/emoji/23.gif b/im-uniapp/static/emoji/23.gif
index 96516b8..5dbd9f3 100644
Binary files a/im-uniapp/static/emoji/23.gif and b/im-uniapp/static/emoji/23.gif differ
diff --git a/im-uniapp/static/emoji/24.gif b/im-uniapp/static/emoji/24.gif
index 5f925c7..d3ae946 100644
Binary files a/im-uniapp/static/emoji/24.gif and b/im-uniapp/static/emoji/24.gif differ
diff --git a/im-uniapp/static/emoji/25.gif b/im-uniapp/static/emoji/25.gif
index 97f8b1a..5cf2a9e 100644
Binary files a/im-uniapp/static/emoji/25.gif and b/im-uniapp/static/emoji/25.gif differ
diff --git a/im-uniapp/static/emoji/26.gif b/im-uniapp/static/emoji/26.gif
index a7cded7..793b2ac 100644
Binary files a/im-uniapp/static/emoji/26.gif and b/im-uniapp/static/emoji/26.gif differ
diff --git a/im-uniapp/static/emoji/27.gif b/im-uniapp/static/emoji/27.gif
index bb46890..b78a02b 100644
Binary files a/im-uniapp/static/emoji/27.gif and b/im-uniapp/static/emoji/27.gif differ
diff --git a/im-uniapp/static/emoji/28.gif b/im-uniapp/static/emoji/28.gif
index f59dd58..4074630 100644
Binary files a/im-uniapp/static/emoji/28.gif and b/im-uniapp/static/emoji/28.gif differ
diff --git a/im-uniapp/static/emoji/29.gif b/im-uniapp/static/emoji/29.gif
index 3c5227e..166f252 100644
Binary files a/im-uniapp/static/emoji/29.gif and b/im-uniapp/static/emoji/29.gif differ
diff --git a/im-uniapp/static/emoji/3.gif b/im-uniapp/static/emoji/3.gif
index 6d6f762..3b15c53 100644
Binary files a/im-uniapp/static/emoji/3.gif and b/im-uniapp/static/emoji/3.gif differ
diff --git a/im-uniapp/static/emoji/30.gif b/im-uniapp/static/emoji/30.gif
index e24a180..13499b9 100644
Binary files a/im-uniapp/static/emoji/30.gif and b/im-uniapp/static/emoji/30.gif differ
diff --git a/im-uniapp/static/emoji/31.gif b/im-uniapp/static/emoji/31.gif
index 073e743..b4ec1d8 100644
Binary files a/im-uniapp/static/emoji/31.gif and b/im-uniapp/static/emoji/31.gif differ
diff --git a/im-uniapp/static/emoji/32.gif b/im-uniapp/static/emoji/32.gif
index 772eff2..ca86399 100644
Binary files a/im-uniapp/static/emoji/32.gif and b/im-uniapp/static/emoji/32.gif differ
diff --git a/im-uniapp/static/emoji/33.gif b/im-uniapp/static/emoji/33.gif
index 217c1c5..8ec811a 100644
Binary files a/im-uniapp/static/emoji/33.gif and b/im-uniapp/static/emoji/33.gif differ
diff --git a/im-uniapp/static/emoji/34.gif b/im-uniapp/static/emoji/34.gif
index e9d4213..2a3c006 100644
Binary files a/im-uniapp/static/emoji/34.gif and b/im-uniapp/static/emoji/34.gif differ
diff --git a/im-uniapp/static/emoji/35.gif b/im-uniapp/static/emoji/35.gif
index d6da2c3..7fc7f94 100644
Binary files a/im-uniapp/static/emoji/35.gif and b/im-uniapp/static/emoji/35.gif differ
diff --git a/im-uniapp/static/emoji/36.gif b/im-uniapp/static/emoji/36.gif
index c1e6ac9..f0d46d0 100644
Binary files a/im-uniapp/static/emoji/36.gif and b/im-uniapp/static/emoji/36.gif differ
diff --git a/im-uniapp/static/emoji/37.gif b/im-uniapp/static/emoji/37.gif
index 92efec6..2c9c084 100644
Binary files a/im-uniapp/static/emoji/37.gif and b/im-uniapp/static/emoji/37.gif differ
diff --git a/im-uniapp/static/emoji/38.gif b/im-uniapp/static/emoji/38.gif
index 489f0f9..b6b4e09 100644
Binary files a/im-uniapp/static/emoji/38.gif and b/im-uniapp/static/emoji/38.gif differ
diff --git a/im-uniapp/static/emoji/39.gif b/im-uniapp/static/emoji/39.gif
index 734f6d8..cfb75c6 100644
Binary files a/im-uniapp/static/emoji/39.gif and b/im-uniapp/static/emoji/39.gif differ
diff --git a/im-uniapp/static/emoji/4.gif b/im-uniapp/static/emoji/4.gif
index 6ccdaa2..fd60e4e 100644
Binary files a/im-uniapp/static/emoji/4.gif and b/im-uniapp/static/emoji/4.gif differ
diff --git a/im-uniapp/static/emoji/40.gif b/im-uniapp/static/emoji/40.gif
index 24a8eb6..c5d7a8b 100644
Binary files a/im-uniapp/static/emoji/40.gif and b/im-uniapp/static/emoji/40.gif differ
diff --git a/im-uniapp/static/emoji/41.gif b/im-uniapp/static/emoji/41.gif
index 99139e1..cf1c0a1 100644
Binary files a/im-uniapp/static/emoji/41.gif and b/im-uniapp/static/emoji/41.gif differ
diff --git a/im-uniapp/static/emoji/42.gif b/im-uniapp/static/emoji/42.gif
index f60897e..cc87f9e 100644
Binary files a/im-uniapp/static/emoji/42.gif and b/im-uniapp/static/emoji/42.gif differ
diff --git a/im-uniapp/static/emoji/43.gif b/im-uniapp/static/emoji/43.gif
index 4350491..46153bc 100644
Binary files a/im-uniapp/static/emoji/43.gif and b/im-uniapp/static/emoji/43.gif differ
diff --git a/im-uniapp/static/emoji/44.gif b/im-uniapp/static/emoji/44.gif
index 650d3dd..dd45118 100644
Binary files a/im-uniapp/static/emoji/44.gif and b/im-uniapp/static/emoji/44.gif differ
diff --git a/im-uniapp/static/emoji/45.gif b/im-uniapp/static/emoji/45.gif
index 5c8e071..a3e86d6 100644
Binary files a/im-uniapp/static/emoji/45.gif and b/im-uniapp/static/emoji/45.gif differ
diff --git a/im-uniapp/static/emoji/46.gif b/im-uniapp/static/emoji/46.gif
index f3cb074..b3fb681 100644
Binary files a/im-uniapp/static/emoji/46.gif and b/im-uniapp/static/emoji/46.gif differ
diff --git a/im-uniapp/static/emoji/47.gif b/im-uniapp/static/emoji/47.gif
index 5b3057a..d24bdbb 100644
Binary files a/im-uniapp/static/emoji/47.gif and b/im-uniapp/static/emoji/47.gif differ
diff --git a/im-uniapp/static/emoji/48.gif b/im-uniapp/static/emoji/48.gif
index 27a30c1..ab98b2b 100644
Binary files a/im-uniapp/static/emoji/48.gif and b/im-uniapp/static/emoji/48.gif differ
diff --git a/im-uniapp/static/emoji/49.gif b/im-uniapp/static/emoji/49.gif
index dcfa48a..19a7e72 100644
Binary files a/im-uniapp/static/emoji/49.gif and b/im-uniapp/static/emoji/49.gif differ
diff --git a/im-uniapp/static/emoji/5.gif b/im-uniapp/static/emoji/5.gif
index ab0b81b..85cd373 100644
Binary files a/im-uniapp/static/emoji/5.gif and b/im-uniapp/static/emoji/5.gif differ
diff --git a/im-uniapp/static/emoji/50.gif b/im-uniapp/static/emoji/50.gif
index 029cf0f..51e4093 100644
Binary files a/im-uniapp/static/emoji/50.gif and b/im-uniapp/static/emoji/50.gif differ
diff --git a/im-uniapp/static/emoji/51.gif b/im-uniapp/static/emoji/51.gif
index 69f183f..9bf82a8 100644
Binary files a/im-uniapp/static/emoji/51.gif and b/im-uniapp/static/emoji/51.gif differ
diff --git a/im-uniapp/static/emoji/52.gif b/im-uniapp/static/emoji/52.gif
index d41e8aa..18391ea 100644
Binary files a/im-uniapp/static/emoji/52.gif and b/im-uniapp/static/emoji/52.gif differ
diff --git a/im-uniapp/static/emoji/53.gif b/im-uniapp/static/emoji/53.gif
index 56352dd..0f584b5 100644
Binary files a/im-uniapp/static/emoji/53.gif and b/im-uniapp/static/emoji/53.gif differ
diff --git a/im-uniapp/static/emoji/54.gif b/im-uniapp/static/emoji/54.gif
index b28d848..5ab6d25 100644
Binary files a/im-uniapp/static/emoji/54.gif and b/im-uniapp/static/emoji/54.gif differ
diff --git a/im-uniapp/static/emoji/55.gif b/im-uniapp/static/emoji/55.gif
index e18da84..3d75ad7 100644
Binary files a/im-uniapp/static/emoji/55.gif and b/im-uniapp/static/emoji/55.gif differ
diff --git a/im-uniapp/static/emoji/56.gif b/im-uniapp/static/emoji/56.gif
index edf96f0..2525970 100644
Binary files a/im-uniapp/static/emoji/56.gif and b/im-uniapp/static/emoji/56.gif differ
diff --git a/im-uniapp/static/emoji/57.gif b/im-uniapp/static/emoji/57.gif
deleted file mode 100644
index 3f0e2b9..0000000
Binary files a/im-uniapp/static/emoji/57.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/58.gif b/im-uniapp/static/emoji/58.gif
deleted file mode 100644
index 47b1aaa..0000000
Binary files a/im-uniapp/static/emoji/58.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/59.gif b/im-uniapp/static/emoji/59.gif
deleted file mode 100644
index 918288b..0000000
Binary files a/im-uniapp/static/emoji/59.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/6.gif b/im-uniapp/static/emoji/6.gif
index ceab122..a49c862 100644
Binary files a/im-uniapp/static/emoji/6.gif and b/im-uniapp/static/emoji/6.gif differ
diff --git a/im-uniapp/static/emoji/60.gif b/im-uniapp/static/emoji/60.gif
deleted file mode 100644
index 66d2113..0000000
Binary files a/im-uniapp/static/emoji/60.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/61.gif b/im-uniapp/static/emoji/61.gif
deleted file mode 100644
index 034933e..0000000
Binary files a/im-uniapp/static/emoji/61.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/62.gif b/im-uniapp/static/emoji/62.gif
deleted file mode 100644
index 8d5c4fd..0000000
Binary files a/im-uniapp/static/emoji/62.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/63.gif b/im-uniapp/static/emoji/63.gif
deleted file mode 100644
index d58fcf6..0000000
Binary files a/im-uniapp/static/emoji/63.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/64.gif b/im-uniapp/static/emoji/64.gif
deleted file mode 100644
index c4e00bd..0000000
Binary files a/im-uniapp/static/emoji/64.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/65.gif b/im-uniapp/static/emoji/65.gif
deleted file mode 100644
index da23bfa..0000000
Binary files a/im-uniapp/static/emoji/65.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/66.gif b/im-uniapp/static/emoji/66.gif
deleted file mode 100644
index 310ec65..0000000
Binary files a/im-uniapp/static/emoji/66.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/67.gif b/im-uniapp/static/emoji/67.gif
deleted file mode 100644
index 51761ba..0000000
Binary files a/im-uniapp/static/emoji/67.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/68.gif b/im-uniapp/static/emoji/68.gif
deleted file mode 100644
index 345cb43..0000000
Binary files a/im-uniapp/static/emoji/68.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/69.gif b/im-uniapp/static/emoji/69.gif
deleted file mode 100644
index e0f28a0..0000000
Binary files a/im-uniapp/static/emoji/69.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/7.gif b/im-uniapp/static/emoji/7.gif
index 2f45399..3a847b8 100644
Binary files a/im-uniapp/static/emoji/7.gif and b/im-uniapp/static/emoji/7.gif differ
diff --git a/im-uniapp/static/emoji/70.gif b/im-uniapp/static/emoji/70.gif
deleted file mode 100644
index 24284cf..0000000
Binary files a/im-uniapp/static/emoji/70.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/71.gif b/im-uniapp/static/emoji/71.gif
deleted file mode 100644
index a0ccf2e..0000000
Binary files a/im-uniapp/static/emoji/71.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/72.gif b/im-uniapp/static/emoji/72.gif
deleted file mode 100644
index 7e113ee..0000000
Binary files a/im-uniapp/static/emoji/72.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/73.gif b/im-uniapp/static/emoji/73.gif
deleted file mode 100644
index c0293c3..0000000
Binary files a/im-uniapp/static/emoji/73.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/74.gif b/im-uniapp/static/emoji/74.gif
deleted file mode 100644
index 1c52bde..0000000
Binary files a/im-uniapp/static/emoji/74.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/75.gif b/im-uniapp/static/emoji/75.gif
deleted file mode 100644
index 9cb9aa7..0000000
Binary files a/im-uniapp/static/emoji/75.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/76.gif b/im-uniapp/static/emoji/76.gif
deleted file mode 100644
index 27019f8..0000000
Binary files a/im-uniapp/static/emoji/76.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/77.gif b/im-uniapp/static/emoji/77.gif
deleted file mode 100644
index 8f882f5..0000000
Binary files a/im-uniapp/static/emoji/77.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/78.gif b/im-uniapp/static/emoji/78.gif
deleted file mode 100644
index d0d0856..0000000
Binary files a/im-uniapp/static/emoji/78.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/79.gif b/im-uniapp/static/emoji/79.gif
deleted file mode 100644
index 61652a7..0000000
Binary files a/im-uniapp/static/emoji/79.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/8.gif b/im-uniapp/static/emoji/8.gif
index f6c8834..eb6db6a 100644
Binary files a/im-uniapp/static/emoji/8.gif and b/im-uniapp/static/emoji/8.gif differ
diff --git a/im-uniapp/static/emoji/80.gif b/im-uniapp/static/emoji/80.gif
deleted file mode 100644
index 9a77936..0000000
Binary files a/im-uniapp/static/emoji/80.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/81.gif b/im-uniapp/static/emoji/81.gif
deleted file mode 100644
index 2329101..0000000
Binary files a/im-uniapp/static/emoji/81.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/82.gif b/im-uniapp/static/emoji/82.gif
deleted file mode 100644
index 644748a..0000000
Binary files a/im-uniapp/static/emoji/82.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/83.gif b/im-uniapp/static/emoji/83.gif
deleted file mode 100644
index fbf275b..0000000
Binary files a/im-uniapp/static/emoji/83.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/84.gif b/im-uniapp/static/emoji/84.gif
deleted file mode 100644
index 076f0c6..0000000
Binary files a/im-uniapp/static/emoji/84.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/85.gif b/im-uniapp/static/emoji/85.gif
deleted file mode 100644
index d254af4..0000000
Binary files a/im-uniapp/static/emoji/85.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/86.gif b/im-uniapp/static/emoji/86.gif
deleted file mode 100644
index 8f09d33..0000000
Binary files a/im-uniapp/static/emoji/86.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/87.gif b/im-uniapp/static/emoji/87.gif
deleted file mode 100644
index df70756..0000000
Binary files a/im-uniapp/static/emoji/87.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/88.gif b/im-uniapp/static/emoji/88.gif
deleted file mode 100644
index 4d8b15e..0000000
Binary files a/im-uniapp/static/emoji/88.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/89.gif b/im-uniapp/static/emoji/89.gif
deleted file mode 100644
index 05726dc..0000000
Binary files a/im-uniapp/static/emoji/89.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/9.gif b/im-uniapp/static/emoji/9.gif
index c2d8450..52562dc 100644
Binary files a/im-uniapp/static/emoji/9.gif and b/im-uniapp/static/emoji/9.gif differ
diff --git a/im-uniapp/static/emoji/90.gif b/im-uniapp/static/emoji/90.gif
deleted file mode 100644
index adaf20e..0000000
Binary files a/im-uniapp/static/emoji/90.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/91.gif b/im-uniapp/static/emoji/91.gif
deleted file mode 100644
index 608d0ad..0000000
Binary files a/im-uniapp/static/emoji/91.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/92.gif b/im-uniapp/static/emoji/92.gif
deleted file mode 100644
index b909e16..0000000
Binary files a/im-uniapp/static/emoji/92.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/93.gif b/im-uniapp/static/emoji/93.gif
deleted file mode 100644
index 7f71a8c..0000000
Binary files a/im-uniapp/static/emoji/93.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/94.gif b/im-uniapp/static/emoji/94.gif
deleted file mode 100644
index 4f26d7d..0000000
Binary files a/im-uniapp/static/emoji/94.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/95.gif b/im-uniapp/static/emoji/95.gif
deleted file mode 100644
index 5ef6d38..0000000
Binary files a/im-uniapp/static/emoji/95.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/96.gif b/im-uniapp/static/emoji/96.gif
deleted file mode 100644
index 2b709e1..0000000
Binary files a/im-uniapp/static/emoji/96.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/97.gif b/im-uniapp/static/emoji/97.gif
deleted file mode 100644
index cf29be8..0000000
Binary files a/im-uniapp/static/emoji/97.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/98.gif b/im-uniapp/static/emoji/98.gif
deleted file mode 100644
index c70e7d3..0000000
Binary files a/im-uniapp/static/emoji/98.gif and /dev/null differ
diff --git a/im-uniapp/static/emoji/99.gif b/im-uniapp/static/emoji/99.gif
deleted file mode 100644
index 05c1863..0000000
Binary files a/im-uniapp/static/emoji/99.gif and /dev/null differ
diff --git a/im-uniapp/store/chatStore.js b/im-uniapp/store/chatStore.js
index 51cb98d..9e15ced 100644
--- a/im-uniapp/store/chatStore.js
+++ b/im-uniapp/store/chatStore.js
@@ -189,6 +189,9 @@ export default {
key:"chats-"+userId,
data: state.chats
})
+ },
+ clear(state){
+ state.chats = [];
}
},
actions:{
@@ -208,8 +211,7 @@ export default {
}
});
})
-
-
}
+
}
}
diff --git a/im-uniapp/store/friendStore.js b/im-uniapp/store/friendStore.js
index d97a7d3..8be6135 100644
--- a/im-uniapp/store/friendStore.js
+++ b/im-uniapp/store/friendStore.js
@@ -3,7 +3,8 @@ import http from '../common/request';
export default {
state: {
- friends: []
+ friends: [],
+ timer: null
},
mutations: {
setFriends(state, friends) {
@@ -45,6 +46,30 @@ export default {
}
return 0;
});
+ },
+ refreshOnlineStatus(state) {
+ if (state.friends.length > 0 ) {
+ let userIds = [];
+ state.friends.forEach((f) => {
+ userIds.push(f.id)
+ });
+ http({
+ url: '/user/online?userIds='+ userIds.join(','),
+ method: 'GET'
+ }).then((onlineIds) => {
+ this.commit("setOnlineStatus", onlineIds);
+ })
+ }
+ // 30s后重新拉取
+ clearTimeout(state.timer);
+ state.timer = setTimeout(() => {
+ this.commit("refreshOnlineStatus");
+ }, 30000)
+ },
+ clear(state){
+ clearTimeout(state.timer);
+ state.friends = [];
+ state.timer = null;
}
},
actions: {
@@ -55,31 +80,12 @@ export default {
method: 'GET'
}).then((friends) => {
context.commit("setFriends", friends);
- context.dispatch("refreshOnlineStatus");
+ context.commit("refreshOnlineStatus");
resolve()
}).catch((res) => {
reject();
})
});
- },
- refreshOnlineStatus(context) {
- if (context.state.friends.length > 0 ) {
- let userIds = [];
- context.state.friends.forEach((f) => {
- userIds.push(f.id)
- });
- http({
- url: '/user/online?userIds='+ userIds.join(','),
- method: 'GET'
- }).then((onlineIds) => {
- context.commit("setOnlineStatus", onlineIds);
- })
- }
- // 30s后重新拉取
- clearTimeout(context.timer);
- context.timer = setTimeout(() => {
- context.dispatch("refreshOnlineStatus");
- }, 30000)
- },
+ }
}
}
\ No newline at end of file
diff --git a/im-uniapp/store/groupStore.js b/im-uniapp/store/groupStore.js
index 1920270..635eb3a 100644
--- a/im-uniapp/store/groupStore.js
+++ b/im-uniapp/store/groupStore.js
@@ -33,6 +33,10 @@ export default {
Object.assign(state.groups[idx], group);
}
})
+ },
+ clear(state){
+ state.groups = [];
+ state.activeGroup = -1;
}
},
actions: {
diff --git a/im-uniapp/store/index.js b/im-uniapp/store/index.js
index 83cf159..34db94b 100644
--- a/im-uniapp/store/index.js
+++ b/im-uniapp/store/index.js
@@ -22,7 +22,9 @@ const store = createStore({
promises.push(this.dispatch("loadChat"));
return Promise.all(promises);
})
-
+ },
+ unload(context){
+ context.commit("clear");
}
},
strict: true
diff --git a/im-uniapp/store/userStore.js b/im-uniapp/store/userStore.js
index 2626691..42056e5 100644
--- a/im-uniapp/store/userStore.js
+++ b/im-uniapp/store/userStore.js
@@ -16,6 +16,10 @@ export default {
setUserState(state, userState) {
state.state = userState;
},
+ clear(state){
+ state.userInfo = {};
+ state.state = USER_STATE.FREE;
+ }
},
actions:{
loadUser(context){