diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index ba010e34..af5fee54 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -83,8 +83,14 @@ getLandingdata(val){
}
},500)
}
-
+
componentWillMount(e){
+ let href=window.location.href;
+ let strindex = href.lastIndexOf("\=");
+ let typePage =null;
+ if(strindex>-1){
+ typePage = href.substr(strindex + 1, href.length);
+ }
sessionStorage.removeItem('editorConfig');
let myInfoData = JSON.parse(sessionStorage.getItem("pageInfo"))
let mouldType=sessionStorage.getItem('mouldType');
@@ -92,8 +98,12 @@ getLandingdata(val){
let pageChange=sessionStorage.getItem('pageChange');
if(myInfoData)
{
- this.setState({showType:myInfoData.page});
let newEditor=_.clone(myInfoData);
+ if(typePage){
+ this.setState({showType:Number(typePage)});
+ }else{
+ this.setState({showType:Number(myInfoData.page)});
+ }
let exchangeList=newEditor.exchange;
exchangeList['land'].title=newEditor.title;
exchangeList['land'].sort=newEditor.sort;
@@ -103,9 +113,13 @@ getLandingdata(val){
newEditor.exchangeList=exchangeList;
newEditor.whiteList=whiteList;
if(mouldType==0){
- this.setState({model:newEditor.exchangeList.land,product_list:newEditor.exchangeList.product_list,product_detail:newEditor.exchangeList.product_detail});
+ if(this.state.showType==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});
+ }
}else{
- if(myInfoData.page==1){
+ if(this.state.showType==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});
@@ -181,6 +195,7 @@ getLandingdata(val){
this.setState({loading_visible:true,activeNavStatus:1});
let thumbresult=null;
if(mouldType==0){//系统模板
+ this.setState({activeNavStatus:1});
if(this.state.showType!=3){
let exchangeFlag=await this.onmodelChange({target:{value:3}});
exchangeStateData=_.clone(this.state);
@@ -188,6 +203,7 @@ getLandingdata(val){
this.canvasImg.style.display='block';
thumbresult =await this.canvasImgFn();
}else{
+
this.canvasImg.style.display='block';
thumbresult =await this.canvasImgFn();
}
@@ -199,6 +215,8 @@ getLandingdata(val){
"thumb":thumbresult
}
if(mouldType==0){//系统模板新增
+ infoWhite=JSON.parse(sessionStorage.getItem('editorConfig')).whiteList;
+
formdata.sort=exchangeStateData.model.sort;
formdata.type_id=exchangeStateData.model.type_id.key;
let exchangeState=_.clone(exchangeStateData);
diff --git a/src/pages/exchangepage/template/main.js b/src/pages/exchangepage/template/main.js
index 800b25c3..118104b0 100644
--- a/src/pages/exchangepage/template/main.js
+++ b/src/pages/exchangepage/template/main.js
@@ -257,7 +257,7 @@ export default class mytemplate extends React.Component{
this.setState({previewData:exchangedata});
}
}
- onUse(row){
+ onUse(row,type){
console.log(258,row);
let self=this;
if(row.edit == 0)
@@ -265,9 +265,6 @@ export default class mytemplate extends React.Component{
Notify.error("该模板是定制模板无法编辑");
return
}
-
-
-
if(this.state.sourceIndex == 0)
{
copyThemecustom(row.id).then(res=>{
@@ -279,9 +276,12 @@ export default class mytemplate extends React.Component{
sessionStorage.setItem('pageChange',0);
// let link = window.location.href.replace(window.location.hash,"#/edittemplate");
// window.open(link, "_blank")
- window.location.href= "/#/edittemplate"
- },(err)=>{
-
+ if(type){
+ window.location.href= "/#/edittemplate?type="+type;
+ }else{
+ window.location.href= "/#/edittemplate?type="+row.page;
+ }
+ },(err)=>{
})
}).catch(err=>{
});
@@ -292,7 +292,12 @@ export default class mytemplate extends React.Component{
// let link = window.location.href.replace(window.location.hash,"#/home/edittemplate");
// window.open(link, "_blank")
sessionStorage.setItem('mouldType',1);
- window.location.href='/#/edittemplate';
+ // window.location.href='/#/edittemplate';
+ if(type){
+ window.location.href= "/#/edittemplate?type="+type;
+ }else{
+ window.location.href= "/#/edittemplate?type="+row.page;
+ }
sessionStorage.setItem('pageChange',1);
}
@@ -479,8 +484,8 @@ export default class mytemplate extends React.Component{
落地页类型: