From cbfb32a6eb98c80da7ef2962437e58b9b0714bfa Mon Sep 17 00:00:00 2001 From: Apple <> Date: Wed, 21 Sep 2022 09:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=99=A8-=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8/=E4=BC=98=E6=83=A0=E5=88=B8=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E9=9D=99=E9=BB=98=E8=AE=BE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goodsPage/config/searchBar.js | 8 ++-- .../couponTemplate/goodsPage/config/title.js | 2 +- .../couponTemplate/landingPage/config/main.js | 42 +++++++++++-------- .../exchangepage/edittemplate/landingPage.js | 2 +- src/pages/exchangepage/edittemplate/main.js | 11 +++-- src/pages/exchangepage/edittemplate/main.less | 1 - .../exchangepage/edittemplate/whiteLand.js | 4 +- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js index c14d6071..79c24042 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/searchBar.js @@ -13,10 +13,10 @@ export default class Searchbar extends React.Component { iswitch:true, shape: 'circular', textAlign: 'center', - borderColor: '#333', - bgColor:'#a00', - fontColor:'#f3f4f5', - placeholder: '请输入关键字搜索' + borderColor: '#FFFAF5', + bgColor:'#FFD8BB', + fontColor:'#ADADAD', + placeholder: '请输入商品名称' } } componentWillMount(e) { diff --git a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js index 426ec9af..d9eab6cc 100644 --- a/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js +++ b/src/pages/exchangepage/couponTemplate/goodsPage/config/title.js @@ -12,7 +12,7 @@ export default class Title extends React.Component { super(props) this.state = { switch:true, - text: '商品标题', + text: '商品列表', textAlign: 'left', fontColor: '#333', fontSize: 1, diff --git a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js index 9dbafb3a..a3a37208 100644 --- a/src/pages/exchangepage/couponTemplate/landingPage/config/main.js +++ b/src/pages/exchangepage/couponTemplate/landingPage/config/main.js @@ -19,12 +19,14 @@ export default class couponLandpage extends React.Component { bg_color: "#EEEEEE", font_color: "#000000", }, + mouldType:'' } } componentWillMount(_e) { let config = JSON.parse(sessionStorage.getItem('editorConfig')); + let mouldType=sessionStorage.getItem('mouldType'); let data = config.coupon.land; - this.setState({ model: data }); + this.setState({ model: data ,mouldType}); } handleChange = (color) => { let model1 = this.state.model; @@ -200,6 +202,7 @@ export default class couponLandpage extends React.Component { render() { + console.log(203,this.props); return (
@@ -207,26 +210,31 @@ export default class couponLandpage extends React.Component {
-
基础设置
+ { + this.state.mouldType != 0?
基础设置{this.state.mouldType}
:null + }
- - { - let model2 = this.state.model; - model2.title = e; - this.setState({ model: model2 }) - this.props.settitle(e) - }} - onClearItem={(_e) => { - let model2 = this.state.model; - model2.title = ""; - this.setState({ model: model2 }) - }} - value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} /> - + { + this.state.mouldType != 0? + { + let model2 = this.state.model; + model2.title = e; + this.setState({ model: model2 }) + this.props.settitle(e) + }} + onClearItem={(_e) => { + let model2 = this.state.model; + model2.title = ""; + this.setState({ model: model2 }) + }} + value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} /> + :null + } +
样式
- { this.bgcolor('#ffffff') }}> + { this.bgcolor('#ffffff') }}> { this.bgcolor('#EEEEEE') }}> { this.bgcolor('#000000') }}>
diff --git a/src/pages/exchangepage/edittemplate/landingPage.js b/src/pages/exchangepage/edittemplate/landingPage.js index d3c8ef01..0b527745 100644 --- a/src/pages/exchangepage/edittemplate/landingPage.js +++ b/src/pages/exchangepage/edittemplate/landingPage.js @@ -243,7 +243,7 @@ export default class edittemplate extends React.Component { render() { return (
-
基础设置
+
基础设置
diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 60d53970..a8628f82 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -17,7 +17,6 @@ import Whitegoods from './whitegoods' //白名单商品页面 import Whitedetails from './whitedetails' //白名单详情页 import Reduce from './reduce' //商品详情页立减金 import ReduceConfig from './reduceConfig' //商品详情立减金页面 - // 优惠券 import CouponLandingForm from '../couponTemplate/landingPage/config/main' //优惠券落地页表单 import CouponGoodsListForm from '../couponTemplate/goodsPage/config/main' //优惠券商品列表页 @@ -79,14 +78,14 @@ let couponProduct_list = { iswitch: false, shape: 'circular', textAlign: 'center', - borderColor: '#333', - bgColor:'#a00', - fontColor:'#f3f4f5', - placeholder: '请输入关键字搜索' + borderColor: '#FFFAF5', + bgColor:'#FFD8BB', + fontColor:'#ADADAD', + placeholder: '请输入商品名称' }, title: { iswitch: false, - text: '商品标题', + text: '商品列表', textAlign: 'left', fontColor: '#333', fontSize: 1, diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less index 3b657f57..9af61a25 100644 --- a/src/pages/exchangepage/edittemplate/main.less +++ b/src/pages/exchangepage/edittemplate/main.less @@ -168,7 +168,6 @@ .page-title-control { border-bottom: 1px solid #eeeff3; - margin-bottom: 16.5px; padding: 17px 0 16px 24px; position: relative; } diff --git a/src/pages/exchangepage/edittemplate/whiteLand.js b/src/pages/exchangepage/edittemplate/whiteLand.js index fcdf3107..71cbd77c 100644 --- a/src/pages/exchangepage/edittemplate/whiteLand.js +++ b/src/pages/exchangepage/edittemplate/whiteLand.js @@ -239,7 +239,7 @@ export default class edittemplate extends React.Component { console.log('白名单', this.state); return (
-
基础设置
+
基础设置
{ @@ -262,7 +262,7 @@ export default class edittemplate extends React.Component {
样式
- { this.bgcolor('#ffffff') }}> + { this.bgcolor('#ffffff') }}> { this.bgcolor('#EEEEEE') }}> { this.bgcolor('#000000') }}>