Skip to content

Commit ab8e8e3

Browse files
committed
访客端发送表情图片
1 parent 0b0bcef commit ab8e8e3

File tree

3 files changed

+29
-95
lines changed

3 files changed

+29
-95
lines changed

static/css/common.css

Lines changed: 13 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
.visitorFaceBox{
3333
position: absolute;
34-
bottom: 105px;
34+
bottom: 85px;
3535
}
3636
.visitorIconBtns{
3737
margin-right: 8px;
@@ -46,88 +46,11 @@
4646
bottom: 0px;
4747
z-index: 999;
4848
}
49-
.imageBtn {
50-
width: 32px;
51-
height: 23px;
52-
overflow: hidden;
53-
display: inline-block;
54-
vertical-align: middle;
55-
position: relative;
56-
font-style: normal;
57-
color: #9da0a0;
58-
text-align: left;
59-
text-indent: -9999px;
60-
direction: ltr;
61-
border: 1px solid;
62-
}
63-
.imageBtn:before {
64-
content: '';
65-
position: absolute;
66-
width: 17px;
67-
height: 16px;
68-
left: -2px;
69-
top: 10px;
70-
-webkit-transform: rotate(45deg);
71-
-moz-transform: rotate(45deg);
72-
-ms-transform: rotate(45deg);
73-
-o-transform: rotate(45deg);
74-
transform: rotate(45deg);
75-
box-shadow: inset 0 0 0 32px, 10px -6px 0 0;
76-
}
77-
.imageBtn:after {
78-
content: '';
79-
-webkit-border-radius: 50%;
80-
-moz-border-radius: 50%;
81-
-o-border-radius: 50%;
82-
border-radius: 50%;
83-
position: absolute;
84-
width: 3px;
85-
height: 3px;
86-
box-shadow: inset 0 0 0 32px;
87-
top: 5px;
88-
right: 5px
89-
}
90-
.visitorFolderBtn{
91-
float: left;
92-
margin-left: 20px;
93-
}
94-
.folderBtn {
95-
display: inline-block;
96-
background-color: transparent;
97-
overflow: hidden;
98-
font-size: 1px;
99-
}
100-
.folderBtn:before {
101-
content: '';
102-
float: left;
103-
background-color: #9da0a0;
104-
width: 15px;
105-
height: 3px;
106-
margin-left: 2px;
107-
border-top-left-radius: 2px;
108-
border-top-right-radius: 2px;
109-
box-shadow: 2px 2px 0 0 #9da0a0;
110-
}
111-
.folderBtn:after {
112-
content: '';
113-
float: left;
114-
clear: left;
115-
background-color: #d4d6d6;
116-
width: 33px;
117-
height: 22px;
118-
border-radius: 1px;
119-
}
120-
.visitorImageBtn{
121-
float: left;
122-
margin-left: 20px;
123-
margin-top: 2px;
124-
}
12549
.faceBox{
12650
width: 100%;
12751
background: #fff;
12852
z-index: 99999999;
12953
padding: 2px;
130-
display: none;
13154
}
13255
.faceBoxList{
13356
list-style: none;
@@ -262,7 +185,7 @@
262185
/*margin-bottom: 80px;*/
263186
}
264187
.chatVisitorPage{
265-
height: calc(100% - 71px);
188+
height: calc(100% - 86px);
266189
overflow-y: auto;
267190
}
268191
.chatVisitorPage .chatBox{
@@ -318,7 +241,7 @@ a{color: #07a9fe;text-decoration: none;}
318241
padding-top: 5px;
319242
background: #fff;
320243
width: 100%;
321-
height: 65px;
244+
height: 80px;
322245
z-index: 99;
323246
border-top: 1px solid #e4e4e4;
324247
}
@@ -439,14 +362,23 @@ a{color: #07a9fe;text-decoration: none;}
439362
.chatArticle{
440363
display: none;
441364
}
365+
.visitorIconBox{
366+
display: flex;
367+
align-items: center;
368+
color: rgb(126, 126, 126);
369+
}
370+
.visitorIconBox .iconBtn{
371+
margin-right: 10px;
372+
cursor: pointer;
373+
}
442374
@media screen and (min-width: 900px) {
443375
.chatCenter {
444376
max-height: 800px;
445377
box-shadow: 0 2px 8px rgba(0,0,0,.15);
446378
border-radius: 4px;
447379
}
448380
.chatVisitorPage {
449-
height: calc(100% - 140px);
381+
height: calc(100% - 156px);
450382
}
451383
.chatEntTitle{display: flex;}
452384
.chatEntTitleLogo {

static/js/chat-page.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -362,15 +362,7 @@ new Vue({
362362
$.each(faceTitles, function (index, item) {
363363
_this.face.push({"name":item,"path":faces[item]});
364364
});
365-
$(".visitorFaceBtn").click(function(e){
366-
var status=$('.faceBox').css("display");
367-
if(status=="block"){
368-
$('.faceBox').hide();
369-
}else{
370-
$('.faceBox').show();
371-
}
372-
return false;
373-
});
365+
374366

375367
var windheight = $(window).height();
376368
$(window).resize(function(){

static/templates/chat_page.html

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,23 @@
5151
</div>
5252
<div class="chatBoxSend">
5353

54-
<div class="iconBtns visitorIconBox" v-show="showIconBtns">
55-
<div style="display: none" :title="flyLang.emotions" class="icono-smile visitorIconBtns visitorFaceBtn"></div>
56-
<div :title="flyLang.photo" class="icono-image visitorIconBtns visitorImageBtn" id="uploadImg" v-on:click="uploadImg('/uploadimg')"></div>
57-
<div :title="flyLang.file" class="icono-folder visitorIconBtns visitorFolderBtn" id="uploadFile" v-on:click="uploadFile('/uploadfile')"></div>
54+
<div class="visitorIconBox">
55+
<el-tooltip content="发送表情" placement="top">
56+
<div class="iconBtn faceBtn el-icon-s-shop" style="font-size: 24px;" @click.stop="showFaceIcon==true?showFaceIcon=false:showFaceIcon=true"></div>
57+
</el-tooltip>
58+
59+
<el-tooltip content="上传图片" placement="top">
60+
<div class="iconBtn el-icon-picture" id="uploadImg" v-on:click="uploadImg('/uploadimg')" style="font-size: 24px;"></div>
61+
</el-tooltip>
62+
<el-tooltip content="上传附件" placement="top">
63+
<div class="iconBtn el-icon-upload" id="uploadFile" v-on:click="uploadFile('/uploadfile')" style="font-size: 26px;"></div>
64+
</el-tooltip>
65+
66+
<div style="display: none" :title="flyLang.emotions" class="icono-smile visitorIconBtns visitorFaceBtn"></div>
67+
5868
<div class="clear"></div>
5969
</div>
60-
<div class="faceBox visitorFaceBox" v-if="showFaceIcon">
70+
<div class="faceBox visitorFaceBox" v-show="showFaceIcon">
6171
<ul class="faceBoxList">
6272
<li v-on:click="faceIconClick(i)" class="faceIcon" v-for="(v,i) in face" :title="v.name"><img :src=v.path></li>
6373
</ul>

0 commit comments

Comments
 (0)