diff --git a/src/main/resources/static/js/user/system.js b/src/main/resources/static/js/user/system.js index 8d0fbdd..58efebc 100644 --- a/src/main/resources/static/js/user/system.js +++ b/src/main/resources/static/js/user/system.js @@ -1,40 +1,38 @@ - - let pageNum = null; let pageAll = null; -let pageUrl= '/'; +let pageUrl = '/'; -function setpageNum(data,allList) { +function setpageNum(data, allList) { var url = window.location.href; - console.log('当前url:'+url) - if(url.indexOf('index') > 0){ - pageUrl= '/index'; + console.log('当前url:' + url) + if (url.indexOf('index') > 0) { + pageUrl = '/index'; } - console.log('当前页码:'+data) + console.log('当前页码:' + data) pageNum = parseInt(data) // pageNum pageAll = parseInt(allList) } $("#upPage").click(function () { console.log("点击 upPage"); - console.log('当前页码:'+pageNum); - if(pageNum > 1){ + console.log('当前页码:' + pageNum); + if (pageNum > 1) { let page = pageNum - 1 - window.location.href=pageUrl + "?pageNum=" + page; - }else{ - massage('已经是首页!',''); + window.location.href = pageUrl + "?pageNum=" + page; + } else { + massage('已经是首页!', ''); } }); $("#nextPage").click(function () { console.log("点击 nextPage"); - console.log('当前页码:'+pageNum); - console.log('当前pageAll页码:'+pageAll); - if((pageNum + 1) <= pageAll){ + console.log('当前页码:' + pageNum); + console.log('当前pageAll页码:' + pageAll); + if ((pageNum + 1) <= pageAll) { let page = pageNum + 1 - window.location.href=pageUrl + "?pageNum=" + page; - }else{ - massage('已经是尾页!',''); + window.location.href = pageUrl + "?pageNum=" + page; + } else { + massage('已经是尾页!', ''); } }); @@ -42,21 +40,21 @@ $("#createNewDiccuss").click(function () { console.log("点击 createNewDiccuss"); console.log(username); - if(username && username!=null){ + if (username && username != null) { $('.ui.modal.createNewDiccuss') .modal('show') ; tinymce.init({ selector: '#discussionscontent', - }); - }else{ - massage('您未登录,请先登录!',''); + }); + } else { + massage('您未登录,请先登录!', ''); } }); -$("#newdiscussions").click(function(){ +$("#newdiscussions").click(function () { var token = $("meta[name='_csrf']").attr("content"); var header = $("meta[name='_csrf_header']").attr("content"); @@ -66,29 +64,29 @@ $("#newdiscussions").click(function(){ var tag = $("#selectTag").val(); // $("#discussionscontent").val(); console.log(tinyMCE.editors[0].getContent()); - var content =tinyMCE.editors[0].getContent(); + var content = tinyMCE.editors[0].getContent(); console.log(title); console.log(content); $.ajax({ type: "POST", url: "/newdiscussions", data: JSON.stringify({ - title: title, - content: content + title: title, + content: content }), contentType: 'application/json', - beforeSend: function(request) { + beforeSend: function (request) { request.setRequestHeader(header, token); // 添加 CSRF Token }, dataType: "JSON", success: function (data) { console.log(data); - if(data.flag){ - massage(title+',添加成功!',''); + if (data.flag) { + massage(title + ',添加成功!', ''); $('.ui.modal.createNewDiccuss').modal('hide'); location.reload(); - }else{ - massage(data.msg,''); + } else { + massage(data.msg, ''); return false; } } @@ -96,47 +94,53 @@ $("#newdiscussions").click(function(){ }); -$("#newtags").click(function(){ - $('#createNewtagsDiv').show(); +$("#newtags").click(function () { + $('#createNewtagsDiv').show(); $('#createNewtagsBtn').show(); - return false; + return false; }); -$("#commitnewtags").click(function(){ +$("#commitnewtags").click(function () { var header = $("meta[name='_csrf_header']").attr("content"); - var token =$("meta[name='_csrf']").attr("content"); - - + var token = $("meta[name='_csrf']").attr("content"); var name = $("#tagsname").val(); var tagColor = $("#tagColor").val(); var tagIcon = $("#tagIcon").val(); var parentTag = $("#parentTag").val(); + + let coloricon = tagColor + ',' + tagIcon + var tagdescription = $("#tagdescription").val(); + console.log(tagColor); console.log(tagIcon); console.log(parentTag); + console.log(tagdescription); console.log(name); $.ajax({ type: "POST", url: "/newtags", data: JSON.stringify({ - name: name, + name: name, + color: coloricon, + description: tagdescription, + parentId: parentTag }), contentType: 'application/json', - beforeSend : function(xhr) { + beforeSend: function (xhr) { xhr.setRequestHeader(header, token); }, dataType: "JSON", success: function (data) { console.log(data); - if(data.flag){ - massage(name+',添加成功!',''); + if (data.flag) { + massage(name + ',添加成功!', ''); $("#selectTag").html(""); - }else{ - massage(name+',添加失败!',''); + } else { + massage(name + ',添加失败!', ''); } } }); diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index bac5ebe..8698a74 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -72,6 +72,11 @@ +
+ +