From 5fced055793d2abe34119454a7ef13dbc0c9ea9d Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 6 Jan 2022 10:44:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8=E8=81=94=E5=8A=A8?=
=?UTF-8?q?=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../exchangepage/edittemplate/detailsPage.js | 45 +++++++++++++------
.../exchangepage/edittemplate/goodsPage.js | 42 +++++++++--------
.../edittemplate/goodstemplate.js | 2 +-
.../edittemplate/goodstemplate.less | 3 +-
.../exchangepage/edittemplate/landingPage.js | 41 ++++++++++-------
src/pages/exchangepage/edittemplate/main.js | 5 +--
src/pages/exchangepage/edittemplate/main.less | 9 ++--
src/pages/order/more/more.js | 2 +-
8 files changed, 91 insertions(+), 58 deletions(-)
diff --git a/src/pages/exchangepage/edittemplate/detailsPage.js b/src/pages/exchangepage/edittemplate/detailsPage.js
index 9946d7aa..86f79603 100644
--- a/src/pages/exchangepage/edittemplate/detailsPage.js
+++ b/src/pages/exchangepage/edittemplate/detailsPage.js
@@ -13,9 +13,9 @@ export default class edittemplate extends React.Component{
super(props)
this.state={
model:{
- id:"",
images:['https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220104/1a07d79a196132fe2fc5a5400c79d23c.png','https://lsxd-yunshanfu.oss-cn-hangzhou.aliyuncs.com/common_image/20220104/7cf0833811a67b38bd03df45a33afa27.png'],
-
+ button_color:'',
+ bg_color:''
}
}
}
@@ -45,12 +45,16 @@ export default class edittemplate extends React.Component{
// 字体颜色
fontcolor(cor){
- this.setState({button_color:cor});
+ let models=this.state.model;
+ models.button_color=cor;
+ this.setState({model:models});
this.props.setdetailftc(cor);
}
// 背景颜色
bgcolor(cor){
- this.setState({bg_color:cor});
+ let models=this.state.model;
+ models.bg_color=cor;
+ this.setState({model:models});
this.props.setdetailbgc(cor);
}
onUpload = (file, report) => {
@@ -99,8 +103,23 @@ export default class edittemplate extends React.Component{
setTimeout(update, 500);
});
- };
-
+ };
+ componentWillMount(){
+ let config=JSON.parse(sessionStorage.getItem('editorConfig'));
+ if(config&&config.detailpage){
+ this.setState({model:config.detailpage});
+ }
+ }
+ componentWillUnmount(){
+ let oldobj=JSON.parse(sessionStorage.getItem('editorConfig'));
+ if(oldobj){
+ oldobj.detailpage=this.state.model;
+ }else{
+ oldobj={}
+ oldobj.detailpage=this.state.model;
+ }
+ sessionStorage.setItem('editorConfig',JSON.stringify(oldobj));
+ }
render(){
return(
@@ -109,18 +128,18 @@ export default class edittemplate extends React.Component{
样式
- {this.bgcolor('#ffffff')}}>
- {this.bgcolor('#000000')}}>
+ {this.bgcolor('#ffffff')}}>
+ {this.bgcolor('#000000')}}>
自定义
- {this.fontcolor('#ffffff')}}>
- {this.fontcolor('#04C160')}}>
- {this.fontcolor('#AE99D3')}}>
- {this.fontcolor('#FACD6A')}}>
- {this.fontcolor('#FE7962')}}>
+ {this.fontcolor('#ffffff')}}>
+ {this.fontcolor('#04C160')}}>
+ {this.fontcolor('#AE99D3')}}>
+ {this.fontcolor('#FACD6A')}}>
+ {this.fontcolor('#FE7962')}}>
自定义
diff --git a/src/pages/exchangepage/edittemplate/goodsPage.js b/src/pages/exchangepage/edittemplate/goodsPage.js
index ec7e0373..207c77e8 100644
--- a/src/pages/exchangepage/edittemplate/goodsPage.js
+++ b/src/pages/exchangepage/edittemplate/goodsPage.js
@@ -44,11 +44,12 @@ export default class edittemplate extends React.Component{
}
componentWillMount(e){
- let config=JSON.parse(sessionStorage.getItem('editorConfig'));
- if(config){
- this.setState({model:config[1]});
- }
+ let config=JSON.parse(sessionStorage.getItem('editorConfig'));
+ if(config&&config.goodspage){
+ this.setState({model:config.goodspage});
+ }
+ console.log(47,this.state.model);
}
onListChange(e){
@@ -98,12 +99,16 @@ export default class edittemplate extends React.Component{
// 字体颜色
fontcolor(cor){
- this.setState({button_color:cor});
+ let models=this.state.model;
+ models.button_color=cor;
+ this.setState({model:models});
this.props.setButtoncolor(cor);
}
// 背景颜色
bgcolor(cor){
- this.setState({bg_color:cor});
+ let models=this.state.model;
+ models.bg_color=cor;
+ this.setState({model:models});
this.props.setButtonbgcolor(cor);
}
onUpload = (file, report) => {
@@ -159,14 +164,13 @@ export default class edittemplate extends React.Component{
componentWillUnmount(){
let oldobj=JSON.parse(sessionStorage.getItem('editorConfig'));
if(oldobj){
- oldobj.push(this.state.model);
- sessionStorage.setItem('editorConfig',JSON.stringify(oldobj));
+ oldobj.goodspage=this.state.model;
}else{
- let obj=[]
- obj.push(this.state.model);
- sessionStorage.setItem('editorConfig',JSON.stringify(obj));
+ oldobj={}
+ oldobj.goodspage=this.state.model;
+
}
-
+ sessionStorage.setItem('editorConfig',JSON.stringify(oldobj));
}
@@ -188,8 +192,8 @@ export default class edittemplate extends React.Component{
{
this.state.model.list==1?
- {this.bgcolor('#ffffff')}}>
- {this.bgcolor('#000000')}}>
+ {this.bgcolor('#ffffff')}}>
+ {this.bgcolor('#000000')}}>
自定义
:null
@@ -197,11 +201,11 @@ export default class edittemplate extends React.Component{
{
this.state.model.list==1?
- {this.fontcolor('#ffffff')}}>
- {this.fontcolor('#04C160')}}>
- {this.fontcolor('#AE99D3')}}>
- {this.fontcolor('#FACD6A')}}>
- {this.fontcolor('#FE7962')}}>
+ {this.fontcolor('#ffffff')}}>
+ {this.fontcolor('#04C160')}}>
+ {this.fontcolor('#AE99D3')}}>
+ {this.fontcolor('#FACD6A')}}>
+ {this.fontcolor('#FE7962')}}>
自定义
diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.js b/src/pages/exchangepage/edittemplate/goodstemplate.js
index df82ac04..88d45c21 100644
--- a/src/pages/exchangepage/edittemplate/goodstemplate.js
+++ b/src/pages/exchangepage/edittemplate/goodstemplate.js
@@ -13,7 +13,7 @@ export default class edittemplate extends React.Component{
{
- this.props.goodsdata.list==1?:this.props.goodsdata.list==3?:
+ this.props.goodsdata.list==1?:this.props.goodsdata.list==3?:
}
{
this.props.goodsdata.list==1? :null
diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.less b/src/pages/exchangepage/edittemplate/goodstemplate.less
index d0794385..8a958199 100644
--- a/src/pages/exchangepage/edittemplate/goodstemplate.less
+++ b/src/pages/exchangepage/edittemplate/goodstemplate.less
@@ -29,7 +29,7 @@
justify-content: center;
width:349px;
color: #fff;
- background: #ccc;
+ background: #E8EAEC;
border-radius: 36px;
height: 36px;
margin:30px 0 0 13px;
@@ -59,5 +59,6 @@
align-items: center;
position: absolute;
bottom: 2%;
+ color: #fff;
}
}
\ No newline at end of file
diff --git a/src/pages/exchangepage/edittemplate/landingPage.js b/src/pages/exchangepage/edittemplate/landingPage.js
index 865eea59..24a23750 100644
--- a/src/pages/exchangepage/edittemplate/landingPage.js
+++ b/src/pages/exchangepage/edittemplate/landingPage.js
@@ -24,10 +24,9 @@ export default class edittemplate extends React.Component{
componentWillMount(e){
let config=JSON.parse(sessionStorage.getItem('editorConfig'));
- if(config){
- this.setState({model:config[0]});
+ if(config&&config.land){
+ this.setState({model:config.land});
}
-
}
onactivityChange(e){
@@ -92,12 +91,16 @@ export default class edittemplate extends React.Component{
// 字体颜色
fontcolor(cor){
- this.setState({button_color:cor});
+ let model1=this.state.model;
+ model1.button_color=cor;
+ this.setState({model:model1});
this.props.landftcolor(cor);
}
// 背景颜色
bgcolor(cor){
- this.setState({bg_color:cor});
+ let model1=this.state.model;
+ model1.bg_color=cor;
+ this.setState({model:model1});
this.props.landbgcolor(cor);
}
onUpload = (file, report) => {
@@ -149,9 +152,15 @@ export default class edittemplate extends React.Component{
//组件将要销毁阶段
componentWillUnmount(){
- let obj=[]
- obj.push(this.state.model);
- sessionStorage.setItem('editorConfig',JSON.stringify(obj));
+
+ let oldobj=JSON.parse(sessionStorage.getItem('editorConfig'));
+ if(oldobj){
+ oldobj.land=this.state.model;
+ }else{
+ oldobj={}
+ oldobj.land=this.state.model;
+ }
+ sessionStorage.setItem('editorConfig',JSON.stringify(oldobj));
}
@@ -192,9 +201,9 @@ export default class edittemplate extends React.Component{
样式
-
{this.bgcolor('#ffffff')}}>
-
{this.bgcolor('#EEEEEE')}}>
-
{this.bgcolor('#000000')}}>
+
{this.bgcolor('#ffffff')}}>
+
{this.bgcolor('#EEEEEE')}}>
+
{this.bgcolor('#000000')}}>
{/*
{this.state.model.button_color} */}
自定义
@@ -202,11 +211,11 @@ export default class edittemplate extends React.Component{
- {this.fontcolor('#ffffff')}}>
- {this.fontcolor('#04C160')}}>
- {this.fontcolor('#AE99D3')}}>
- {this.fontcolor('#FACD6A')}}>
- {this.fontcolor('#FE7962')}}>
+ {this.fontcolor('#ffffff')}}>
+ {this.fontcolor('#04C160')}}>
+ {this.fontcolor('#AE99D3')}}>
+ {this.fontcolor('#FACD6A')}}>
+ {this.fontcolor('#FE7962')}}>
{/* {this.state.model.bg_color} */}
自定义
diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js
index f54e3915..8363f544 100644
--- a/src/pages/exchangepage/edittemplate/main.js
+++ b/src/pages/exchangepage/edittemplate/main.js
@@ -75,9 +75,8 @@ getLandingdata(val){
},500)
}
-
-
componentWillMount(e){
+ sessionStorage.removeItem('editorConfig');
let myInfo = sessionStorage.getItem("pageInfo")
console.log("当前状态",myInfo)
if(myInfo == 0)
@@ -595,7 +594,7 @@ getLandingdata(val){
{
-this.state.goodsConfigure.list==1?:this.state.goodsConfigure.list==3?:
+this.state.goodsConfigure.list==1?:this.state.goodsConfigure.list==3?:
}
{
this.state.goodsConfigure.list==1? :null
diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less
index b3c4b59b..079a3cd0 100644
--- a/src/pages/exchangepage/edittemplate/main.less
+++ b/src/pages/exchangepage/edittemplate/main.less
@@ -1488,7 +1488,7 @@
background: #fff;
border-bottom:1px solid #f3f4f5;
display: flex;
- padding: 0 10px;
+ padding: 0 24px 0 15px;
box-sizing: border-box;
justify-content: space-between;
align-items: center;
@@ -1566,9 +1566,10 @@
.exchangeBtn{
font-size: 10px;
width: 100%;
- background: #eee;
+ background: #E8EAEC;
height: 16px;
border-radius: 8px;
+ color:#fff;
position: absolute;
display: flex;
justify-content: center;
@@ -1609,10 +1610,10 @@
.exchageBtn{
width:90%;
height: 30px;
- font-size: 12px;
+ font-size: 8px;
color: #fff;
height: 20px;
- background: #ccc;
+ background: #E8EAEC;
border-radius: 15px;
margin:10% 5%;
}
diff --git a/src/pages/order/more/more.js b/src/pages/order/more/more.js
index dcd948a7..da93503b 100644
--- a/src/pages/order/more/more.js
+++ b/src/pages/order/more/more.js
@@ -160,7 +160,7 @@ export default class order extends React.Component{
映射商品
- 爱奇艺>[官方-爱奇艺-黄金会员周卡]
+ {orderDetail_data.map_product_name}
官方价