diff --git a/src/app/pages/merchant/merchant.routes.ts b/src/app/pages/merchant/merchant.routes.ts index 6046770..e04bf98 100644 --- a/src/app/pages/merchant/merchant.routes.ts +++ b/src/app/pages/merchant/merchant.routes.ts @@ -6,7 +6,6 @@ import {MerchantAmountListComponent} from "./merchant-amount-list/merchant-amoun import {MerChainBrandAmountComponent} from "./mer-chain-brand-amount/mer-chain-brand-amount.component"; import {DeviceListComponent} from "../device/device-list/device-list.component"; import {OilTaskComponent} from "../mer-oil-price/oil-task/oil-task.component"; -import {OilDiscountComponent} from "../mer-oil-price/oil-discount/oil-discount.component"; import {DevicePrintComponent} from "../device/device-print/device-print.component"; import {OilConfigComponent} from "./oil-config/oil-config.component"; import {QrCodeListComponent} from "./qr-code-list/qr-code-list.component"; @@ -15,6 +14,7 @@ import {MerClassGroupListComponent} from "../mer-class-group/mer-class-group-lis import {MerStaffListComponent} from "./mer-staff-list/mer-staff-list.component"; import {MerchantAmountComponent} from "./merchant-amount/merchant-amount.component"; import {OilChannelWeekComponent} from "../mer-oil-price/oil-channel-week/oil-channel-week.component"; +import {OilPriceConfigComponent} from "./oil-price-config/oil-price-config.component"; export const MERCHANT_ROUTES: Routes = [ { path: 'mer-list', component: MerListComponent }, @@ -28,6 +28,7 @@ export const MERCHANT_ROUTES: Routes = [ { path: 'oil-task-list', component: OilTaskComponent }, { path: 'oil-discount-list', component: OilChannelWeekComponent }, { path: 'oil-config', component: OilConfigComponent }, + { path: 'oil-price-config', component: OilPriceConfigComponent }, { path: 'qr-code-list', component: QrCodeListComponent }, { path: 'class-group-list', component: MerClassGroupListComponent }, { path: 'class-group-task-list', component: MerClassGroupTaskComponent }, diff --git a/src/app/pages/merchant/oil-config/oil-config.component.html b/src/app/pages/merchant/oil-config/oil-config.component.html index 4932336..81fad5b 100644 --- a/src/app/pages/merchant/oil-config/oil-config.component.html +++ b/src/app/pages/merchant/oil-config/oil-config.component.html @@ -1,20 +1,10 @@