diff --git a/config/go-fly-data.sql b/config/go-fly-data.sql
index e69de29..e3d3fef 100644
--- a/config/go-fly-data.sql
+++ b/config/go-fly-data.sql
@@ -0,0 +1,2 @@
+INSERT INTO `user` (`id`, `name`, `password`, `nickname`, `created_at`, `updated_at`, `deleted_at`, `avator`) VALUES
+(null, 'kefu2', '202cb962ac59075b964b07152d234b70', '小白菜', '2020-06-28 03:32:41', '2020-06-28 03:32:41', NULL, 'https://www.wolive.cc/assets/upload/3.jpg');
\ No newline at end of file
diff --git a/controller/chat.go b/controller/chat.go
index 95f7790..9d7111f 100644
--- a/controller/chat.go
+++ b/controller/chat.go
@@ -36,24 +36,6 @@ type ClientMessage struct {
ToId string `json:"to_id"`
Content string `json:"content"`
}
-type KfMessage struct {
- Kf_name string `json:"kf_name"`
- Avatar string `json:"avatar"`
- Kf_id string `json:"kf_id"`
- Kf_group string `json:"kf_group"`
- Time string `json:"time"`
- Guest_id string `json:"guest_id"`
- Content string `json:"content"`
-}
-type UserMessage struct {
- From_avatar string `json:"from_avatar"`
- From_id string `json:"from_id"`
- From_name string `json:"from_name"`
- To_id string `json:"to_id"`
- To_name string `json:"to_name"`
- Time string `json:"time"`
- Content string `json:"content"`
-}
//定时检测客户端是否在线
func init() {
upgrader=websocket.Upgrader{
diff --git a/static/html/chat_main.html b/static/html/chat_main.html
index 204aac4..706f968 100644
--- a/static/html/chat_main.html
+++ b/static/html/chat_main.html
@@ -80,7 +80,7 @@
-
+
<{v.name}>
<{v.content}>
@@ -124,7 +124,7 @@
kfConfig:{
id : "kf_1",
name : "客服丽丽",
- avatar : "",
+ avator : "",
to_id : "",
}
},
@@ -193,18 +193,18 @@
if (redata.type == "chatMessage") {
let msg = redata.data
let content = {}
- content.avatar = msg.from_avatar;
- content.name = msg.from_name;
+ content.avator = msg.avator;
+ content.name = msg.name;
content.content = msg.content;
content.is_kefu = false;
content.time = msg.time;
- if (msg.from_id == this.currentGuest) {
+ if (msg.id == this.currentGuest) {
this.msgList.push(content);
}
- if (typeof (this.msgListUser[msg.from_id]) == "undefined") {
- this.msgListUser[msg.from_id] = [];
+ if (typeof (this.msgListUser[msg.id]) == "undefined") {
+ this.msgListUser[msg.id] = [];
}
- this.msgListUser[msg.from_id].push(content);
+ this.msgListUser[msg.id].push(content);
this.$nextTick(() => {
$('.chatBox').scrollTop($(".chatBox")[0].scrollHeight);
});
@@ -242,7 +242,7 @@
this.messageContent = "";
let content = {}
- content.avatar = this.kfConfig.avatar;
+ content.avator = this.kfConfig.avator;
content.name = this.kfConfig.name;
content.content = this.kfConfig.content;
content.is_kefu = true;
@@ -282,7 +282,7 @@
if(data.result!=null){
_this.kfConfig.id=data.result.id;
_this.kfConfig.name=data.result.name;
- _this.kfConfig.avatar=data.result.avator;
+ _this.kfConfig.avator=data.result.avator;
}
if(data.code!=200){
_this.$message({
diff --git a/static/html/chat_page.html b/static/html/chat_page.html
index c927b6e..7798443 100644
--- a/static/html/chat_page.html
+++ b/static/html/chat_page.html
@@ -82,7 +82,7 @@
-
+
<{v.name}>
<{v.content}>
@@ -148,7 +148,7 @@
guest.to_id=msg.id;
let content = {}
- content.avatar = msg.avatar;
+ content.avator = msg.avator;
content.name = msg.kf_name;
content.content = msg.content;
content.is_kefu = false;
@@ -186,7 +186,7 @@
this.messageContent = "";
let content = {}
- content.avatar=guest.avator;
+ content.avator=guest.avator;
content.content = guest.content;
content.name = guest.name;
content.is_kefu = true;