From 8aa3bceb1e109a6d37fbe9601a4fc5c9552d61ec Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Thu, 20 Jan 2022 18:18:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=92=8C=E5=85=91=E6=8D=A2=E7=A0=81?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=81=94=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 8 +++++++- .../exchangepage/edittemplate/whiteLand.js | 18 +++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 621ac759..8932a520 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -88,6 +88,7 @@ getLandingdata(val){ sessionStorage.removeItem('editorConfig'); let myInfoData = JSON.parse(sessionStorage.getItem("pageInfo")) let mouldType=sessionStorage.getItem('mouldType'); + this.setState({mouldType}); let pageChange=sessionStorage.getItem('pageChange'); if(myInfoData) { @@ -382,6 +383,11 @@ getLandingdata(val){ this.setState({model:whiteData.land}); this.setState({product_list:whiteData.product_list}); this.setState({product_detail:whiteData.product_detail}); + if(this.state.mouldType==0){ + let whiteLand=whiteData.land; + whiteLand.title=this.state.model.title; + this.setState({model:whiteLand}); + } }else if(e.target.value==3){ let exchangeData=editorData.exchangeList; this.setState({model:exchangeData.land}); @@ -737,7 +743,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)} 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/whiteLand.js b/src/pages/exchangepage/edittemplate/whiteLand.js index d2e5c128..8c16d2ba 100644 --- a/src/pages/exchangepage/edittemplate/whiteLand.js +++ b/src/pages/exchangepage/edittemplate/whiteLand.js @@ -32,17 +32,22 @@ export default class edittemplate extends React.Component{ } } - componentWillMount(e){ + componentDidMount(e){ let self=this; let config=JSON.parse(sessionStorage.getItem('editorConfig')); let moudTyle=sessionStorage.getItem('mouldType'); - if(moudTyle&&moudTyle==0){ - this.setState({isSystemModel:true}); - } + if(config&&config.whiteList&&config.whiteList.land){ let data=config.whiteList.land; this.setState({model:data}); } + if(moudTyle&&moudTyle==0){ + this.setState({isSystemModel:true}); + let data=config.whiteList.land; + data.title=config.exchangeList.land.title; + this.setState({model:data}); + + } getThemeType().then(res=>{ handelResponse(res,(req,msg)=>{ let typeListSource=res.data.map(it=>{ @@ -251,13 +256,15 @@ export default class edittemplate extends React.Component{
基础设置
- + { + { let model2 = this.state.model; model2.title = e; this.setState({model:model2}) this.props.settitle(e) }} + disabled={this.props.mouldType==0} onClearItem={(e)=>{ let model2 = this.state.model; model2.title = ""; @@ -265,6 +272,7 @@ export default class edittemplate extends React.Component{ }} value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'}/> + }
样式
From 2d80dfc680e3cb36124988a8b77897e49ad8bee3 Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Thu, 20 Jan 2022 18:31:49 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E7=82=B9=E5=87=BB=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E2=80=9C=E4=BD=BF=E7=94=A8=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=9C=AA=E5=9B=9E=E6=98=BE=E5=87=BA=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/main.js | 3 +++ src/pages/exchangepage/template/main.js | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 8932a520..49165b37 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -107,7 +107,10 @@ getLandingdata(val){ }else{ if(myInfoData.page==1){ this.setState({model:newEditor.whiteList.land,product_list:newEditor.whiteList.product_list,product_detail:newEditor.whiteList.product_detail}); + }else{ + this.setState({model:newEditor.exchangeList.land,product_list:newEditor.exchangeList.product_list,product_detail:newEditor.exchangeList.product_detail}); } + } // if(mouldType!=0){ diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js index 9e1ca327..1a845996 100644 --- a/src/pages/exchangepage/template/main.js +++ b/src/pages/exchangepage/template/main.js @@ -172,7 +172,6 @@ export default class mytemplate extends React.Component{ sessionStorage.setItem("pageInfo", JSON.stringify(row)) sessionStorage.setItem("isSort",0) sessionStorage.setItem('mouldType',1); - console.log(88888,self.state.sourceIndex); sessionStorage.setItem('pageChange',0); From d7da39d426883fac37bf6650328ba9b9b3946438 Mon Sep 17 00:00:00 2001 From: red-deng-deng <1924913374@qq.com> Date: Fri, 21 Jan 2022 09:40:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=9B=9E=E6=98=BE=E5=81=B6=E5=8F=91=E6=80=A7?= =?UTF-8?q?=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/exchangepage/edittemplate/whiteLand.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/exchangepage/edittemplate/whiteLand.js b/src/pages/exchangepage/edittemplate/whiteLand.js index 8c16d2ba..91057db4 100644 --- a/src/pages/exchangepage/edittemplate/whiteLand.js +++ b/src/pages/exchangepage/edittemplate/whiteLand.js @@ -32,7 +32,7 @@ export default class edittemplate extends React.Component{ } } - componentDidMount(e){ + componentWillMount(e){ let self=this; let config=JSON.parse(sessionStorage.getItem('editorConfig')); let moudTyle=sessionStorage.getItem('mouldType'); @@ -48,6 +48,7 @@ export default class edittemplate extends React.Component{ this.setState({model:data}); } + getThemeType().then(res=>{ handelResponse(res,(req,msg)=>{ let typeListSource=res.data.map(it=>{ @@ -251,6 +252,7 @@ export default class edittemplate extends React.Component{ render(){ + console.log('白名单',this.state); return(
基础设置