diff --git a/src/pages/exchangepage/edittemplate/detailsPage.js b/src/pages/exchangepage/edittemplate/detailsPage.js index 788d546d..9efb271e 100644 --- a/src/pages/exchangepage/edittemplate/detailsPage.js +++ b/src/pages/exchangepage/edittemplate/detailsPage.js @@ -1,11 +1,12 @@ import ReactDOM from 'react-dom'; import React, { Component } from 'react'; -import { Button ,ImageUpload,Input ,onUpload} from 'zent'; +import { Button ,ImageUpload,Input ,ColorPicker,onUpload} from 'zent'; import "./main.less" import "../../../assets/comm.css" -import { Notify ,RadioGroup,RadioButton} from 'zent'; +import { Notify ,RadioGroup,RadioButton,Tooltip,Icon} from 'zent'; import Ipt from "../../../components/input/main" import Form from "../../../components/form/main" +import Wangeditor from './wangeditorCom.js' import FormItem from "../../../components/form-item/main" import {uploadImg,handelResponse,addTheme,putMyTheme,putTheme,putSystemTemplate,addSystemTemplate} from "../../../assets/api.js" export default class edittemplate extends React.Component{ @@ -15,24 +16,64 @@ export default class edittemplate extends React.Component{ model:{ images:[], button_color:'', - bg_color:'' + bg_color:'', + suseditorHtml:'', + editorHtml:'', + activityType:'' } } } //活动说明 onactivityChange(e){ - this.setState({activityType:e.target.value}) + let model1=this.state.model; + model1.activityType=e.target.value; + this.setState({model:model1}) + this.props.setdetailActive(e.target.value); } + //悬浮富文本 + getsusEditext(c){ + let model1=this.state.model; + model1.suseditorHtml=c; + this.setState({model:model1}); + this.props.seteditorHtml(c); + } + //富文本 + getEditext(c){ + let model1=this.state.model; + model1.editorHtml=c; + this.setState({model:model1}); + this.props.seteditorHtml(c); + } onUploadChange(files){ if(files.length > 0 && files[0].status == "success") { - let model = this.state.model; - model.images[0] = files[0].src; - this.setState({model:model}) + let model1 = this.state.model; + model1.images[0] = files[0].src; + this.setState({model:model1}) + this.props.setbottomImg(files[0].src); + }else{ + let model1 = this.state.model; + model1.images[0] = ''; + this.setState({model:model1}) + this.props.setbottomImg(""); } }; - + handleChange = (color) => { + let model1=this.state.model; + model1.bg_color=color; + this.setState({ + model:model1 + }); + + } + handleChange1 = (color) => { + let model1=this.state.model; + model1.button_color=color; + this.setState({ + model:model1 + }); +} onUploadError = (type, data) => { if (type === 'overMaxAmount') { @@ -128,45 +169,54 @@ 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')}}> +

+

基础图层
- - {this.onactivityChange(e)} } value={this.state.activityType}> +
+ + {this.onactivityChange(e)} } value={this.state.model.activityType}> 图片 悬浮 富文本 - - {this.onUploadChange(e)} } - onUpload={this.onUpload} - onError={this.onUploadError} - defaultFileList={this.state.model.images[0] ? [{'src':this.state.model.images[2]}] : null} - /> - + + + +
+ { + this.state.model.activityType==1? + {this.onUploadChange(e)} } + onUpload={this.onUpload} + onError={this.onUploadError} + defaultFileList={this.state.model.images[0] ? [{'src':this.state.model.images[0]}] : null} + /> + :this.state.model.activityType==2?this.getsusEditext(c)} />:this.getEditext(c)}/> + } ) diff --git a/src/pages/exchangepage/edittemplate/detailstemplate.js b/src/pages/exchangepage/edittemplate/detailstemplate.js index f0f0b930..0b065aaf 100644 --- a/src/pages/exchangepage/edittemplate/detailstemplate.js +++ b/src/pages/exchangepage/edittemplate/detailstemplate.js @@ -7,8 +7,11 @@ export default class edittemplate extends React.Component{ constructor(props){ super(props) } + opendescFn(){ + this.props.opendesc(true) + } render(){ - + console.log(11,this.props.detaildata); return(
@@ -16,6 +19,12 @@ export default class edittemplate extends React.Component{

+ { + this.props.detaildata.images&&this.props.detaildata.images.length>0?:this.props.detaildata.activeType==3?
:null + } + { + this.props.detaildata.activeType==2?:null + }
) diff --git a/src/pages/exchangepage/edittemplate/goodsPage.js b/src/pages/exchangepage/edittemplate/goodsPage.js index 98ef58fa..be0f5a03 100644 --- a/src/pages/exchangepage/edittemplate/goodsPage.js +++ b/src/pages/exchangepage/edittemplate/goodsPage.js @@ -1,7 +1,7 @@ import ReactDOM from 'react-dom'; import React, { Component } from 'react'; import { HashRouter as Router, Route, Link } from "react-router-dom"; -import { Button ,ColorPicker,ImageUpload,Input ,onUpload} from 'zent'; +import { Button ,ColorPicker,ImageUpload,Input,Tooltip,onUpload} from 'zent'; import "./main.less" import "../../../assets/comm.css" import { Notify,Switch ,RadioGroup,RadioButton,Swiper,Dropdown,DropdownPosition,DropdownClickTrigger,Icon,MenuItem,DropdownContent,Menu ,BlockLoading} from 'zent'; @@ -12,7 +12,7 @@ import {uploadImg,handelResponse,addTheme,putMyTheme,putTheme,putSystemTemplate, import PreviewItem from "../template/preview.js" import html2canvas from 'html2canvas' import Goodstemplate from './goodstemplate' -const ColorBoard = ColorPicker.ColorBoard; +import Wangeditor from './wangeditorCom.js' export default class edittemplate extends React.Component{ constructor(props){ super(props) @@ -29,7 +29,10 @@ export default class edittemplate extends React.Component{ bg_color:"", button_color:"", top_img:null, - list:1 + list:1, + activityType:'', + editorHtml:'', + suseditorHtml:'' }, preview_visible:false, previewData:null, @@ -37,7 +40,7 @@ export default class edittemplate extends React.Component{ isExchangePage:false, isSystemModel:false, thumbfile:'', - activityType:'', + activeNavStatus:1, headfile:'' } @@ -61,7 +64,10 @@ export default class edittemplate extends React.Component{ } //活动说明 onactivityChange(e){ - this.setState({activityType:e.target.value}) + let model1=this.state.model; + model1.activityType=e.target.value; + this.setState({model:model1}) + this.props.setactiveType(e.target.value); } //顶部banner @@ -72,19 +78,42 @@ export default class edittemplate extends React.Component{ model.images[0] = files[0].src; this.setState({model:model}) this.props.setbanner(files[0].src); - } - }; - + }else{ + let model = this.state.model; + model.images[0] =''; + this.setState({model:model}) + this.props.setbanner(""); + } + }; + //悬浮富文本 + getsusEditext(c){ + let model1=this.state.model; + model1.suseditorHtml=c; + this.setState({model:model1}); + this.props.seteditorHtml(c); + } + //富文本 + getEditext(c){ + let model1=this.state.model; + model1.editorHtml=c; + this.setState({model:model1}); + this.props.seteditorHtml(c); + } - + //底部描述图 onUploadChange2(files){ if(files.length > 0 && files[0].status == "success") { let model = this.state.model; model.images[2] = files[0].src; - this.setState({model:model}) - } - + this.setState({model:model}) + this.props.setbottomImg(files[0].src); + }else{ + let model = this.state.model; + model.images[2] =''; + this.setState({model:model}) + this.props.setbottomImg(""); + } }; @@ -96,7 +125,23 @@ export default class edittemplate extends React.Component{ Notify.error(`图片大小不能超过 ${data.formattedMaxSize}`); } }; - + handleChange = (color) => { + let model1=this.state.model; + model1.bg_color=color; + this.setState({ + model:model1 + }); + this.props.setButtonbgcolor(color); + + } + handleChange1 = (color) => { + let model1=this.state.model; + model1.button_color=color; + this.setState({ + model:model1 + }); + this.props.setButtoncolor(color); + } // 字体颜色 fontcolor(cor){ @@ -193,21 +238,24 @@ 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 } { 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')}}> +

+ +

:null @@ -231,29 +279,37 @@ export default class edittemplate extends React.Component{ /> - +
- {this.onactivityChange(e)} } value={this.state.activityType}> + {this.onactivityChange(e)} } value={this.state.model.activityType}> 图片 悬浮 富文本 - - {this.onUploadChange2(e)} } - onUpload={this.onUpload} - onError={this.onUploadError} - defaultFileList={this.state.model.images[2] ? [{'src':this.state.model.images[2]}] : null} - /> - + + + +
+ { + this.state.model.activityType==1? + {this.onUploadChange2(e)} } + onUpload={this.onUpload} + onError={this.onUploadError} + defaultFileList={this.state.model.images[2] ? [{'src':this.state.model.images[2]}] : null} + /> + :this.state.model.activityType==2?this.getsusEditext(c)} />:this.getEditext(c)}/> + } + + diff --git a/src/pages/exchangepage/edittemplate/goodsdesc.js b/src/pages/exchangepage/edittemplate/goodsdesc.js new file mode 100644 index 00000000..0b7501cb --- /dev/null +++ b/src/pages/exchangepage/edittemplate/goodsdesc.js @@ -0,0 +1,27 @@ +import ReactDOM from "react-dom" +import React,{Component} from 'react' +import './goodstemplate.less' +export default class goodsdesc extends React.Component{ + constructor(props){ + super(props) + this.state={ + + } + } + backPre(){ + this.props.backPrepage(0); + } + render(){ + return( +
+

+ 活动规则 +

+ +
+ +
+
+ ) + } +} \ No newline at end of file diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.js b/src/pages/exchangepage/edittemplate/goodstemplate.js index 88d45c21..81ae6c62 100644 --- a/src/pages/exchangepage/edittemplate/goodstemplate.js +++ b/src/pages/exchangepage/edittemplate/goodstemplate.js @@ -6,19 +6,32 @@ import './goodstemplate.less' export default class edittemplate extends React.Component{ constructor(props){ super(props) - } + } + opendescFn(){ + this.props.opendesc(true) + } render(){ return(
+ + - + { + !this.props.goodsdata.banner?: + } + { this.props.goodsdata.list==1?:this.props.goodsdata.list==3?: } { - this.props.goodsdata.list==1? :null - } - + this.props.goodsdata.list==1? :null + } + { + this.props.goodsdata.activeType==1? :this.props.goodsdata.activeType==3?
:null + } + { + this.props.goodsdata.activeType==2?:null + }
) } diff --git a/src/pages/exchangepage/edittemplate/goodstemplate.less b/src/pages/exchangepage/edittemplate/goodstemplate.less index 8a958199..95de79f2 100644 --- a/src/pages/exchangepage/edittemplate/goodstemplate.less +++ b/src/pages/exchangepage/edittemplate/goodstemplate.less @@ -2,6 +2,8 @@ height: 653px; background: #F2F7F8; position: relative; + overflow-y: auto; + overflow-x: hidden; >.preBtn{ position: absolute; width: 28px; @@ -33,11 +35,39 @@ border-radius: 36px; height: 36px; margin:30px 0 0 13px; + &.bottomBtn{ + position: fixed; + top:695px; + } + } + .susactive_tip{ + position: fixed; + top: 143px; + margin-left: 300px; + width: 50px; + height: 50px; + } + .bottomactiveTip{ + width: 349px; + margin:10px 13px 0; + padding: 24px 20px 60px; + box-sizing: border-box; + background: #fff; + border-radius: 4px; + box-shadow: 1px 1px 13px 2px #f1f2f3; + line-height: 1.5rem; + p{ + width: 310px; + } } } .detailstemplate{ position: relative; background: #fff; + padding-bottom: 20px; + .detail_bottomImg{ + width: 100%; + } .topBanner{ width: 100%; height: 373px; @@ -51,14 +81,51 @@ width: 100%; } .exchangeBtn{ - width: 100%; + width:370px; height: 44px; border-radius: 22px; display: flex; justify-content: center; align-items: center; - position: absolute; - bottom: 2%; + position: fixed; + margin-left: 2.5px; + // bottom: 2%; + top: 750px; color: #fff; } +} +.activeTip{ + position: relative; + .imgTip{ + position: absolute; + top: 50%; + left: 60px; + margin-top: -10px; + color: #BABBBD; + cursor: pointer; + font-size: 20px; + } +} +.bottomTip{ + width: 100%; +} +.desc-goods{ + .descript{ + padding: 30px 24px; + box-sizing: border-box; + line-height: 1.5rem; + background: #fff; + color: #45464b!important; + height: 100%; + } + >p{ + width: 100%; + height: 50px; + background: #f7f8f9; + display: flex; + justify-content: center; + align-items: center; + font-weight: bold; + font-size: 16px; + } } \ No newline at end of file diff --git a/src/pages/exchangepage/edittemplate/landingPage.js b/src/pages/exchangepage/edittemplate/landingPage.js index f10473c8..ae84d8b9 100644 --- a/src/pages/exchangepage/edittemplate/landingPage.js +++ b/src/pages/exchangepage/edittemplate/landingPage.js @@ -234,9 +234,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')}}>

@@ -244,11 +244,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')}}>

@@ -332,7 +332,7 @@ export default class edittemplate extends React.Component{ :null } - {this.state.model.activityType==2?this.getEditext(c)}/>:null} + {this.state.model.activityType==2?this.getEditext(c)}/>:null} { this.state.isSystemModel ? ( diff --git a/src/pages/exchangepage/edittemplate/main.js b/src/pages/exchangepage/edittemplate/main.js index 4fcfcec6..888fcf99 100644 --- a/src/pages/exchangepage/edittemplate/main.js +++ b/src/pages/exchangepage/edittemplate/main.js @@ -13,6 +13,7 @@ import PreviewItem from "../template/preview.js" import html2canvas from 'html2canvas' import Goodstemplate from './goodstemplate' import Detailstemplate from './detailstemplate' +import Descteplate from "./goodsdesc" import LandingForm from './landingPage' //落地页表单 import GoodsForm from './goodsPage' //商品页表单 import DetailsPage from './detailsPage' //商品详情页面 @@ -22,6 +23,8 @@ export default class edittemplate extends React.Component{ this.state={ color:"#ffffff", text:"等我两分钟", + activeshow:true,//控制显示 + detailactiveshow:true, showType:1,//兑换码/白名单/立减金 //落地页 model:{ @@ -41,11 +44,17 @@ export default class edittemplate extends React.Component{ list:1, banner:'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/goodstop.png', ftcolor:'', - bgcolor:'' + bgcolor:'', + bottomimg:'', + editorHtml:'', + activeType:'' }, detailConfigure:{ ftcolor:'', - bgcolor:'' + bgcolor:'', + editorHtml:'', + images:[], + activeType:'' }, preview_visible:false, previewData:null, @@ -89,13 +98,11 @@ getLandingdata(val){ if(myInfo == 1) { this.setState({isSystemModel:true}) - console.log(7777) return; } if(myInfo) { myInfo = JSON.parse(myInfo) - let model = { id:myInfo.id, images:myInfo.images.length == 3 ? myInfo.images : this.state.model.images , @@ -111,24 +118,17 @@ getLandingdata(val){ this.setState({isSystemModel:true}) model.sort = myInfo.sort; } - - - if(myInfo.href) { - model.list = parseInt(myInfo.list) model.use = myInfo.use model.link = myInfo.link model.edit= myInfo.edit model.href= myInfo.href - this.setState({isExchangePage:true}) } - this.setState({model:model}) - } } async onSave(){ @@ -212,12 +212,6 @@ getLandingdata(val){ // } // else{ - - - - - - // if(this.state.model.id > 0) // { @@ -265,8 +259,6 @@ getLandingdata(val){ // Notify.error(err) // }) // }); - - // }else{ // addTheme(formdata).then((res)=>{ // handelResponse(res,(req,msg)=>{ @@ -279,16 +271,7 @@ getLandingdata(val){ // Notify.error(err) // }) // }); - - // } - - - - - - - // } // } } @@ -302,6 +285,7 @@ getLandingdata(val){ getlandftcolor(c){ let landConfig=this.state.landConfigure; } + getTitle(c){ let landConfig=this.state.model; landConfig.title=c; @@ -313,6 +297,11 @@ getLandingdata(val){ goodsConfig.banner=c; this.setState({goodsConfig:goodsConfig}); } + getbottomimgFn(c){ + let goodsConfig=this.state.goodsConfigure; + goodsConfig.bottomimg=c; + this.setState({goodsConfig:goodsConfig}); + } //获取商品排列方式 getarrayType(c){ let goodsConfig=this.state.goodsConfigure; @@ -325,6 +314,29 @@ getLandingdata(val){ goodsConfig.ftcolor=c; this.setState({goodsConfig:goodsConfig}); } + //富文本 + getEditorHtmlFn(c){ + let goodsConfig=this.state.goodsConfigure; + goodsConfig.editorHtml=c; + this.setState({goodsConfig:goodsConfig}); + } + //详情页 + getdetailEditorHtmlFn(c){ + let detailpage=this.state.detailConfigure; + detailpage.editorHtml=c; + this.setState({detailConfigure:detailpage}); + } + getdetailActiveFn(c){ + let detailpage=this.state.detailConfigure; + detailpage.activeType=c; + this.setState({detailConfigure:detailpage}); + } + //活动说明类型 + getactiveTypeFn(c){ + let goodsConfig=this.state.goodsConfigure; + goodsConfig.activeType=c; + this.setState({goodsConfig:goodsConfig}); + } //字体颜色 getButtoncolor(c){ let goodsConfig=this.state.goodsConfigure; @@ -351,6 +363,11 @@ getLandingdata(val){ detailConfig.bgcolor=c; this.setState({detailConfigure:detailConfig}); } + getbottomimgFn(c){ + let detailConfig=this.state.detailConfigure; + detailConfig.images[0]=c; + this.setState({detailConfigure:detailConfig}); + } onUploadChange(files){ if(files.length > 0 && files[0].status == "success") { @@ -484,6 +501,9 @@ getLandingdata(val){ bgcolor(cor){ this.setState({bg_color:cor}); } + showactiveIcon(c){ + this.setState({activeshow:false}); + } onUpload = (file, report) => { let self=this; console.log('上传头像',file); @@ -596,14 +616,22 @@ getLandingdata(val){
this.activeChoice(2)} className={this.state.activeNavStatus==2?'activeNav thumbheader' :'thumbheader'}>
- { -this.state.goodsConfigure.list==1?:this.state.goodsConfigure.list==3?: + this.state.goodsConfigure.banner?: + } + + { + this.state.goodsConfigure.list==1?:this.state.goodsConfigure.list==3?: } { - this.state.goodsConfigure.list==1? :null + this.state.goodsConfigure.list==1? :null } - + { + this.state.goodsConfigure.activeType==1? :this.state.goodsConfigure.activeType==3?
:null + } + { + this.state.goodsConfigure.activeType==2?:null + }
@@ -617,7 +645,8 @@ this.state.goodsConfigure.list==1?

-
+ + @@ -684,12 +713,13 @@ this.state.goodsConfigure.list==1?:null } { - this.state.activeNavStatus==2?:null + this.state.activeNavStatus!=2?null:this.state.activeshow&&this.state.goodsConfigure.activeType==2&&this.state.goodsConfigure.editorHtml?this.showactiveIcon(c)} goodsdata={this.state.goodsConfigure}/>:this.setState({activeshow:true})} goodsdata={this.state.goodsConfigure}/> } - { - this.state.activeNavStatus==3?:null + { + this.state.activeNavStatus!=3?null:this.state.detailactiveshow&&this.state.detailConfigure.activeType==2&&this.state.detailConfigure.editorHtml?this.showactiveIcon(c)} goodsdata={this.state.goodsConfigure}/>:this.setState({detailactiveshow:true})} detaildata={this.state.detailConfigure}/> } - + +
@@ -703,20 +733,10 @@ this.state.goodsConfigure.list==1?落地页设置) : this.state.activeNavStatus==2 ? (

商品列表页设置

):(

商品详情页设置

) } - - { - 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.getButtonbgcolor(c)}} setButtoncolor={(c)=>{this.getButtoncolor(c)}} setbanner={(c)=>this.getGoodsbanner(c)} setarrayType={(c)=>this.getarrayType(c)}/>:{this.getdetailbgcolor(c)}} setdetailftc={c=>this.getdetailftcolor(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.getbottomimgFn(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.getdetailftcolor(c)}/> } - - - - - - - - { this.state.preview_visible ? (
@@ -727,19 +747,10 @@ this.state.goodsConfigure.list==1?{this.onClose(e)}} />
- - - - ) :null - - + ) :null } - - - - diff --git a/src/pages/exchangepage/edittemplate/main.less b/src/pages/exchangepage/edittemplate/main.less index 3f25f927..d92a3997 100644 --- a/src/pages/exchangepage/edittemplate/main.less +++ b/src/pages/exchangepage/edittemplate/main.less @@ -1183,33 +1183,75 @@ } .colorItembg,.colorItemfont{ margin-top: -15px; + .cicle::before{ + display: block; + content: ''; + position: absolute; + z-index: 0; + top:-4px; + left: -4px; + width: 28px; + height: 28px; + border-radius: 28px; + background: transparent; + border:1px solid #fff; + + } .cicle{ width: 22px; height: 22px; display: inline-block; border-radius: 22px; - // box-sizing: border-box; background: #fff; - + position: relative; margin-left: 8px; cursor: pointer; - } - .cicle1{ - background:#EEEEEE; - } - .cicle2{ - background:#000; + z-index: 55; + &.activecicle::before{ + border:1px solid #cbe1fd; + } + } .cicle6{ background:#04C160; + &.activecicle::before{ + border:1px solid #04C160; + } } + + .cicle3{ background:#AE99D3; - }.cicle4{ + &.activecicle::before{ + border:1px solid #AE99D3; + } + } + + .cicle4{ background:#FACD6A; + &.activecicle::before{ + border:1px solid #FACD6A; + } }.cicle5{ background:#FE7962; + &.activecicle::before{ + border:1px solid #FE7962; + } } + .cicle1{ + background:#EEEEEE; + &.activecicle::before{ + border:1px solid #EEEEEE; + } + } + .cicle2{ + background:#000; + &.activecicle::before{ + border:1px solid #000; + } + } + + } .selfset{ margin-left: 10px; @@ -1622,9 +1664,33 @@ div{ } .goodsList-item{ position: relative; + height: 100%; + overflow: hidden; .topbanner{ width: 100%; } + .bottom_Img{ + width: 100%; + } + .bottom_activeTip{ + width: 7.2vw; + margin-left: 0.4vw; + padding: 6px; + background: #fff; + border-radius: 2px; + box-shadow: 1px 1px 13px 2px #f1f2f3; + box-sizing: border-box; + line-height:15px; + padding-bottom: 60px; + font-size: 8px; + } + .susactive_Tip{ + position: fixed; + width: 24px; + height: 24px; + margin-top: -7vw; + margin-left:-1.8vw; + } .preBtn{ position: absolute; width: 14px; @@ -1636,7 +1702,13 @@ div{ width:90%; margin-left: 5%; position: relative; - margin-top: -30px; + margin-top: -20px; + } + .bottom_exchageBtn{ + position: absolute; + bottom: 0; + left: 0; + margin: 0 5% 3%!important; } .exchageBtn{ width:90%; diff --git a/src/pages/exchangepage/edittemplate/wangeditorCom.js b/src/pages/exchangepage/edittemplate/wangeditorCom.js index ad10f5fb..b1924d88 100644 --- a/src/pages/exchangepage/edittemplate/wangeditorCom.js +++ b/src/pages/exchangepage/edittemplate/wangeditorCom.js @@ -32,11 +32,18 @@ export default class wangeditor extends React.Component{ }; editor.create() - if(config&&config.land){ - editor.txt.html(config.land.editorHtml) - } - + //列表悬浮富文本 + let editext=""; + if(this.props.pageType=='landeditor'){ + editext=config&&config.land?config.land.editorHtml:'' + }else if(this.props.pageType=='goodeditor'){ + editext=config&&config.goodspage?config.goodspage.editorHtml:'' + }else if(this.props.pageType=='goodsuseditor'){ + editext=config&&config.goodspage?config.goodspage.suseditorHtml:'' } + editor.txt.html(editext) + } + render(){ return(