diff --git a/router/api.go b/router/api.go index 017b01b..98917ba 100644 --- a/router/api.go +++ b/router/api.go @@ -12,7 +12,7 @@ func InitApiRouter(engine *gin.Engine){ engine.POST("/check", controller.LoginCheckPass) engine.POST("/check_auth",middleware.JwtApiMiddleware, controller.MainCheckAuth) //前后聊天 - engine.GET("/chat_server", controller.NewChatServer) + engine.GET("/chat_server",middleware.Ipblack, controller.NewChatServer) //获取消息 engine.GET("/messages", controller.GetVisitorMessage) //发送单条消息 diff --git a/static/css/common.css b/static/css/common.css index 99ca910..27b3261 100644 --- a/static/css/common.css +++ b/static/css/common.css @@ -14,6 +14,7 @@ .el-menu--horizontal>.el-menu-item.is-active{ border-bottom: 3px solid #409EFF; } +.chatBg .el-tabs__header{margin: 0;} .faceBtn, .faceBtn:after, .faceBtn { border: 1px solid; } diff --git a/static/html/chat_main.html b/static/html/chat_main.html index 7f281b7..62a2b03 100644 --- a/static/html/chat_main.html +++ b/static/html/chat_main.html @@ -16,7 +16,6 @@ .el-row{width:100%}#app{margin-top: 10px;} .chatBg{min-height: 100%;background: #fff;border: solid 1px #e6e6e6;overflow: hidden;} .chatLeft{ margin-left: 4px;} - .chatLeft .el-tabs__header{margin: 0;} .sw-bg{background: #fff;border: solid 1px #e6e6e6;boder-top:none;padding:5px 10px;} .chatContext .el-row{margin-bottom: 5px;} .chatContext{position: relative;} @@ -138,7 +137,7 @@
- + @@ -180,7 +179,11 @@ - 待开发 + +
+ 待开发 +
+
@@ -530,6 +533,8 @@ if(tab.name=="second"){ this.getVisitorPage(1); } + if(tab.name=="blackList"){ + } }, //所有访客分页展示 visitorPage(page){ diff --git a/static/html/chat_page.html b/static/html/chat_page.html index 26d71f1..dc60b3f 100644 --- a/static/html/chat_page.html +++ b/static/html/chat_page.html @@ -163,6 +163,7 @@ chatTitle:"正在连接...", visitor:{}, face:[], + showKfonline:false, }, methods: { //初始化websocket @@ -189,10 +190,14 @@ const redata = JSON.parse(e.data); if (redata.type == "kfOnline") { let msg = redata.data + if(this.showKfonline && guest.to_id==msg.id){ + return; + } guest.to_id=msg.id; this.chatTitle=msg.name+",正在与您沟通!" $(".chatBox").append("
"+this.chatTitle+"
"); this.scrollBottom(); + this.showKfonline=true; } if (redata.type == "message") { let msg = redata.data