HandOver-liuwu
/
frontend
mirror of https://codeup.aliyun.com/lsxd/marketing/frontend.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

This commit is contained in:
姜棚 2021-12-23 11:00:24 +08:00
parent 9770adeb3a 04c5c10581
commit c0e00a6e7d
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/subnav/main.js
View File

@ -66,11 +66,11 @@ export default class topNav extends React.Component{
let pathnameBreak=sessionStorage.getItem('pathname2')
const pathname=window.location.href.lastIndexOf('\/');
const pathnamestr=window.location.href.substr(pathname);
let breakflag=pathnamestr.includes('add')||pathnamestr.includes('aid')||pathnamestr.includes('key-list')||pathnamestr.includes('key-edit')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit')||pathnamestr.includes('product-edit');
let breakflag=pathnamestr.includes('add')||pathnamestr.includes('aid')||pathnamestr.includes('key-list')||pathnamestr.includes('key-detail')||pathnamestr.includes('key-edit')||pathnamestr.includes('exchangecode-edit')||pathnamestr.includes('plan-edit')||pathnamestr.includes('product-edit');
let sedcbreakflag=pathnamestr.includes('plan-create');
let planbreakflag = pathnamestr.includes('mytempMould')
let editbreakflag = pathnamestr.includes('edittemplate')
let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit')||pathnamestr.includes('product-edit')||pathnamestr.includes('plan-edit');
let breakchange = pathnamestr.includes('exchangecode-add')|| pathnamestr.includes('key-edit')||pathnamestr.includes('key-detail')||pathnamestr.includes('product-edit')||pathnamestr.includes('plan-edit');
if(breakchange){
breaknav=JSON.parse(sessionStorage.getItem('breakchangenav'))
}

2
src/pages/home/home.js
View File

@ -299,7 +299,7 @@ export default class App extends Component {
item=activeMenuList.filter(item=>item.id==17);
this.setState({setrender:4});
}
if(pathnameNow.includes('exchangepage')||pathnameNow.includes('edittemplate')){
if(pathnameNow.includes('exchangepage')||pathnameNow.includes('edittemplate')||pathnameNow.includes('myexchangetemplate')){
item=activeMenuList.filter(item=>item.id==18);
this.setState({setrender:5});
}

9
src/pages/login/loginform.js
View File

@ -38,7 +38,7 @@ import {
function FormDom(props) {
const form = Form.useForm(FormStrategy.View);
const [disabled, setDisabled] = React.useState(true);
const [yzmcode, setYzmcode] = React.useState(false);
const [yzmcode, setYzmcode] = React.useState(false);//控制图形验证码
const [acc, setAcc] = React.useState('');
const [pwd, setPwd] = React.useState('');
const [piccode, setPiccode] = React.useState('');
@ -174,7 +174,6 @@ const sendCode=()=>{
}
const sendAcc=(e)=>{
if(e){
setDisabled(false);
setAcc(e);
if(pwd.length>=6&&e.length>=2){
setDisabled(false);
@ -336,13 +335,13 @@ const sendCodeApi=()=>{
name = "code"
props = {
{
placeholder: '请输入验证码',maxLength:5
placeholder: '请输入图形验证码',maxLength:5
}
}
onChange={sendPicCode}
validators = {
[
Validators.required('请输入验证码'),
Validators.required('请输入图形验证码'),
]
}
/> <
@ -361,7 +360,7 @@ const sendCodeApi=()=>{
<FormInputField
style={{width:'60%',marginRight:'2%'}}
name="notecode"
props={{placeholder: '请输入验证码',maxLength:6 }}
props={{placeholder: '请输入短信验证码',maxLength:6 }}
validators={[
Validators.required('请点击右边按钮获取验证码'),

2
src/pages/plan/key/list.js
View File

@ -497,7 +497,7 @@ linkTo(row){
{path:'/home/key-detail',name:row.batch_name+'key码列表'}
]}]
sessionStorage.setItem("plan_item",JSON.stringify(row))
sessionStorage.setItem('breaknav',JSON.stringify(arr));
sessionStorage.setItem('breakchangenav',JSON.stringify(arr));
sessionStorage.setItem('linkshowname',"营销计划管理");
sessionStorage.setItem("key_batch_id",row.id)
this.props.history.push('/home/key-detail');