编辑器-优惠券/优惠券白名单静默设定

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',
+      borderColor: '#FFFAF5',
-      bgColor:'#a00',
+      bgColor:'#FFD8BB',
-      fontColor:'#f3f4f5',
+      fontColor:'#ADADAD',
-      placeholder: '请输入关键字搜索'
+      placeholder: '请输入商品名称'
     }
   }
   componentWillMount(e) {

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,

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 (
       <div>
         <div className='control page-title-control'>
@@ -207,9 +210,12 @@ export default class couponLandpage extends React.Component {
         </div>
 
         <div style={{ width: "92%", "margin": "0 auto 60px", "overflow": "auto", "maxHeight": "100%" }}>
-          <div style={{ fontWeight: 'bold' }}>基础设置</div>
+          {
+            this.state.mouldType != 0? <div style={{ fontWeight: 'bold',marginTop:'16px' }}>基础设置{this.state.mouldType}</div>:null
+          }
           <Form model={this.state.model} ref="form1">
-            <FormItem labelname="落地页标题:" prop="title" id="title" labelwidth="100px">
+           {
+             this.state.mouldType != 0?<FormItem labelname="落地页标题:"  labelwidth="100px">
              <Ipt onChange={(e) => {
                let model2 = this.state.model;
                model2.title = e;
@@ -222,11 +228,13 @@ export default class couponLandpage extends React.Component {
                  this.setState({ model: model2 })
                }}
                value={this.state.model.title} placeholder={"请输入"} labelWidth={'0px'} maxLength={12} height={'36px'} width={'300px'} alignment={'left'} />
-            </FormItem>
+           </FormItem>:null
+           }
+            
             <div style={{ marginTop: '20px', marginBottom: '15px', fontWeight: 'bold' }}>样式</div>
             <FormItem labelname="背景颜色:" prop="font_color" id="font_color" labelwidth="80px">
               <div className="colorItembg dfleac">
-                <span className="cicle" style={{ border: '1px solid #f1f2f3' }} className={this.state.model.bg_color == '#ffffff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgcolor('#ffffff') }}></span>
+                <span style={{ border: '1px solid #f1f2f3' }} className={this.state.model.bg_color == '#ffffff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgcolor('#ffffff') }}></span>
                 <span className={this.state.model.bg_color == '#EEEEEE' ? "activecicle cicle cicle1" : "cicle cicle1"} onClick={() => { this.bgcolor('#EEEEEE') }}></span>
                 <span className={this.state.model.bg_color == '#000000' ? "activecicle cicle cicle2" : "cicle cicle2"} onClick={() => { this.bgcolor('#000000') }}></span>
                 <div className="selfset" >

src/pages/exchangepage/edittemplate/landingPage.js

@@ -243,7 +243,7 @@ export default class edittemplate extends React.Component {
   render() {
     return (
       <div style={{ width: "92%", "margin": "0 auto 60px", "overflow": "auto", "maxHeight": "100%" }}>
-        <div style={{ fontWeight: 'bold' }}>基础设置</div>
+        <div style={{ fontWeight: 'bold',marginTop:'16px'  }}>基础设置</div>
 
         <Form model={this.state.model} ref="form1">
           <FormItem labelname="落地页标题:" prop="title" id="title" labelwidth="100px">

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',
+    borderColor: '#FFFAF5',
-    bgColor:'#a00',
+    bgColor:'#FFD8BB',
-    fontColor:'#f3f4f5',
+    fontColor:'#ADADAD',
-    placeholder: '请输入关键字搜索'
+    placeholder: '请输入商品名称'
   },
   title: {
     iswitch: false,
-    text: '商品标题',
+    text: '商品列表',
     textAlign: 'left',
     fontColor: '#333',
     fontSize: 1,

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;
 }

src/pages/exchangepage/edittemplate/whiteLand.js

@@ -239,7 +239,7 @@ export default class edittemplate extends React.Component {
     console.log('白名单', this.state);
     return (
       <div style={{ width: "92%", "margin": "0 auto 60px", "overflow": "auto", "maxHeight": "100%" }}>
-        <div style={{ fontWeight: 'bold' }}>基础设置</div>
+        <div style={{ fontWeight: 'bold',marginTop:'16px'  }}>基础设置</div>
 
         <Form model={this.state.model} ref="form1">
           {
@@ -262,7 +262,7 @@ export default class edittemplate extends React.Component {
           <div style={{ marginTop: '20px', marginBottom: '15px', fontWeight: 'bold' }}>样式</div>
           <FormItem labelname="背景颜色:" prop="font_color" id="font_color" labelwidth="80px">
             <div className="colorItembg dfleac">
-              <span className="cicle" style={{ border: '1px solid #f1f2f3' }} className={this.state.model.bg_color == '#ffffff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgcolor('#ffffff') }}></span>
+              <span  style={{ border: '1px solid #f1f2f3' }} className={this.state.model.bg_color == '#ffffff' ? "cicle activecicle" : "cicle"} onClick={() => { this.bgcolor('#ffffff') }}></span>
               <span className={this.state.model.bg_color == '#EEEEEE' ? "activecicle cicle cicle1" : "cicle cicle1"} onClick={() => { this.bgcolor('#EEEEEE') }}></span>
               <span className={this.state.model.bg_color == '#000000' ? "activecicle cicle cicle2" : "cicle cicle2"} onClick={() => { this.bgcolor('#000000') }}></span>
               <div className="selfset" >