From 04c5c10581f0b28985421f60b3775037592e38ba Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Thu, 23 Dec 2021 10:11:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0key=E7=A0=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js | 4 ++--
 src/pages/home/home.js        | 2 +-
 src/pages/login/loginform.js  | 9 ++++-----
 src/pages/plan/key/list.js    | 2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index 128afe81..aba8a778 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -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'))
   }
diff --git a/src/pages/home/home.js b/src/pages/home/home.js
index abab6ff8..e3595e7e 100644
--- a/src/pages/home/home.js
+++ b/src/pages/home/home.js
@@ -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});
       }
diff --git a/src/pages/login/loginform.js b/src/pages/login/loginform.js
index 6c988d6c..91dc4b0d 100644
--- a/src/pages/login/loginform.js
+++ b/src/pages/login/loginform.js
@@ -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('请点击右边按钮获取验证码'),
diff --git a/src/pages/plan/key/list.js b/src/pages/plan/key/list.js
index 6aa459fd..291dc407 100644
--- a/src/pages/plan/key/list.js
+++ b/src/pages/plan/key/list.js
@@ -564,7 +564,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');