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

fix: 

1、修复兑换码复制 商品不能编辑问题
2、修复新增兑换码没有默认剩余数量、已使用数量问题
3、注释无用代码 待删除
This commit is contained in:
wangsongsole 2022-10-12 15:45:59 +08:00
parent 6b0440837c
commit e3c81251f9
3 changed files with 920 additions and 946 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,13 +1,13 @@
import React from "react";
import ReactDOM from "react-dom";
import "./main.less";
import { Pop } from "zent";
import MouseMenu from "../mouseMenu/main.js";
import Bus from "../../assets/eventBus.js";
import { HashRouter as Router, Route, Link } from "react-router-dom";
import React from "react"
import ReactDOM from "react-dom"
import "./main.less"
import { Pop } from "zent"
import MouseMenu from "../mouseMenu/main.js"
import Bus from "../../assets/eventBus.js"
import { HashRouter as Router, Route, Link } from "react-router-dom"
export default class topNav extends React.Component {
constructor(props) {
super(props);
super(props)
this.state = {
pathname: "",
pathname2: sessionStorage.getItem("pathname2"),
@ -17,55 +17,55 @@ export default class topNav extends React.Component {
: [],
linkshowname: sessionStorage.getItem("linkshowname"),
showflag: JSON.parse(sessionStorage.getItem("showflag")),
mouseMenuFlag: false, //控制菜单移入效果
};
this.backFn = this.backFn.bind(this);
mouseMenuFlag: false //控制菜单移入效果
}
this.backFn = this.backFn.bind(this)
}
//点击一级菜单
showlinkmenu(e, item) {
let self = this;
let self = this
try {
item.children.forEach((it) => {
if (it.level === 5) {
sessionStorage.setItem("pathname2", it.router);
throw "终止循环";
sessionStorage.setItem("pathname2", it.router)
throw "终止循环"
}
});
})
} catch (e) {}
self.setState({ linkshowname: item.title });
self.setState({ menulinklist: item.children });
self.setState({ linkshowname: item.title })
self.setState({ menulinklist: item.children })
// 防止刷新页面，导航签清空
sessionStorage.setItem("menulinklist", JSON.stringify(item.children));
sessionStorage.setItem("showflag", true);
sessionStorage.setItem("linkshowname", item.title);
Bus.emit("closeMask", false); //中介传参，关闭弹出框
this.setState({ mouseMenuFlag: false });
sessionStorage.setItem("menulinklist", JSON.stringify(item.children))
sessionStorage.setItem("showflag", true)
sessionStorage.setItem("linkshowname", item.title)
Bus.emit("closeMask", false) //中介传参，关闭弹出框
this.setState({ mouseMenuFlag: false })
}
//鼠标移入
mouseMenuFn() {
this.setState({ mouseMenuFlag: true });
this.props.openMouseMask();
this.setState({ mouseMenuFlag: true })
this.props.openMouseMask()
}
mouseLeaveFn() {
//鼠标移出
this.setState({ mouseMenuFlag: false });
Bus.emit("closeMask", false); //中介传参，关闭弹出框
this.setState({ mouseMenuFlag: false })
Bus.emit("closeMask", false) //中介传参，关闭弹出框
}
btnfn(item2) {
this.setState({ pathname2: item2.router });
this.setState({ showflag: true });
sessionStorage.setItem("showflag", true);
sessionStorage.setItem("pathname2", item2.router);
this.setState({ pathname2: item2.router })
this.setState({ showflag: true })
sessionStorage.setItem("showflag", true)
sessionStorage.setItem("pathname2", item2.router)
}
//返回
backFn(items) {
this.setState({ pathname2: items.router });
sessionStorage.setItem("showflag", true);
sessionStorage.setItem("pathname2", items.router);
window.history.go(-1);
this.setState({ pathname2: items.router })
sessionStorage.setItem("showflag", true)
sessionStorage.setItem("pathname2", items.router)
window.history.go(-1)
if (items.length > 1) {
sessionStorage.setItem("pathname2", items[0].path);
sessionStorage.setItem("pathname2", items[0].path)
}
}
componentDidUpdate(nextProps, nextState) {
@ -74,67 +74,67 @@ export default class topNav extends React.Component {
linkshowname: sessionStorage.getItem("linkshowname"),
menulinklist: JSON.parse(sessionStorage.getItem("menulinklist"))
? JSON.parse(sessionStorage.getItem("menulinklist"))
: [],
});
: []
})
}
}
render() {
let history0 = window.history.length <= 1;
let routeflag = sessionStorage.getItem("showflag");
let breaknav = JSON.parse(sessionStorage.getItem("breaknav"));
let urlHref = window.location.href.replace(/^\/|\/$/g, "");
const pathname = urlHref.lastIndexOf("/");
const pathnamestr = urlHref.substr(pathname);
let history0 = window.history.length <= 1
let routeflag = sessionStorage.getItem("showflag")
let breaknav = JSON.parse(sessionStorage.getItem("breaknav"))
let urlHref = window.location.href.replace(/^\/|\/$/g, "")
const pathname = urlHref.lastIndexOf("/")
const pathnamestr = urlHref.substr(pathname)
let breakflag =
pathnamestr.includes("add") ||
pathnamestr.includes("aid") ||
pathnamestr.includes("exchangecode-copyCode") ||
// pathnamestr.includes("exchangecode-copyCode") ||
pathnamestr.includes("exchangecode-exchangecodeAdd") ||
pathnamestr.includes("distributor-edit") ||
pathnamestr.includes("key-list") ||
pathnamestr.includes("key-detail") ||
pathnamestr.includes("key-edit") ||
pathnamestr.includes("exchangecode-edit") ||
// pathnamestr.includes("exchangecode-edit") ||
pathnamestr.includes("plan-edit") ||
pathnamestr.includes("product-edit") ||
pathnamestr.includes("coupon-commodity");
let sedcbreakflag = pathnamestr.includes("plan-create");
let planbreakflag = pathnamestr.includes("mytempMould");
let editbreakflag = pathnamestr.includes("edittemplate");
pathnamestr.includes("coupon-commodity")
let sedcbreakflag = pathnamestr.includes("plan-create")
let planbreakflag = pathnamestr.includes("mytempMould")
let editbreakflag = pathnamestr.includes("edittemplate")
let backshow =
pathnamestr.includes("account-add") ||
pathnamestr.includes("role-add") ||
pathnamestr.includes("distributor-add") ||
pathnamestr.includes("subaccount-add") ||
pathnamestr.includes("exchangecode-edit") ||
// pathnamestr.includes("exchangecode-edit") ||
pathnamestr.includes("plan-edit") ||
pathnamestr.includes("key-list") ||
pathnamestr.includes("exchange-addcommodity");
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");
pathnamestr.includes("plan-edit")
if (breakchange) {
breaknav = JSON.parse(sessionStorage.getItem("breakchangenav"));
breaknav = JSON.parse(sessionStorage.getItem("breakchangenav"))
}
if (pathnamestr.includes("aid")) {
breaknav = JSON.parse(sessionStorage.getItem("subbreaknav"));
breaknav = JSON.parse(sessionStorage.getItem("subbreaknav"))
}
let accPath = null;
let accPath = null
return (
<div className="topheader">
<div className="nava">
<div className='topheader'>
<div className='nava'>
{this.state.navlists?.map((item, i) => {
try {
item.children.forEach((it) => {
if (it.level === 5) {
accPath = it.router;
throw "终止循环";
accPath = it.router
throw "终止循环"
}
});
})
} catch (e) {}
return item.children && item.children.length > 0 ? (
<Link
@ -145,7 +145,7 @@ export default class topNav extends React.Component {
? {
width: "#100%",
background: "#f2f4f7",
color: "#296bef",
color: "#296bef"
}
: null
}
@ -154,14 +154,13 @@ export default class topNav extends React.Component {
}
onClick={(e) => this.showlinkmenu(e, item)}
onMouseEnter={this.mouseMenuFn.bind(this)}
onMouseLeave={this.mouseLeaveFn.bind(this)}
>
onMouseLeave={this.mouseLeaveFn.bind(this)}>
{item.title}
</Link>
) : null;
) : null
})}
{this.state.mouseMenuFlag ? (
<div className="moveMenu">
<div className='moveMenu'>
<MouseMenu
mouseEnter={this.mouseMenuFn.bind(this)}
mouseLeaveFn={this.mouseLeaveFn.bind(this)}
@ -176,9 +175,9 @@ export default class topNav extends React.Component {
this.state.menulinklist != "" &&
breakflag == false &&
routeflag == "true" ? (
<div className="linkmenu">
<div className="dflexaj navshow">
<div className="linkmenu-row">
<div className='linkmenu'>
<div className='dflexaj navshow'>
<div className='linkmenu-row'>
{this.state.menulinklist.map((item, key) => {
return item.level == 5 ? (
<Link
@ -191,11 +190,10 @@ export default class topNav extends React.Component {
.length > 1
? "menuactive"
: ""
}
>
}>
{item.title}
</Link>
) : null;
) : null
})}
</div>
<span>数据最后更新时间:{window.timeshow}</span>
@ -207,55 +205,52 @@ export default class topNav extends React.Component {
breakflag == true &&
breaknav != null &&
routeflag == "true" ? (
<div className="linkmenu">
<div className='linkmenu'>
{breaknav.map((item, key) => {
return (
<div className="nolinkmenu-row" key={key}>
<div className='nolinkmenu-row' key={key}>
{!history0 && !backshow ? (
<Pop
trigger="hover"
position="bottom-center"
content="返回"
>
trigger='hover'
position='bottom-center'
content='返回'>
<img
onClick={() => this.backFn(item.items)}
src="https://lsxdemall.oss-cn-beijing.aliyuncs.com/Marketing/back.svg"
alt=""
src='https://lsxdemall.oss-cn-beijing.aliyuncs.com/Marketing/back.svg'
alt=''
/>
</Pop>
) : null}
<div
className="nonav"
className='nonav'
style={{
borderLeft:
!history0 && !backshow ? "1px solid #d1cfcf" : "none",
}}
>
!history0 && !backshow ? "1px solid #d1cfcf" : "none"
}}>
{item.items.map((item2, key2) => {
return (
<div className="dflexa" key={key2}>
<div className='dflexa' key={key2}>
{key2 != 0 ? <span>{">"} </span> : null}
<font
className={
key2 + 1 == breaknav[0].items.length
? "nomenuactive"
: ""
}
>
}>
{" "}
{item2.name}
</font>
</div>
);
)
})}
</div>
</div>
);
)
})}
</div>
) : null}
</div>
);
)
}
}

1495
src/pages/exchangecode/exchangecodeAdd/index.jsx
View File

File diff suppressed because it is too large Load Diff

198
src/router/index.js
View File

@ -1,265 +1,265 @@
import Extension from "@/pages/extension/main/main";
import Overview from "@/pages/overview/main/main";
import Distributor from "@/pages/distributor/main/main";
import ExchangeCodeList from "@/pages/exchangecode/list/list";
import ExchangeCodeAdd from "@/pages/exchangecode/add/add";
import ExchangeCodeEdit from "@/pages/exchangecode/edit/edit";
import ExchangeCommodity from "@/pages/exchangecode/commodity/commodity";
import ProductEdit from "@/pages/exchangecode/commodity/goodedit.js";
import ExchangePage from "@/pages/exchangepage/main/main";
import OrderList from "@/pages/order/list/list";
import OrderDetails from "@/pages/order/more/more";
import OrderAdd from "@/pages/order/add/add";
import Plan from "@/pages/plan/main/main";
import PlanList from "@/pages/plan/list/list";
import PlanAdd from "@/pages/plan/add/add";
import PlanEdit from "@/pages/plan/add/edit";
import PlanEditCopy from "@/pages/plan/add/plan-copy";
import KeyList from "@/pages/plan/key/list";
import KeysList from "@/pages/plan/keyList";
import KeyOrderList from "@/pages/plan/keyorder/keyorder";
import KeyEdit from "@/pages/plan/key/edit.js";
import KeyDetail from "@/pages/plan/key/detail/list.js";
import KeyLog from "@/pages/plan/key/detail/log.js";
import AccountList from "@/pages/system/account/list/list";
import AccountAdd from "@/pages/system/account/add/add";
import SubAccountList from "@/pages/system/subAccount/list/list";
import SubAccountAdd from "@/pages/system/subAccount/add/add";
import RoleList from "@/pages/system/role/list/list";
import RoleAdd from "@/pages/system/role/add/add";
import Station from "@/pages/system/station/main";
import Customize from "@/pages/system/customize/main.js";
import MyMould from "@/pages/system/systemMould/main.js";
import Menu from "@/pages/system/menu/main/main";
import DistriButorList from "@/pages/distributor/list/list";
import DistriButorAdd from "@/pages/distributor/add/add";
import DistriButorEdit from "@/pages/distributor/add/add";
import MyTempMouldAdd from "@/pages/exchangepage/template/main.js";
import MyExChangeTemplate from "@/pages/exchangepage/mytemplate/main.js";
import CopyCode from "@/pages/exchangecode/copyCode/index";
import ExchangeCodeAdds from "@/pages/exchangecode/exchangecodeAdd";
import CouponList from "@/pages/coupon/list";
import CouponAddEdit from "@/pages/coupon/addEdit";
import UseCouponCommodity from "@/pages/coupon/commodity";
import Extension from "@/pages/extension/main/main"
import Overview from "@/pages/overview/main/main"
import Distributor from "@/pages/distributor/main/main"
import ExchangeCodeList from "@/pages/exchangecode/list/list"
import ExchangeCodeAdd from "@/pages/exchangecode/add/add"
// import ExchangeCodeEdit from "@/pages/exchangecode/edit/edit"
import ExchangeCommodity from "@/pages/exchangecode/commodity/commodity"
import ProductEdit from "@/pages/exchangecode/commodity/goodedit.js"
import ExchangePage from "@/pages/exchangepage/main/main"
import OrderList from "@/pages/order/list/list"
import OrderDetails from "@/pages/order/more/more"
import OrderAdd from "@/pages/order/add/add"
import Plan from "@/pages/plan/main/main"
import PlanList from "@/pages/plan/list/list"
import PlanAdd from "@/pages/plan/add/add"
import PlanEdit from "@/pages/plan/add/edit"
import PlanEditCopy from "@/pages/plan/add/plan-copy"
import KeyList from "@/pages/plan/key/list"
import KeysList from "@/pages/plan/keyList"
import KeyOrderList from "@/pages/plan/keyorder/keyorder"
import KeyEdit from "@/pages/plan/key/edit.js"
import KeyDetail from "@/pages/plan/key/detail/list.js"
import KeyLog from "@/pages/plan/key/detail/log.js"
import AccountList from "@/pages/system/account/list/list"
import AccountAdd from "@/pages/system/account/add/add"
import SubAccountList from "@/pages/system/subAccount/list/list"
import SubAccountAdd from "@/pages/system/subAccount/add/add"
import RoleList from "@/pages/system/role/list/list"
import RoleAdd from "@/pages/system/role/add/add"
import Station from "@/pages/system/station/main"
import Customize from "@/pages/system/customize/main.js"
import MyMould from "@/pages/system/systemMould/main.js"
import Menu from "@/pages/system/menu/main/main"
import DistriButorList from "@/pages/distributor/list/list"
import DistriButorAdd from "@/pages/distributor/add/add"
import DistriButorEdit from "@/pages/distributor/add/add"
import MyTempMouldAdd from "@/pages/exchangepage/template/main.js"
import MyExChangeTemplate from "@/pages/exchangepage/mytemplate/main.js"
// import CopyCode from "@/pages/exchangecode/copyCode/index";
import ExchangeCodeAdds from "@/pages/exchangecode/exchangecodeAdd"
import CouponList from "@/pages/coupon/list"
import CouponAddEdit from "@/pages/coupon/addEdit"
import UseCouponCommodity from "@/pages/coupon/commodity"
/* 基础路由 */
const router = [
{
path: "/home/extension",
component: Extension,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/overview",
component: Overview,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/distributor",
component: Distributor,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/exchangepage",
component: ExchangePage,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/mytempMould",
component: MyTempMouldAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/myexchangetemplate",
component: MyExChangeTemplate,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/order-list",
component: OrderList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/order-addetails",
component: OrderDetails,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/order-add",
component: OrderAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan",
component: Plan,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan-list",
component: PlanList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan-create",
component: PlanAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan-edit",
component: PlanEdit,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan-edit-copy",
component: PlanEditCopy,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/key-list",
component: KeyList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/plan-keyList",
component: KeysList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/key-edit",
component: KeyEdit,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/key-detail",
component: KeyDetail,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/key-log",
component: KeyLog,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/addkeyorder",
component: KeyOrderList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/account-add",
component: AccountAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/subaccount-list",
component: SubAccountList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/subaccount-add",
component: SubAccountAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/role-list",
component: RoleList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/role-add",
component: RoleAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/station",
component: Station,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/customize",
component: Customize,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/menu",
component: Menu,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/my-mould",
component: MyMould,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/distributor-list",
component: DistriButorList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/distributor-add",
component: DistriButorAdd,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/distributor-edit",
component: DistriButorEdit,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/exchangecode-list",
component: ExchangeCodeList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/exchangecode-add",
component: ExchangeCodeAdd,
meta: { exact: true },
},
{
path: "/home/exchangecode-edit",
component: ExchangeCodeEdit,
meta: { exact: true },
},
{
path: "/home/exchangecode-copyCode",
component: CopyCode,
meta: { exact: true },
meta: { exact: true }
},
// {
// path: "/home/exchangecode-edit",
// component: ExchangeCodeEdit,
// meta: { exact: true }
// },
// {
// path: "/home/exchangecode-copyCode",
// component: CopyCode,
// meta: { exact: true }
// },
{
path: "/home/exchange-addcommodity",
component: ExchangeCommodity,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/product-edit",
component: ProductEdit,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/system/account-list",
component: AccountList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/exchangecode-exchangecodeAdd",
component: ExchangeCodeAdds,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/coupon-list",
component: CouponList,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/coupon-add-edit",
component: CouponAddEdit,
meta: { exact: true },
meta: { exact: true }
},
{
path: "/home/coupon-commodity",
component: UseCouponCommodity,
meta: { exact: true },
},
];
meta: { exact: true }
}
]
/* 不显示路由 */
const noShowSubMenu = [
@ -267,7 +267,7 @@ const noShowSubMenu = [
"/home/overview",
"/home/plan-create",
"/home/mytempMould",
"/home/edittemplate",
];
"/home/edittemplate"
]
export { router, noShowSubMenu };
export { router, noShowSubMenu }