diff --git a/static/css/common.css b/static/css/common.css
index 35258e7..3aeffe1 100644
--- a/static/css/common.css
+++ b/static/css/common.css
@@ -68,5 +68,17 @@
display: none;
}
.faceBoxList{
-
+ list-style: none;
+ padding: 0;
+ margin: 0;
+}
+.faceBoxList li{
+ cursor: pointer;
+ float: left;
+ border: 1px solid #e8e8e8;
+ width: 28px;
+ overflow: hidden;
+ margin: -1px 0 0 -1px;
+ padding: 4px 2px;
+ text-align: center;
}
\ No newline at end of file
diff --git a/static/html/chat_page.html b/static/html/chat_page.html
index 618704a..8b329a9 100644
--- a/static/html/chat_page.html
+++ b/static/html/chat_page.html
@@ -113,8 +113,9 @@
-
+
+
{{.SendBtn}}
@@ -146,6 +147,7 @@
messageContent:"",
chatTitle:"正在连接...",
visitor:{},
+ face:[],
},
methods: {
//初始化websocket
@@ -370,11 +372,32 @@
},
initCss(){
+ var _this=this;
$(function () {
$(".chatBox").css("max-height",$(window).height());
if (top.location != location){
$(".chatBox").css("max-height",$(window).height()-65);
}
+ //展示表情
+ var alt = ["[微笑]", "[嘻嘻]", "[哈哈]", "[可爱]", "[可怜]", "[挖鼻]", "[吃惊]", "[害羞]", "[挤眼]", "[闭嘴]", "[鄙视]", "[爱你]", "[泪]", "[偷笑]", "[亲亲]", "[生病]", "[太开心]", "[白眼]", "[右哼哼]", "[左哼哼]", "[嘘]", "[衰]", "[委屈]", "[吐]", "[哈欠]", "[抱抱]", "[怒]", "[疑问]", "[馋嘴]", "[拜拜]", "[思考]", "[汗]", "[困]", "[睡]", "[钱]", "[失望]", "[酷]", "[色]", "[哼]", "[鼓掌]", "[晕]", "[悲伤]", "[抓狂]", "[黑线]", "[阴险]", "[怒骂]", "[互粉]", "[心]", "[伤心]", "[猪头]", "[熊猫]", "[兔子]", "[ok]", "[耶]", "[good]", "[NO]", "[赞]", "[来]", "[弱]", "[草泥马]", "[神马]", "[囧]", "[浮云]", "[给力]", "[围观]", "[威武]", "[奥特曼]", "[礼物]", "[钟]", "[话筒]", "[蜡烛]", "[蛋糕]"], arr = {};
+ $.each(alt, function (index, item) {
+ _this.face.push({"name":item,"path":index + '.gif'});
+ });
+ $(".faceBtn").click(function(){
+ var status=$('.faceBox').css("display");
+ if(status=="block"){
+ $('.faceBox').hide();
+ }else{
+ $('.faceBox').show();
+ }
+ });
+ $(".faceIcon").click(function(){
+ debugger;
+
+ var title=$(this).attr("title");
+ _this.messageContent+="face"+title;
+ $('.faceBox').hide();
+ });
});
},
//心跳
@@ -398,7 +421,10 @@
document.title = originTitle;
};
},
+ //表情点击事件
+ showFace(){
+ }
},
created: function () {
this.init();
diff --git a/static/images/face/0.gif b/static/images/face/0.gif
new file mode 100644
index 0000000..a63f0d5
Binary files /dev/null and b/static/images/face/0.gif differ
diff --git a/static/images/face/1.gif b/static/images/face/1.gif
new file mode 100644
index 0000000..b2b78b2
Binary files /dev/null and b/static/images/face/1.gif differ
diff --git a/static/images/face/10.gif b/static/images/face/10.gif
new file mode 100644
index 0000000..556c7e3
Binary files /dev/null and b/static/images/face/10.gif differ
diff --git a/static/images/face/11.gif b/static/images/face/11.gif
new file mode 100644
index 0000000..2bfc58b
Binary files /dev/null and b/static/images/face/11.gif differ
diff --git a/static/images/face/12.gif b/static/images/face/12.gif
new file mode 100644
index 0000000..1c321c7
Binary files /dev/null and b/static/images/face/12.gif differ
diff --git a/static/images/face/13.gif b/static/images/face/13.gif
new file mode 100644
index 0000000..300bbc2
Binary files /dev/null and b/static/images/face/13.gif differ
diff --git a/static/images/face/14.gif b/static/images/face/14.gif
new file mode 100644
index 0000000..43b6d0a
Binary files /dev/null and b/static/images/face/14.gif differ
diff --git a/static/images/face/15.gif b/static/images/face/15.gif
new file mode 100644
index 0000000..c9f25fa
Binary files /dev/null and b/static/images/face/15.gif differ
diff --git a/static/images/face/16.gif b/static/images/face/16.gif
new file mode 100644
index 0000000..34f28e4
Binary files /dev/null and b/static/images/face/16.gif differ
diff --git a/static/images/face/17.gif b/static/images/face/17.gif
new file mode 100644
index 0000000..39cd035
Binary files /dev/null and b/static/images/face/17.gif differ
diff --git a/static/images/face/18.gif b/static/images/face/18.gif
new file mode 100644
index 0000000..7bce299
Binary files /dev/null and b/static/images/face/18.gif differ
diff --git a/static/images/face/19.gif b/static/images/face/19.gif
new file mode 100644
index 0000000..adac542
Binary files /dev/null and b/static/images/face/19.gif differ
diff --git a/static/images/face/2.gif b/static/images/face/2.gif
new file mode 100644
index 0000000..7edbb58
Binary files /dev/null and b/static/images/face/2.gif differ
diff --git a/static/images/face/20.gif b/static/images/face/20.gif
new file mode 100644
index 0000000..50631a6
Binary files /dev/null and b/static/images/face/20.gif differ
diff --git a/static/images/face/21.gif b/static/images/face/21.gif
new file mode 100644
index 0000000..b984212
Binary files /dev/null and b/static/images/face/21.gif differ
diff --git a/static/images/face/22.gif b/static/images/face/22.gif
new file mode 100644
index 0000000..1f0bd8b
Binary files /dev/null and b/static/images/face/22.gif differ
diff --git a/static/images/face/23.gif b/static/images/face/23.gif
new file mode 100644
index 0000000..e05e0f9
Binary files /dev/null and b/static/images/face/23.gif differ
diff --git a/static/images/face/24.gif b/static/images/face/24.gif
new file mode 100644
index 0000000..f35928a
Binary files /dev/null and b/static/images/face/24.gif differ
diff --git a/static/images/face/25.gif b/static/images/face/25.gif
new file mode 100644
index 0000000..0b4a883
Binary files /dev/null and b/static/images/face/25.gif differ
diff --git a/static/images/face/26.gif b/static/images/face/26.gif
new file mode 100644
index 0000000..45c4fb5
Binary files /dev/null and b/static/images/face/26.gif differ
diff --git a/static/images/face/27.gif b/static/images/face/27.gif
new file mode 100644
index 0000000..7a4c013
Binary files /dev/null and b/static/images/face/27.gif differ
diff --git a/static/images/face/28.gif b/static/images/face/28.gif
new file mode 100644
index 0000000..fc5a0cf
Binary files /dev/null and b/static/images/face/28.gif differ
diff --git a/static/images/face/29.gif b/static/images/face/29.gif
new file mode 100644
index 0000000..5dd7442
Binary files /dev/null and b/static/images/face/29.gif differ
diff --git a/static/images/face/3.gif b/static/images/face/3.gif
new file mode 100644
index 0000000..86df67b
Binary files /dev/null and b/static/images/face/3.gif differ
diff --git a/static/images/face/30.gif b/static/images/face/30.gif
new file mode 100644
index 0000000..b751f98
Binary files /dev/null and b/static/images/face/30.gif differ
diff --git a/static/images/face/31.gif b/static/images/face/31.gif
new file mode 100644
index 0000000..c9476d7
Binary files /dev/null and b/static/images/face/31.gif differ
diff --git a/static/images/face/32.gif b/static/images/face/32.gif
new file mode 100644
index 0000000..9931b06
Binary files /dev/null and b/static/images/face/32.gif differ
diff --git a/static/images/face/33.gif b/static/images/face/33.gif
new file mode 100644
index 0000000..59111a3
Binary files /dev/null and b/static/images/face/33.gif differ
diff --git a/static/images/face/34.gif b/static/images/face/34.gif
new file mode 100644
index 0000000..a334548
Binary files /dev/null and b/static/images/face/34.gif differ
diff --git a/static/images/face/35.gif b/static/images/face/35.gif
new file mode 100644
index 0000000..a932264
Binary files /dev/null and b/static/images/face/35.gif differ
diff --git a/static/images/face/36.gif b/static/images/face/36.gif
new file mode 100644
index 0000000..6de432a
Binary files /dev/null and b/static/images/face/36.gif differ
diff --git a/static/images/face/37.gif b/static/images/face/37.gif
new file mode 100644
index 0000000..d05f2da
Binary files /dev/null and b/static/images/face/37.gif differ
diff --git a/static/images/face/38.gif b/static/images/face/38.gif
new file mode 100644
index 0000000..8b1c88a
Binary files /dev/null and b/static/images/face/38.gif differ
diff --git a/static/images/face/39.gif b/static/images/face/39.gif
new file mode 100644
index 0000000..38b84a5
Binary files /dev/null and b/static/images/face/39.gif differ
diff --git a/static/images/face/4.gif b/static/images/face/4.gif
new file mode 100644
index 0000000..d52200c
Binary files /dev/null and b/static/images/face/4.gif differ
diff --git a/static/images/face/40.gif b/static/images/face/40.gif
new file mode 100644
index 0000000..ae42991
Binary files /dev/null and b/static/images/face/40.gif differ
diff --git a/static/images/face/41.gif b/static/images/face/41.gif
new file mode 100644
index 0000000..b9c715c
Binary files /dev/null and b/static/images/face/41.gif differ
diff --git a/static/images/face/42.gif b/static/images/face/42.gif
new file mode 100644
index 0000000..0eb1434
Binary files /dev/null and b/static/images/face/42.gif differ
diff --git a/static/images/face/43.gif b/static/images/face/43.gif
new file mode 100644
index 0000000..ac0b700
Binary files /dev/null and b/static/images/face/43.gif differ
diff --git a/static/images/face/44.gif b/static/images/face/44.gif
new file mode 100644
index 0000000..ad44497
Binary files /dev/null and b/static/images/face/44.gif differ
diff --git a/static/images/face/45.gif b/static/images/face/45.gif
new file mode 100644
index 0000000..6837fca
Binary files /dev/null and b/static/images/face/45.gif differ
diff --git a/static/images/face/46.gif b/static/images/face/46.gif
new file mode 100644
index 0000000..d62916d
Binary files /dev/null and b/static/images/face/46.gif differ
diff --git a/static/images/face/47.gif b/static/images/face/47.gif
new file mode 100644
index 0000000..58a0836
Binary files /dev/null and b/static/images/face/47.gif differ
diff --git a/static/images/face/48.gif b/static/images/face/48.gif
new file mode 100644
index 0000000..7ffd161
Binary files /dev/null and b/static/images/face/48.gif differ
diff --git a/static/images/face/49.gif b/static/images/face/49.gif
new file mode 100644
index 0000000..959b992
Binary files /dev/null and b/static/images/face/49.gif differ
diff --git a/static/images/face/5.gif b/static/images/face/5.gif
new file mode 100644
index 0000000..4e8b09f
Binary files /dev/null and b/static/images/face/5.gif differ
diff --git a/static/images/face/50.gif b/static/images/face/50.gif
new file mode 100644
index 0000000..6e22e7f
Binary files /dev/null and b/static/images/face/50.gif differ
diff --git a/static/images/face/51.gif b/static/images/face/51.gif
new file mode 100644
index 0000000..ad3f4d3
Binary files /dev/null and b/static/images/face/51.gif differ
diff --git a/static/images/face/52.gif b/static/images/face/52.gif
new file mode 100644
index 0000000..39f8a22
Binary files /dev/null and b/static/images/face/52.gif differ
diff --git a/static/images/face/53.gif b/static/images/face/53.gif
new file mode 100644
index 0000000..a181ee7
Binary files /dev/null and b/static/images/face/53.gif differ
diff --git a/static/images/face/54.gif b/static/images/face/54.gif
new file mode 100644
index 0000000..e289d92
Binary files /dev/null and b/static/images/face/54.gif differ
diff --git a/static/images/face/55.gif b/static/images/face/55.gif
new file mode 100644
index 0000000..4351083
Binary files /dev/null and b/static/images/face/55.gif differ
diff --git a/static/images/face/56.gif b/static/images/face/56.gif
new file mode 100644
index 0000000..e0eff22
Binary files /dev/null and b/static/images/face/56.gif differ
diff --git a/static/images/face/57.gif b/static/images/face/57.gif
new file mode 100644
index 0000000..0bf130f
Binary files /dev/null and b/static/images/face/57.gif differ
diff --git a/static/images/face/58.gif b/static/images/face/58.gif
new file mode 100644
index 0000000..0f06508
Binary files /dev/null and b/static/images/face/58.gif differ
diff --git a/static/images/face/59.gif b/static/images/face/59.gif
new file mode 100644
index 0000000..7081e4f
Binary files /dev/null and b/static/images/face/59.gif differ
diff --git a/static/images/face/6.gif b/static/images/face/6.gif
new file mode 100644
index 0000000..f7715bf
Binary files /dev/null and b/static/images/face/6.gif differ
diff --git a/static/images/face/60.gif b/static/images/face/60.gif
new file mode 100644
index 0000000..6e15f89
Binary files /dev/null and b/static/images/face/60.gif differ
diff --git a/static/images/face/61.gif b/static/images/face/61.gif
new file mode 100644
index 0000000..f092d7e
Binary files /dev/null and b/static/images/face/61.gif differ
diff --git a/static/images/face/62.gif b/static/images/face/62.gif
new file mode 100644
index 0000000..7fe4984
Binary files /dev/null and b/static/images/face/62.gif differ
diff --git a/static/images/face/63.gif b/static/images/face/63.gif
new file mode 100644
index 0000000..cf8e23e
Binary files /dev/null and b/static/images/face/63.gif differ
diff --git a/static/images/face/64.gif b/static/images/face/64.gif
new file mode 100644
index 0000000..a779719
Binary files /dev/null and b/static/images/face/64.gif differ
diff --git a/static/images/face/65.gif b/static/images/face/65.gif
new file mode 100644
index 0000000..7bb98f2
Binary files /dev/null and b/static/images/face/65.gif differ
diff --git a/static/images/face/66.gif b/static/images/face/66.gif
new file mode 100644
index 0000000..bb6d077
Binary files /dev/null and b/static/images/face/66.gif differ
diff --git a/static/images/face/67.gif b/static/images/face/67.gif
new file mode 100644
index 0000000..6e33f7c
Binary files /dev/null and b/static/images/face/67.gif differ
diff --git a/static/images/face/68.gif b/static/images/face/68.gif
new file mode 100644
index 0000000..1a6c400
Binary files /dev/null and b/static/images/face/68.gif differ
diff --git a/static/images/face/69.gif b/static/images/face/69.gif
new file mode 100644
index 0000000..a02f0b2
Binary files /dev/null and b/static/images/face/69.gif differ
diff --git a/static/images/face/7.gif b/static/images/face/7.gif
new file mode 100644
index 0000000..e6d4db8
Binary files /dev/null and b/static/images/face/7.gif differ
diff --git a/static/images/face/70.gif b/static/images/face/70.gif
new file mode 100644
index 0000000..416c5c1
Binary files /dev/null and b/static/images/face/70.gif differ
diff --git a/static/images/face/71.gif b/static/images/face/71.gif
new file mode 100644
index 0000000..c17d60c
Binary files /dev/null and b/static/images/face/71.gif differ
diff --git a/static/images/face/8.gif b/static/images/face/8.gif
new file mode 100644
index 0000000..66f967b
Binary files /dev/null and b/static/images/face/8.gif differ
diff --git a/static/images/face/9.gif b/static/images/face/9.gif
new file mode 100644
index 0000000..6044740
Binary files /dev/null and b/static/images/face/9.gif differ
diff --git a/static/js/functions.js b/static/js/functions.js
index 5d13fff..8359cd5 100644
--- a/static/js/functions.js
+++ b/static/js/functions.js
@@ -52,4 +52,8 @@ function flashTitle() {
document.title = '【你有一条消息】' + originTitle;
}
titleTimer = setTimeout("flashTitle()", 500);
+}
+
+function replaceContent (content) {// 转义聊天内容中的特殊字符
+
}
\ No newline at end of file