Commit d9b780b4 authored by rainbowmorel@163.com's avatar rainbowmorel@163.com

Merge branch 'v2-220418' into 20418order

parents ef0a3c95 a62ab3c4
......@@ -18,9 +18,6 @@ import TranactionRoute from './tranactionRoute' // 交易能力路由
// import marketingRoute from './marketingRoute';
// import BalancedRoute from './balanceRoute';
import OrderRoute from './orderRoute'; // 订单能力
import supplierRoute from './supplierRoute'; // 供应商能力
import memberRoute from './memberRoute'; // 会员中心
import asyncRoutes from '../router.config.json';
import ProcurementRoute from './procurementRoute'; // todo wuting
......@@ -29,7 +26,7 @@ import ProcurementRoute from './procurementRoute'; // todo wuting
// import contracRoute from './contracRoute';
// export const routes = [CommodityRoute, MemberRoute, ShopRoute, ChannelRoute, TranactionRoute, AfterService, PayandSettleRoute, LogisticsRoute, AuthConfigRoute, HandlingRoute, BalaceRoute]
const isDev = false;
const isDev = process.env.NODE_ENV === "development";
const homeRoute = {
path: `/memberCenter/home`,
name: 'home',
......@@ -39,7 +36,7 @@ const homeRoute = {
};
// isDev ? [ homeRoute, OrderRoute ] :
// const routes = asyncRoutes;
const routes = isDev ? [homeRoute, OrderRoute, supplierRoute, memberRoute] : asyncRoutes;
const routes = isDev ? [ homeRoute, OrderRoute ] : asyncRoutes;
const memberCenterRoute = {
path: '/memberCenter',
......
......@@ -66,7 +66,7 @@ const DeliveryPlanManagementAwaitB2B: React.FC = () => {
const controllerBtns = (
<Space>
<AuthButton btnCode='create'>
<AuthButton btnCode='awaitB2B.create'>
<Button type='primary' icon={<PlusOutlined />} onClick={() => history.push(`/memberCenter/order/deliveryPlanManagement/awaitB2B/create`)}>新增</Button>
</AuthButton>
</Space>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment