diff --git a/proxy.conf.js b/proxy.conf.js index 6ca24ab5..2fe9e131 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 32f1b6a4..d6f7b0c7 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -42,6 +42,7 @@ const APPINIT_PROVIDES = [ multi: true }, { provide: DEFAULT_CURRENCY_CODE, useValue: '¥' }, + { provide: RouteReuseStrategy, useClass: ReuseTabStrategy, deps: [ReuseTabService] }, AuthGuard ]; // #endregion @@ -55,6 +56,8 @@ import { SharedModule } from './shared/shared.module'; import { STWidgetModule } from './shared/widget/st-widget.module'; import { registerLocaleData } from '@angular/common'; import { AuthGuard } from './core/guards/auth.guard'; +import { RouteReuseStrategy } from '@angular/router'; +import { ReuseTabService, ReuseTabStrategy } from '@delon/abc/reuse-tab'; @NgModule({ declarations: [AppComponent], diff --git a/src/app/layout/pro/components/menu/menu.component.html b/src/app/layout/pro/components/menu/menu.component.html index 272c43b3..400db4c5 100644 --- a/src/app/layout/pro/components/menu/menu.component.html +++ b/src/app/layout/pro/components/menu/menu.component.html @@ -14,7 +14,7 @@ - {{ i.text }} + {{ i.text }} {{ i.text }} diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index ff67d4cb..adb7e904 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -41,9 +41,6 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen ngOnInit() { this.initSF(); this.initST(); - this.ar.url.subscribe(params => { - this.st?.load(1); - }); } search() { @@ -473,14 +470,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen text: '分配客服
', click: item => this.showService(item) }, - // { - // text: '修改合伙人', - // click: item => this.editPartner(item) - // }, - // { - // text: '修改渠道销售', - // click: item => this.editSale(item) - // } + { + text: '修改合伙人', + click: item => this.editPartner(item) + }, + { + text: '修改渠道销售', + click: item => this.editSale(item) + } ] } ];