解决B端bug

This commit is contained in:
red-deng-deng 2021-11-28 21:12:44 +08:00
parent d9ab474c85
commit 8a1e770342
8 changed files with 19 additions and 14 deletions

View File

@ -178,5 +178,5 @@ resize: none;
.zent-btn-primary.zent-btn-disabled.zent-btn .zent-btn-primary.zent-btn-disabled.zent-btn
{ {
background-color: #B8BCC2 !important; background-color: #f1f2f3 !important;
} }

View File

@ -115,10 +115,11 @@ const req = (method, url, params, responseType) => {
} }
export const handelResponse = (res, cb, errCb) => { export const handelResponse = (res, cb, errCb) => {
if (res.code == 200) { console.log(118,res);
if (res&&res.code == 200) {
cb(res.data, res.message) cb(res.data, res.message)
} else { } else {
if (typeof errCb == 'function') { if (res&&typeof errCb == 'function') {
errCb(res.message) errCb(res.message)
} }
} }
@ -587,7 +588,7 @@ export const getSystemTemplate= (data) => {
//退出登录接口 //退出登录接口
export const postLogOut = (data) => { export const postLogOut = (data) => {
return req('post', baseurl + "/auth/logout", data) return req('get', baseurl + "/auth/logout", data)
} }
export { export {

View File

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

View File

@ -2,7 +2,7 @@
width: 98%; width: 98%;
margin: 0 auto; margin: 0 auto;
.distable{ .distable{
padding:24px 24px 12px; padding:24px;
box-sizing: border-box; box-sizing: border-box;
} }
.tabpage { .tabpage {

View File

@ -210,15 +210,15 @@ export default class commoditylist extends React.Component{
let activerou=[{pagetitle:'编辑',items:[ let activerou=[{pagetitle:'编辑',items:[
{ {
"path": "/home/exchangecode-list", "path": "/home/exchangecode-list",
"name": "商品管理" "name": "商品范围列表"
}, },
{ {
"path": "/home/product-edit", "path": "/home/product-edit",
"name": "编辑商品" "name": "编辑[ "+rowData.product_name+" ]商品"
} }
]}] ]}]
sessionStorage.setItem("dataInfo",rowData.product_id) sessionStorage.setItem("dataInfo",rowData.product_id)
sessionStorage.setItem('breaknav',JSON.stringify(activerou)); sessionStorage.setItem('breakchangenav',JSON.stringify(activerou));
} }
//敲回车查询 //敲回车查询
sureFn(){ sureFn(){

View File

@ -175,13 +175,13 @@ export default class App extends Component {
onConfirm:()=>{ onConfirm:()=>{
postLogOut().then(res=>{ postLogOut().then(res=>{
console.log(res.code); console.log(res.code);
if(res.code==1002){ if(res.code==200){
setTimeout(()=>{ setTimeout(()=>{
self.props.history.push('/login'); self.props.history.push('/login');
Notify.clear(); Notify.clear();
Notify.success('退出成功!'); Notify.success('退出成功!');
sessionStorage.clear(); sessionStorage.clear();
},100); },1000);
} }
}).catch(err=>{ }).catch(err=>{

View File

@ -8,3 +8,7 @@
margin-top: -8px; margin-top: -8px;
margin-right:-20px; margin-right:-20px;
} }
.orderList .distable{
margin-bottom: 10px;
}

View File

@ -232,7 +232,7 @@ export default class add extends React.Component{
<div className="action-panel"> <div className="action-panel">
<div id="step1" className="step1"> <div id="step1" className="step1">
<div className="plan-title">营销计划</div> <div className="plan-title">营销计划111</div>
<Card style={{ width:'100%' }} title={this.state.step1_pagetitle}> <Card style={{ width:'100%' }} title={this.state.step1_pagetitle}>
<Step1 ref="step1"/> <Step1 ref="step1"/>
</Card> </Card>