Merge branch 'addMenu' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend into addMenu
This commit is contained in:
wangsongsole
commit
a8148054b5
|
|
@ -188,6 +188,6 @@ resize: none;
|
|||
left: 0;
|
||||
top: 0;
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
z-index: 6;
|
||||
z-index: 66;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,23 @@
|
|||
.mouseMenu {
|
||||
.menuBody {
|
||||
min-width: 40%;
|
||||
margin-left: 320px;
|
||||
// height: 400px;
|
||||
width: 60vw;
|
||||
margin-left: 287px;
|
||||
background: #f1f2f3;
|
||||
position: relative;
|
||||
.first_menu {
|
||||
display: flex;
|
||||
width: 60vw;
|
||||
>div {
|
||||
width: 140px;
|
||||
.menu_items{
|
||||
// justify-content: flex-start;
|
||||
padding: 0;
|
||||
font-size: 14px;
|
||||
color: #333;
|
||||
width: 100%;
|
||||
line-height: 40px;
|
||||
&:hover{
|
||||
background: #f2f4f7;
|
||||
background: #f00;
|
||||
color: #296bef;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -168,9 +168,9 @@
|
|||
.details-reduce{
|
||||
background: #fff;
|
||||
position: relative;
|
||||
#reduceKnockGold{
|
||||
.reduce-pic{
|
||||
width: 100%;
|
||||
position: absolute!important;
|
||||
top: 30px!important;
|
||||
left:0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import Form from "../../../components/form/main"
|
|||
import FormItem from "../../../components/form-item/main"
|
||||
import { uploadImg, handelResponse, getThemeType } from "../../../assets/api.js"
|
||||
import Wangeditor from './wangeditorCom.js'
|
||||
|
||||
export default class edittemplate extends React.Component {
|
||||
constructor(props) {
|
||||
super(props)
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ export default class edittemplate extends React.Component {
|
|||
showPage: 1,
|
||||
fontSize: 10000 / (375 * 0.75),
|
||||
setStyle: { width: '375px', height: '667px', transform: 'scale(0.75)' },
|
||||
detailType: 2 //详情页1 权益 2-立减金
|
||||
detailType: 1 //详情页1 权益 2-立减金
|
||||
}
|
||||
this.canvasImgDom = this.canvasImgDom.bind(this)
|
||||
this.canvasImgDomScr = this.canvasImgDomScr.bind(this)
|
||||
|
|
@ -1067,12 +1067,13 @@ export default class edittemplate extends React.Component {
|
|||
this.ondetailTypeChange(e)
|
||||
}}
|
||||
value={this.state.detailType}>
|
||||
<RadioButton value={2} >
|
||||
立减金
|
||||
</RadioButton>
|
||||
<RadioButton value={1} >
|
||||
权益
|
||||
</RadioButton>
|
||||
<RadioButton value={2} >
|
||||
立减金
|
||||
</RadioButton>
|
||||
|
||||
</RadioGroup>
|
||||
</div>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1667,7 +1667,6 @@
|
|||
box-sizing: border-box;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import React, { Component } from 'react';
|
|||
import "./main.less"
|
||||
import "../../../assets/comm.css"
|
||||
import './goodstemplate.less'
|
||||
import ReducePage from '../../plan/knockGold/mobileCmponent'
|
||||
export default class edittemplate extends React.Component{
|
||||
constructor(props){
|
||||
super(props)
|
||||
|
|
@ -18,7 +17,7 @@ export default class edittemplate extends React.Component{
|
|||
return(
|
||||
<div className="editor-main goodstemplate details-reduce">
|
||||
<img src={'https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/backprepageBtn.png'} className="preBtn"/>
|
||||
<ReducePage data={this.state.data} />
|
||||
<img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/coupon/reduce_pic.png" alt="" className="reduce-pic"/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ export default class previewEffect extends React.Component {
|
|||
showType: 3, //兑换码/白名单/立减金
|
||||
pageStep: 1,
|
||||
showPage: 1,
|
||||
detailType:3
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -40,7 +41,10 @@ export default class previewEffect extends React.Component {
|
|||
this.setState({ setStyle: style, activeHeight: height })
|
||||
}
|
||||
onpageChange(e) {
|
||||
this.setState({ showPage: e.target.value, pageStep: e.target.value })
|
||||
this.setState({ showPage: e.target.value, pageStep: e.target.value,detailType:3 })
|
||||
}
|
||||
ondetailTypeChange(e){
|
||||
this.setState({ detailType: e.target.value,pageStep:e.target.value})
|
||||
}
|
||||
render() {
|
||||
return (
|
||||
|
|
@ -74,6 +78,17 @@ export default class previewEffect extends React.Component {
|
|||
<RadioButton value={3}>详情页</RadioButton>
|
||||
</RadioGroup>
|
||||
</div>
|
||||
{
|
||||
this.state.showPage==3?(
|
||||
<div className='exchange-page'>
|
||||
<p>详情页分类:</p>
|
||||
<RadioGroup onChange={(e) => { this.ondetailTypeChange(e) }} value={this.state.detailType}>
|
||||
<RadioButton value={3}>权 益</RadioButton>
|
||||
<RadioButton value={4}>立减金</RadioButton>
|
||||
</RadioGroup>
|
||||
</div>
|
||||
):null
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -59,15 +59,18 @@ export default class mytemplate extends React.Component {
|
|||
toTopFlag: false,
|
||||
endreq: true,
|
||||
center: "",
|
||||
bottom: ""
|
||||
bottom: "",
|
||||
detailType: 3
|
||||
}
|
||||
}
|
||||
onpageChange(e) {
|
||||
this.setState({ showPage: e.target.value });
|
||||
this.setState({ pageStep: e.target.value });
|
||||
this.setState({ showPage: e.target.value, pageStep: e.target.value,detailType:3 });
|
||||
}
|
||||
ondetailTypeChange(e) {
|
||||
this.setState({ detailType: e.target.value, pageStep: e.target.value })
|
||||
}
|
||||
onTypeChange(e) {
|
||||
this.setState({ showType: e.target.value, pageStep: 1, showPage: 1 });
|
||||
this.setState({ showType: e.target.value, pageStep: 1, showPage: 1,detailType:3 });
|
||||
if (e.target.value == 1) {//白名单
|
||||
let previewwhite = { ...this.state.previewwhite }
|
||||
this.setState({ previewData: previewwhite });
|
||||
|
|
@ -459,6 +462,15 @@ export default class mytemplate extends React.Component {
|
|||
<RadioButton value={3}>详情页</RadioButton>
|
||||
</RadioGroup>
|
||||
</div>
|
||||
{this.state.showPage == 3 ? (
|
||||
<div className='exchange-page'>
|
||||
<p>详情页分类:</p>
|
||||
<RadioGroup onChange={(e) => { this.ondetailTypeChange(e) }} value={this.state.detailType}>
|
||||
<RadioButton value={3}>权 益</RadioButton>
|
||||
<RadioButton value={4}>立减金</RadioButton>
|
||||
</RadioGroup>
|
||||
</div>
|
||||
) : null}
|
||||
<div className="touse">
|
||||
<Button type="primary"
|
||||
onClick={(e) => { this.onUse(this.state.moudleData, this.state.showType) }}> 使用 </Button>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@ export default class acclist extends React.Component {
|
|||
}
|
||||
<button className="exchangeBtn viewdetailBtn" style={{ background: propsData.product_detail.button_color, color: propsData.product_detail.font_color }}>立即兑换</button>
|
||||
</div>
|
||||
) : null
|
||||
) : (<img src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/coupon/reduce_pic.png"/>)
|
||||
|
||||
}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ export default class App extends Component {
|
|||
}
|
||||
state = {
|
||||
visible: false,
|
||||
mouseMenuMask:false,
|
||||
mouseMenuMask: false,
|
||||
setrender: 1,
|
||||
linkshow: "系统管理",
|
||||
isShowSub: true,
|
||||
|
|
@ -157,14 +157,14 @@ export default class App extends Component {
|
|||
currentTime: new Date().getTime(),
|
||||
timeOut: 15 * 60 * 1000, //设置超时时间： 1分
|
||||
};
|
||||
//打开菜单移入遮罩
|
||||
openMouseMask(){
|
||||
this.setState({mouseMenuMask:true});
|
||||
}
|
||||
//打开菜单移入遮罩
|
||||
openMouseMask() {
|
||||
this.setState({ mouseMenuMask: true });
|
||||
}
|
||||
componentDidMount(e) {
|
||||
Bus.addListener('closeMask', (prop) => {
|
||||
console.log(161,this);
|
||||
this.setState({mouseMenuMask:prop});
|
||||
console.log(161, this);
|
||||
this.setState({ mouseMenuMask: prop });
|
||||
})
|
||||
if (this.state.noShowSubMenu.indexOf(this.props.location.pathname) > -1) {
|
||||
this.setState({ isShowSub: false });
|
||||
|
|
@ -172,7 +172,7 @@ export default class App extends Component {
|
|||
this.setState({ isShowSub: true });
|
||||
}
|
||||
}
|
||||
componentWillUnmount() {}
|
||||
componentWillUnmount() { }
|
||||
|
||||
//获取用户信息
|
||||
getUserInfuFn() {
|
||||
|
|
@ -185,17 +185,17 @@ export default class App extends Component {
|
|||
self.setState({ userInfo: response });
|
||||
sessionStorage.setItem("userInfo", JSON.stringify(response));
|
||||
},
|
||||
(err) => {}
|
||||
(err) => { }
|
||||
);
|
||||
})
|
||||
.catch((err) => {});
|
||||
.catch((err) => { });
|
||||
}
|
||||
//修改密码
|
||||
modifyFn() {
|
||||
this.setState({ visible: true });
|
||||
}
|
||||
//修改密码
|
||||
modifyPwdFn() {}
|
||||
modifyPwdFn() { }
|
||||
//退出登录
|
||||
exitFn() {
|
||||
let self = this;
|
||||
|
|
@ -216,7 +216,7 @@ export default class App extends Component {
|
|||
}, 1000);
|
||||
}
|
||||
})
|
||||
.catch((err) => {});
|
||||
.catch((err) => { });
|
||||
},
|
||||
onCancel: this.onCancel,
|
||||
className: "questModal",
|
||||
|
|
@ -251,7 +251,7 @@ export default class App extends Component {
|
|||
sessionStorage.setItem("updatetime", Date.now());
|
||||
sessionStorage.setItem("productsList", JSON.stringify(req.data));
|
||||
},
|
||||
(err) => {}
|
||||
(err) => { }
|
||||
);
|
||||
});
|
||||
}
|
||||
|
|
@ -309,7 +309,7 @@ export default class App extends Component {
|
|||
throw "终止循环";
|
||||
}
|
||||
});
|
||||
} catch (e) {}
|
||||
} catch (e) { }
|
||||
sessionStorage.setItem(
|
||||
"menulinklist",
|
||||
JSON.stringify(item[0].children)
|
||||
|
|
@ -324,11 +324,11 @@ export default class App extends Component {
|
|||
return (
|
||||
<Router>
|
||||
<div className="start dflexajc">
|
||||
|
||||
{
|
||||
this.state.mouseMenuMask?<div className="maskMenu"></div>:null
|
||||
}
|
||||
<div className="header dflexaj boxs">
|
||||
|
||||
{
|
||||
this.state.mouseMenuMask ? <div className="maskMenu"></div> : null
|
||||
}
|
||||
<div className="header boxs">
|
||||
{/* logo */}
|
||||
<div className="log">
|
||||
<img
|
||||
|
|
@ -349,94 +349,81 @@ export default class App extends Component {
|
|||
openMouseMask={this.openMouseMask.bind(this)}
|
||||
/>
|
||||
</div>
|
||||
<div className="navicon">
|
||||
{" "}
|
||||
<img
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logs.svg"
|
||||
alt=""
|
||||
/>{" "}
|
||||
<a
|
||||
href="https://shimo.im/docs/dPkpKZYV7yfNpqOy/"
|
||||
target="_blank"
|
||||
className="help"
|
||||
>
|
||||
更新日志
|
||||
</a>
|
||||
</div>
|
||||
<div className="navicon">
|
||||
{" "}
|
||||
<img
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/help.svg"
|
||||
alt=""
|
||||
/>{" "}
|
||||
<a
|
||||
href="https://shimo.im/docs/wV3VVQP5W6I1nz3y/"
|
||||
target="_blank"
|
||||
className="help"
|
||||
>
|
||||
帮助中心
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{/* 用户头像信息 */}
|
||||
<div className="userImg dflexa">
|
||||
{/* <Link to="https://youzan.com" target="_blank" className="mr15 helpcenter">帮助中心</Link> */}
|
||||
|
||||
{/* {!this.state.userInfo.head? <Avatar size="large"
|
||||
src={this.state.userInfo.head}/>:
|
||||
<Avatar size="large"
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/default.svg"/>}
|
||||
*/}
|
||||
</div>
|
||||
<Pop
|
||||
className="exitPop"
|
||||
trigger="hover"
|
||||
position="bottom-right"
|
||||
content={
|
||||
<div>
|
||||
<div className="exit-box">
|
||||
<p className="exit-header dflexacsa">
|
||||
{this.state.userInfo.head ? (
|
||||
<Avatar size="large" src={this.state.userInfo.head} />
|
||||
) : (
|
||||
<Avatar
|
||||
size="large"
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/default.svg"
|
||||
/>
|
||||
)}
|
||||
<p className="exit-userInfo dflexacs">
|
||||
<span> 姓名:{this.state.userInfo.real_name}</span>
|
||||
<span> 账号:{this.state.userInfo.user_name}</span>
|
||||
</p>
|
||||
</p>
|
||||
<p className="dflexaj">
|
||||
<span
|
||||
onClick={() => {
|
||||
this.exitFn();
|
||||
}}
|
||||
className="exit-btn"
|
||||
>
|
||||
退出
|
||||
</span>
|
||||
<span
|
||||
onClick={() => {
|
||||
this.modifyFn();
|
||||
}}
|
||||
className="modify-btn"
|
||||
>
|
||||
修改密码
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
{/* */}
|
||||
<div className="nameItem">
|
||||
{this.state.userInfo.real_name}
|
||||
<Icon type="down" className="exitIcon" />
|
||||
<div className="nav-person">
|
||||
<div className="navicon">
|
||||
<img
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/logs.svg"
|
||||
alt=""
|
||||
/>
|
||||
<a href="https://shimo.im/docs/dPkpKZYV7yfNpqOy/"
|
||||
target="_blank"
|
||||
className="help">
|
||||
更新日志
|
||||
</a>
|
||||
</div>
|
||||
</Pop>
|
||||
<div className="navicon">
|
||||
<img
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/help.svg"
|
||||
alt=""
|
||||
/>
|
||||
<a
|
||||
href="https://shimo.im/docs/wV3VVQP5W6I1nz3y/"
|
||||
target="_blank"
|
||||
className="help"
|
||||
>
|
||||
帮助中心
|
||||
</a>
|
||||
</div>
|
||||
<Pop
|
||||
className="exitPop"
|
||||
trigger="hover"
|
||||
position="bottom-right"
|
||||
content={
|
||||
<div>
|
||||
<div className="exit-box">
|
||||
<p className="exit-header dflexacsa">
|
||||
{this.state.userInfo.head ? (
|
||||
<Avatar size="large" src={this.state.userInfo.head} />
|
||||
) : (
|
||||
<Avatar
|
||||
size="large"
|
||||
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/MarketingSystem/img/default.svg"
|
||||
/>
|
||||
)}
|
||||
<p className="exit-userInfo dflexacs">
|
||||
<span> 姓名:{this.state.userInfo.real_name}</span>
|
||||
<span> 账号:{this.state.userInfo.user_name}</span>
|
||||
</p>
|
||||
</p>
|
||||
<p className="dflexaj">
|
||||
<span
|
||||
onClick={() => {
|
||||
this.exitFn();
|
||||
}}
|
||||
className="exit-btn"
|
||||
>
|
||||
退出
|
||||
</span>
|
||||
<span
|
||||
onClick={() => {
|
||||
this.modifyFn();
|
||||
}}
|
||||
className="modify-btn"
|
||||
>
|
||||
修改密码
|
||||
</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
>
|
||||
{/* */}
|
||||
<div className="nameItem">
|
||||
{this.state.userInfo.real_name}
|
||||
<Icon type="down" className="exitIcon" />
|
||||
</div>
|
||||
</Pop>
|
||||
</div>
|
||||
</div>
|
||||
<Dialog
|
||||
visible={this.state.visible}
|
||||
|
|
@ -561,7 +548,7 @@ export default class App extends Component {
|
|||
exact={true}
|
||||
component={distributoradd}
|
||||
/>
|
||||
<Route
|
||||
<Route
|
||||
path="/home/distributor-edit"
|
||||
exact={true}
|
||||
component={distributorEdit}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,9 @@
|
|||
top: 0;
|
||||
width: 100%;
|
||||
z-index: 33;
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
padding: 0 20px;
|
||||
}
|
||||
.start .log{
|
||||
|
|
@ -35,7 +38,6 @@
|
|||
font-size: 20px;
|
||||
font-weight: 500;
|
||||
color: #313233;
|
||||
width: 300px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
|
@ -46,12 +48,21 @@
|
|||
}
|
||||
.start .log span{
|
||||
padding-left: 15px;
|
||||
width: 200px;
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
.nav{
|
||||
height: 100%;
|
||||
min-width: 300px;
|
||||
flex:1;
|
||||
width: 60vw;
|
||||
// min-width: 300px;
|
||||
// flex:1;
|
||||
}
|
||||
//导航栏个人信息
|
||||
.nav-person{
|
||||
display: flex;
|
||||
min-width: 130px;
|
||||
flex: 1;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
.start .helpcenter{
|
||||
color: #666;
|
||||
|
|
|
|||
Loading…
Reference in New Issue