From 61f2240ba60ce8b7cf621e3d247390fbd1feb861 Mon Sep 17 00:00:00 2001
From: red-deng-deng <1924913374@qq.com>
Date: Fri, 24 Dec 2021 14:19:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E6=97=A0=E5=9B=9E?=
 =?UTF-8?q?=E9=80=80=EF=BC=8C=E5=8F=96=E6=B6=88=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/subnav/main.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/subnav/main.js b/src/components/subnav/main.js
index aba8a778..fca7ed24 100644
--- a/src/components/subnav/main.js
+++ b/src/components/subnav/main.js
@@ -70,6 +70,7 @@ export default class topNav extends React.Component{
     let sedcbreakflag=pathnamestr.includes('plan-create');   
 	let planbreakflag = pathnamestr.includes('mytempMould')
   let editbreakflag = pathnamestr.includes('edittemplate')
+  let backshow=pathnamestr.includes('key-list')||pathnamestr.includes('exchange-addcommodity');
   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'))
@@ -126,13 +127,13 @@ export default class topNav extends React.Component{
                 return(
                   <div className="nolinkmenu-row" key={key}>
                   {
-                    !history0? <Pop trigger="hover"  position="bottom-center" content="返回">
+                    !history0&&!backshow? <Pop trigger="hover"  position="bottom-center" content="返回">
                     <img  onClick={()=>this.backFn(item.items)}  src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/Marketing/back.svg" alt=""/>
      </Pop>:null
                   }
                   
                
-                  <div className="nonav" style={{borderLeft:!history0?'1px solid #d1cfcf':'none'}}>
+                  <div className="nonav" style={{borderLeft:!history0&&!backshow?'1px solid #d1cfcf':'none'}}>
                   {
                     item.items.map((item2,key2)=>{
                       return(