diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index b13623a6..ba010e34 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -746,7 +746,7 @@ getLandingdata(val){ { this.state.showType==3?this.state.activeNavStatus==1?this.getTitle(c)} landbgcolor={(c)=>this.getlandbgcolor(c)} landftcolor={(c)=>this.getlandftcolor(c)} setbanner={(e)=>this.getLandingdata(e)} />:this.state.activeNavStatus==2?this.getactiveTypeFn(c)} seteditorHtml={c=>this.getEditorHtmlFn(c)} setButtonbgcolor={(c)=>{this.getButtonbgcolor(c)}} setButtoncolor={(c)=>{this.getButtoncolor(c)}} setbottomImg={c=>this.getgoodsbottomimgFn(c)} setbanner={(c)=>this.getGoodsbanner(c)} setarrayType={(c)=>this.getarrayType(c)}/>:this.getdetailEditorHtmlFn(c)} setdetailActive={c=>this.getdetailActiveFn(c)} setdetailbgc={c=>{this.getdetailbgcolor(c)}} setbottomImg={c=>this.getbottomimgFn(c)} setdetailftc={c=>this.getdetailfont_color(c)}/> - :this.state.activeNavStatus==1?this.getTitle(c)} mouldType={this.state.mouldType} landbgcolor={(c)=>this.getlandbgcolor(c)} landftcolor={(c)=>this.getlandftcolor(c)} setbanner={(e)=>this.getLandingdata(e)} />:this.state.activeNavStatus==2?this.getactiveTypeFn(c)} seteditorHtml={c=>this.getEditorHtmlFn(c)} setButtonbgcolor={(c)=>{this.getButtonbgcolor(c)}} setButtoncolor={(c)=>{this.getButtoncolor(c)}} setbottomImg={c=>this.getgoodsbottomimgFn(c)} setbanner={(c)=>this.getGoodsbanner(c)} setarrayType={(c)=>this.getarrayType(c)}/>:this.getdetailEditorHtmlFn(c)} setdetailActive={c=>this.getdetailActiveFn(c)} setdetailbgc={c=>{this.getdetailbgcolor(c)}} setbottomImg={c=>this.getbottomimgFn(c)} setdetailftc={c=>this.getdetailfont_color(c)}/>} + :this.state.activeNavStatus==1?this.getTitle(c)} mouldType={this.state.mouldType} landbgcolor={(c)=>this.getlandbgcolor(c)} landftcolor={(c)=>this.getlandftcolor(c)} setbanner={(e)=>this.getLandingdata(e)} />:this.state.activeNavStatus==2?this.getactiveTypeFn(c)} seteditorHtml={c=>this.getEditorHtmlFn(c)} setButtonbgcolor={(c)=>{this.getButtonbgcolor(c)}} setButtoncolor={(c)=>{this.getButtoncolor(c)}} setbottomImg={c=>this.getgoodsbottomimgFn(c)} setbanner={(c)=>this.getGoodsbanner(c)} setarrayType={(c)=>this.getarrayType(c)}/>:this.getdetailEditorHtmlFn(c)} setdetailActive={c=>this.getdetailActiveFn(c)} setdetailbgc={c=>{this.getdetailbgcolor(c)}} setbottomImg={c=>this.getbottomimgFn(c)} setdetailftc={c=>this.getdetailfont_color(c)}/>} { this.state.preview_visible ? (
diff --git a/src/pages/exchangepage/edittemplate/wangeditorCom.js b/src/pages/exchangepage/edittemplate/wangeditorCom.js index fefd4714..047af71b 100644 --- a/src/pages/exchangepage/edittemplate/wangeditorCom.js +++ b/src/pages/exchangepage/edittemplate/wangeditorCom.js @@ -31,16 +31,20 @@ export default class wangeditor extends React.Component{ 'justify', ] + // 注意,先配置 height ,再执行 create() // 注意,先配置 height ,再执行 create() editor.config.onchange = function (newHtml) { - console.log(35,newHtml); - var text = editor.txt.text(); - console.log(38,text); - // if(text.length>10){ - // console.log('结束',text.length); - // return; - // } + if(text.length==0){//没有文字 + self.props.setEdittext(""); + } + if(text.length>10){ + let str = text.slice(0,10); + self.setState({editorHtml:str}); + editor.txt.html(str) + self.props.setEdittext(str); + return; + } self.setState({editorHtml:newHtml}); self.props.setEdittext(newHtml); diff --git a/src/pages/exchangepage/edittemplate/whiteLand.js b/src/pages/exchangepage/edittemplate/whiteLand.js index 91057db4..d7e75eb0 100644 --- a/src/pages/exchangepage/edittemplate/whiteLand.js +++ b/src/pages/exchangepage/edittemplate/whiteLand.js @@ -44,7 +44,7 @@ export default class edittemplate extends React.Component{ if(moudTyle&&moudTyle==0){ this.setState({isSystemModel:true}); let data=config.whiteList.land; - data.title=config.exchangeList.land.title; + data.title=this.props.landTitle; this.setState({model:data}); } diff --git a/src/pages/exchangepage/edittemplate/whitewangeditor.js b/src/pages/exchangepage/edittemplate/whitewangeditor.js index feba6f96..fe861d54 100644 --- a/src/pages/exchangepage/edittemplate/whitewangeditor.js +++ b/src/pages/exchangepage/edittemplate/whitewangeditor.js @@ -30,17 +30,18 @@ export default class wangeditor extends React.Component{ 'link', 'justify', ] - - // 注意,先配置 height ,再执行 create() editor.config.onchange = function (newHtml) { - console.log(35,newHtml); - var text = editor.txt.text(); - console.log(38,text); - // if(text.length>10){ - // console.log('结束',text.length); - // return; - // } + if(text.length==0){//没有文字 + self.props.setEdittext(""); + } + if(text.length>10){ + let str = text.slice(0,10); + self.setState({editorHtml:str}); + editor.txt.html(str) + self.props.setEdittext(str); + return; + } self.setState({editorHtml:newHtml}); self.props.setEdittext(newHtml); diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js index 552374b0..896e505b 100644 --- a/src/pages/exchangepage/template/main.js +++ b/src/pages/exchangepage/template/main.js @@ -266,7 +266,7 @@ export default class mytemplate extends React.Component{ // window.open(link, "_blank") sessionStorage.setItem('mouldType',1); window.location.href='/#/edittemplate'; - sessionStorage.setItem('pageChange',0); + sessionStorage.setItem('pageChange',1); } }