From 2c1cbc42736e5c37e94035aa4dae95e7fc5f4006 Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Thu, 14 Aug 2025 15:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/pages/merchant/merchant.routes.ts | 3 +- .../oil-config/oil-config.component.html | 119 +++++----- .../oil-config/oil-config.component.ts | 133 +++++++---- .../oil-no-config.component.html | 64 ++++++ .../oil-no-config.component.less | 3 + .../oil-no-config/oil-no-config.component.ts | 210 ++++++++++++++++++ .../oil-price-config.component.html | 120 ++++++++++ .../oil-price-config.component.less | 3 + .../oil-price-config.component.ts | 206 +++++++++++++++++ .../order-oil-list.component.html | 20 +- .../order-oil-list.component.ts | 60 ++++- .../order/order-settle-ledger-status.pipe.ts | 32 +++ .../mer-oil-price/oil-gun-no.service.ts | 61 +++++ .../mer-oil-price/oil-price.service.ts | 85 +++++++ .../services/trade/order-refund.service.ts | 2 +- .../services/trade/order-settle.service.ts | 42 ++++ 16 files changed, 1035 insertions(+), 128 deletions(-) create mode 100644 src/app/pages/merchant/oil-no-config/oil-no-config.component.html create mode 100644 src/app/pages/merchant/oil-no-config/oil-no-config.component.less create mode 100644 src/app/pages/merchant/oil-no-config/oil-no-config.component.ts create mode 100644 src/app/pages/merchant/oil-price-config/oil-price-config.component.html create mode 100644 src/app/pages/merchant/oil-price-config/oil-price-config.component.less create mode 100644 src/app/pages/merchant/oil-price-config/oil-price-config.component.ts create mode 100644 src/app/pipes/order/order-settle-ledger-status.pipe.ts create mode 100644 src/app/services/mer-oil-price/oil-gun-no.service.ts create mode 100644 src/app/services/mer-oil-price/oil-price.service.ts create mode 100644 src/app/services/trade/order-settle.service.ts 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 @@