Commit 9205c59b authored by alwayOnlie's avatar alwayOnlie

解决冲突

parent e1f37f92
......@@ -169,8 +169,8 @@ export function onRouteChange({ routes, matchedRoutes, location, action }) {
console.log('onRouteChange')
// 路由切换时, 自动回到顶部
document.body.scrollTop = document.documentElement.scrollTop = 0;
if(location.pathname.includes("memberCenter")) {
// 路由切换的时候记住,使用LRU算法,为首页使用,就是要找到面包屑对应的url衔接,这个算法需要修改一下
if (location.pathname.includes("memberCenter")) {
// 路由切换的时候记住,使用LRU算法,为首页使用,就是要找到面包屑对应的url衔接,这个算法需要修改一下
const breadCrumb = matchedRoutes.slice(2).reduce((prev, current) => {
return prev += "." + current.route.name
}, 'menu')
......
......@@ -38,6 +38,6 @@ export const PublicApi = {
...EnhanceApi,
...ReportApi,
...PurchaseApi,
...ContractApi
...ContractApi,
...PurchaseV2Api,
}
......@@ -12,7 +12,7 @@ const tokenList = [
{ name: 'AfterService', token: '39db719680bf1b3db21bc1deda933cde16d17559e9676bf848ec96c1320e68df', categoryIds: [0], }, // '售后服务'
{ name: 'Enhance', token: '594a7e7ff17f6f40fb9fb726c1da9a3f282a926a8d386eb6cbfd668a3f75f251', categoryIds: [0], }, // 加工服务
{ name: 'Report', token: '69ee5a79363c763ded1a2eb42952a5181ffcdfc5ffb93b6e1e22ac92a25b38bf', categoryIds: [0], }, // 报表服务
{ name: 'Contract', token: 'b376fc4757c974c0d0c635881b732d97062e3ad41d6f00a003d1e249c91789cf', categoryIds: [0], } // 合同能力
{ name: 'Contract', token: 'b376fc4757c974c0d0c635881b732d97062e3ad41d6f00a003d1e249c91789cf', categoryIds: [0], }, // 合同能力
// { name: 'Purchase', token: 'a09e2b66e00079df9881fc660eb17db0265e33362c13f03f2003ba81d26f49d8', categoryIds: [0], }, // 采购服务
{ name: 'Purchase', token: 'a09e2b66e00079df9881fc660eb17db0265e33362c13f03f2003ba81d26f49d8', categoryIds: [0], }, // 采购服务
{ name: 'PurchaseV2', token: '84c81ef877863ad4e2c0ebb2c3b3e80f9539420f2fc0828ef33f5159e8423b2c', categoryIds: [0] }, // 采购服务V2
......
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