diff --git a/main.go b/main.go index d8dc88c..acc7b81 100644 --- a/main.go +++ b/main.go @@ -98,6 +98,8 @@ func main() { engine.GET("/roles_list", tmpl.PageRoleList) engine.POST("/role",middleware.JwtApiMiddleware,middleware.RbacAuth, controller.PostRole) + //欢迎语 + engine.GET("/setting_welcome", tmpl.PageSettingWelcome) //网页部署 engine.GET("/setting_deploy", tmpl.PageSettingDeploy) //邮箱列表 diff --git a/static/css/common.css b/static/css/common.css index aa01991..e1c4e24 100644 --- a/static/css/common.css +++ b/static/css/common.css @@ -1,6 +1,12 @@ *{padding:0;margin:0} .floatRight{float: right;} .clear{clear: both;} +.h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { + font-family: inherit; + font-weight: 500; + line-height: 1.2; + color: inherit; +} .faceBtn, .faceBtn:after, .faceBtn { border: 1px solid; } @@ -173,4 +179,25 @@ .el-aside{ height: 100%; background: #222d32; -} \ No newline at end of file +} +.textDark {color: #343a40;} +.bgInfo {background-color: #17a2b8} +.bgSuccess {background-color: #28a745} +.bgDanger {background-color: #dc3545} +.bgInfo {background-color: #17a2b8} +.smallBox { + border-radius: .25rem; + box-shadow: 0 0 1px rgba(0,0,0,.125), 0 1px 3px rgba(0,0,0,.2); + display: block; + margin-bottom: 20px; + position: relative; + padding: 10px; + color: #fff; +} +.settingMain h2{ + margin-bottom: 20px; +} +.settingMain h3{ + font-size: 24px; + margin-bottom: 10px; +} diff --git a/static/html/chat_page.html b/static/html/chat_page.html index 4decfd0..fbb5550 100644 --- a/static/html/chat_page.html +++ b/static/html/chat_page.html @@ -372,7 +372,7 @@ let content = {} content.avator = msg.avator; content.name = msg.nickname; - content.content = msg.content; + content.content = replaceContent(msg.content); content.is_kefu = false; content.time = msg.time; setTimeout(function () { diff --git a/static/html/setting.html b/static/html/setting.html index 925daa3..7d7942f 100644 --- a/static/html/setting.html +++ b/static/html/setting.html @@ -5,19 +5,28 @@ {{template "setting_left" .}} - - - - - - - - - - 立即创建 - 取消 - - + +

数据总览

+ + +
+

15000

+

总访客数

+
+
+ +
+

15000

+

总消息数

+
+
+ +
+

15000

+

当前会话数

+
+
+
diff --git a/static/html/setting_bottom.html b/static/html/setting_bottom.html index b52de3b..4192cfd 100644 --- a/static/html/setting_bottom.html +++ b/static/html/setting_bottom.html @@ -7,7 +7,7 @@ el: '#app', delimiters:["<{","}>"], data: { - fullscreenLoading:true, + fullscreenLoading:false, openIndex:[1], account: { username: "", @@ -288,9 +288,9 @@ } }, created: function () { - if(ACTION=="setting"){ - this.showNotice(); - } + // if(ACTION=="setting"){ + // this.showNotice(); + // } this.initInfo(); } }) diff --git a/static/html/setting_left.html b/static/html/setting_left.html index 5c6c713..752ee30 100644 --- a/static/html/setting_left.html +++ b/static/html/setting_left.html @@ -1,5 +1,5 @@ {{define "setting_left"}} - + 账户设置 - 智能回复 - + 主板 + 问候语 @@ -34,7 +34,7 @@ 设置smtp 设置imap 设置登陆账号 - 设置mysql + 设置mysql 设置网页部署 diff --git a/static/html/setting_welcome.html b/static/html/setting_welcome.html new file mode 100644 index 0000000..7eff635 --- /dev/null +++ b/static/html/setting_welcome.html @@ -0,0 +1,16 @@ +{{template "header" }} +
+ + +
+ +{{template "setting_bottom" .}} diff --git a/tmpl/setting.go b/tmpl/setting.go index e3ebb54..a656f0e 100644 --- a/tmpl/setting.go +++ b/tmpl/setting.go @@ -11,6 +11,13 @@ func PageSetting(c *gin.Context) { "action":"setting", }) } +//设置欢迎 +func PageSettingWelcome(c *gin.Context) { + c.HTML(http.StatusOK, "setting_welcome.html", gin.H{ + "tab_index":"1-1", + "action":"setting_welcome", + }) +} //设置mysql func PageSettingMysql(c *gin.Context) { c.HTML(http.StatusOK, "setting_mysql.html", gin.H{