From 27867d4e8be822c4598dbda24cdada20b5c1e711 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Wed, 30 Jan 2019 10:33:48 +0800 Subject: [PATCH] =?UTF-8?q?Signed-off-by:=20=E6=89=BE=E5=9B=9Elogo?= =?UTF-8?q?=E3=80=81version.log=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/manager/login.ftl | 6 +- .../WEB-INF/manager/mweixin/metarial/form.ftl | 87 ++++++++---------- .../static/ms-admin/4.7.0/images/logo.png | Bin 0 -> 6276 bytes .../static/ms-admin/4.7.0/images/version.png | Bin 0 -> 1065 bytes 4 files changed, 42 insertions(+), 51 deletions(-) create mode 100644 src/main/webapp/static/ms-admin/4.7.0/images/logo.png create mode 100644 src/main/webapp/static/ms-admin/4.7.0/images/version.png diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl index 3d280261..9217a328 100644 --- a/src/main/webapp/WEB-INF/manager/login.ftl +++ b/src/main/webapp/WEB-INF/manager/login.ftl @@ -3,11 +3,11 @@ - <#include "/include/head-file.ftl"/> + <#include "/include/head-file.ftl"/> --> - + + diff --git a/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl index fd4ae527..05e331f0 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/form.ftl @@ -93,6 +93,7 @@ authorWordNumber: 8, //图文作者剩余字数 descWordNumber: 54, //摘要 editor: null, //富文本实例 + editorCurrentContent: null, //当前百度编辑器输入的内容 articleForm: { basicTitle: '', //标题 articleAuthor: '', //作者 @@ -113,49 +114,22 @@ }, deep:true, }, + editorCurrentContent:function(n,o){ + + } }, methods: { open:function(material){ menuVue.menuActive = '新建图文'; - if(material && material.newsId>0){ - // 编辑 - this.subArticleList = material.articleList; - console.log('子',material.articleList); - this.mainArticle = material.newsArticle - // 默认显示头文章的详情 - this.articleForm.basicTitle = material.newsArticle.basicTitle - this.articleForm.articleAuthor = material.newsArticle.articleAuthor - this.articleForm.basicDescription = material.newsArticle.basicDescription - this.articleForm.articleContent = material.newsArticle.articleContent - this.thumbnailShow = true - this.thumbnailUrl = material.newsArticle.basicPic - this.editor.setContent(material.newsArticle.articleContent) - this.$forceUpdate(); - }else{ - // 新增 - console.log('this.defaultArticleForm',this.defaultArticleForm); - this.editor.setContent('') - this.thumbnailShow = false - this.thumbnailUrl = '' - this.articleForm = {} - this.subArticleList = []; - this.mainArticle = {} - } - console.log('"material',material); + material && material.newsId>0 ?　this.resetForm(material) : this.resetForm() }, - // 图片上传之前的钩子 + // 图片上传之前进行数据校验 beforeBasicPicUpload:function(file){ - var fileType = false; - if(file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg'){ - fileType = true; - } - const isLt2M = file.size / 1024 / 1024 < 2; - if (!fileType) { - this.$message.error('文章配图只能是 JPG、JPEG、PNG 格式!'); - } - if (!isLt2M) { - this.$message.error('文章配图大小不能超过 2MB!'); - } + var fileType = null; + ['image/jpeg','image/png','image/jpg'].indexOf(file.type)>-1 ? fileType = true : fileType = false + var isLt2M = file.size / 1024 / 1024 < 2; + !fileType && this.$message.error('文章配图只能是 JPG、JPEG、PNG 格式!'); + !isLt2M && this.$message.error('文章配图大小不能超过 2MB!'); return fileType && isLt2M; }, // 图片上传成功函数 @@ -163,7 +137,6 @@ this.thumbnailShow = this.uploadDisable = true this.thumbnailUrl = ms.web + url this.mainArticle.basicPic = this.thumbnailUrl - }, // 添加文章 addArticle: function() { @@ -188,16 +161,11 @@ }, // 计算剩余字数 resetWordNum: function(type,limit) { - var result = event.target.value; - if(type.indexOf('Title') > -1){ - this.titleWordNumber = limit - result.length - }else{ - this.authorWordNumber = limit - result.length - } - if(result.length >= limit){ + type.indexOf('Title') > -1 ? this.titleWordNumber = limit - event.target.value.length : this.authorWordNumber = limit - event.target.value.length + if(event.target.value.length >= limit){ this.$message.error('超出字数限制，请输入不超过'+limit+'字符'); this.$nextTick(function(){ - this.articleForm[type] = result.slice(0,limit); + this.articleForm[type] = event.target.value.slice(0,limit); }) } }, @@ -207,9 +175,9 @@ console.log('that.articleForm',that.articleForm); console.log('that.articleList',that.articleList); // 获取百度编辑器内容 - this.editor.getContent(); + // this.editorCurrentContent = '' ms.http.post(ms.manager + "/weixin/news/save.do",{ - newsArticleBean:that.mainArticle, + newsArticle:that.mainArticle, articleList:JSON.stringify(that.articleList), newsCategoryId:that.newsCategoryId, newsIsSyn:false, @@ -219,6 +187,25 @@ }, function (err) { that.$message.error(err); }) + }, + // 表单重置 + resetForm:function(material){ + this.thumbnailShow = material ? true : false + this.thumbnailUrl = material ? material.newsArticle.basicPic : '' + + this.mainArticle.basicPic = material ? material.newsArticle.basicPic : '' + this.mainArticle.basicTitle = material ? material.newsArticle.basicTitle : '' + + // 打开界面默认显示主文章详情 + this.articleForm.basicTitle = material ? material.newsArticle.basicTitle : '' + this.articleForm.articleAuthor = material ? material.newsArticle.articleAuthor : '' + this.articleForm.basicDescription = material ? material.newsArticle.basicDescription : '' + var result = ''; + result = (material && material.newsArticle.articleContent) ? material.newsArticle.articleContent : '' + this.editor.setContent(result) + + this.subArticleList = material ? material.articleList : []; + this.$forceUpdate(); } }, mounted: function() { @@ -257,6 +244,10 @@ "" ); }); + this.editor.addListener('contentChange',function() { + that.editorCurrentContent = that.editor.getContent(); + that.$message.success(that.editor.getContent()); + }); } } }) diff --git a/src/main/webapp/static/ms-admin/4.7.0/images/logo.png b/src/main/webapp/static/ms-admin/4.7.0/images/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..bb07ef09dd6e05cc5731c87e05698ee043467390 GIT binary patch literal 6276 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 KL7kpk?Ee6CfQw}S literal 0 HcmV?d00001 diff --git a/src/main/webapp/static/ms-admin/4.7.0/images/version.png b/src/main/webapp/static/ms-admin/4.7.0/images/version.png new file mode 100644 index 0000000000000000000000000000000000000000..256de7cb67522e4f459a90883e4654ad5540d6ec GIT binary patch literal 1065 zcmaJ=O-K|`9G|dE4K>n3bs9!U%XYqY*WH<%WOm2ZrB-EKa=k?3%yS)e=8ZGYc3qGt z3=)!{OLYhWC8$Fkx>y||p`u$Jl0Hx{JQxJh#X=Bzqpo&n8+h|R`2BwWkN10%T^((e z6~`+Gf~btQD@i>2@Te&(#sB?-6K!}phFa688}_5D>HtF4VILslrkVjspz32I??E#` zl$_FkrOj z9nhWcNNM>YP0*>9vt)Bl!~!NjDw#8fEmzD*)RwM@*WNKhky{WnBvIQ*r4wCb6gq$m z(oH^%3-Dw}pt&Yi-~*>gp5;Oe8)7)WkL5(RN%RZk&PU;Bj@~aOmDo-!ypyN_glv&v zve_)1_0!PFFq|L=49hb-@52b6J7ys@=d;|pf`S5E%`t3bK#TMg)jl|iBnoG`U4m)v z%3AJDn{dOJoN6;1&3YvjfQiKap{BWuc2N@S<@--zH#KGhCJ9_P>S*}l`s=(hkHjb-VRqUo{LbF%iv@f?{fdT?7|Utkhk2mF5c{#A6VG&4z_ms;OtlYEbhe> zIhFhJV?nN%V-H_no~+H69_UO~ETUy0e}_m zoR@pe&ZYZvM?%U7VFa`XIf?N9$(}j)bpPp$8?KnboH?LyzV^@B95G z^loihZWMc}Z&yh-zZs3nmG!Cm!TH6F$(qerD6sJB?Z&O}^y@=+pOv#j$)}G;SL>da PdyhBX+Mzs&T)OrLK_6O8 literal 0 HcmV?d00001