From 99f4cf4cbd0bef26a8ab24baa368fd35deb895fb Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 12 Oct 2022 11:54: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

---
 .../order-coupon-list.component.html          |  1 +
 .../order-coupon-list.component.scss          |  0
 .../order-coupon-list.component.spec.ts       | 25 +++++++++++++++++++
 .../order-coupon-list.component.ts            | 15 +++++++++++
 .../order-manage-routing.module.ts            |  4 ++-
 .../admin/order-manage/order-manage.module.ts |  3 ++-
 .../order-oil-list.component.html             |  2 +-
 src/app/services/order-manage.service.ts      |  6 ++---
 8 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100644 src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
 create mode 100644 src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.scss
 create mode 100644 src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.spec.ts
 create mode 100644 src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts

diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
new file mode 100644
index 0000000..b68f007
--- /dev/null
+++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
@@ -0,0 +1 @@
+<p>order-coupon-list works!</p>
diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.scss b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.scss
new file mode 100644
index 0000000..e69de29
diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.spec.ts b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.spec.ts
new file mode 100644
index 0000000..c602b9a
--- /dev/null
+++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { OrderCouponListComponent } from './order-coupon-list.component';
+
+describe('OrderCouponListComponent', () => {
+  let component: OrderCouponListComponent;
+  let fixture: ComponentFixture<OrderCouponListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OrderCouponListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrderCouponListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
new file mode 100644
index 0000000..dfd4d8f
--- /dev/null
+++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-order-coupon-list',
+  templateUrl: './order-coupon-list.component.html',
+  styleUrls: ['./order-coupon-list.component.scss']
+})
+export class OrderCouponListComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}
diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts
index 897d37e..0ffb4d9 100644
--- a/src/app/admin/order-manage/order-manage-routing.module.ts
+++ b/src/app/admin/order-manage/order-manage-routing.module.ts
@@ -1,10 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import {OrderOilListComponent} from './order-oil/order-oil-list/order-oil-list.component';
+import {OrderCouponListComponent} from './order-coupon/order-coupon-list/order-coupon-list.component';
 
 
 const routes: Routes = [
-  { path: 'order-oil-list', component: OrderOilListComponent}
+  { path: 'order-oil-list', component: OrderOilListComponent },
+  { path: 'order-coupon-list', component: OrderCouponListComponent }
 ];
 
 @NgModule({
diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts
index 871d67f..2818de9 100644
--- a/src/app/admin/order-manage/order-manage.module.ts
+++ b/src/app/admin/order-manage/order-manage.module.ts
@@ -7,10 +7,11 @@ import {NgZorroAntdModule} from 'ng-zorro-antd';
 import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
+import { OrderCouponListComponent } from './order-coupon/order-coupon-list/order-coupon-list.component';
 
 
 @NgModule({
-  declarations: [OrderOilListComponent],
+  declarations: [OrderOilListComponent, OrderCouponListComponent],
   imports: [
     CommonModule,
     OrderManageRoutingModule,
diff --git a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
index c9c1a88..47885c2 100644
--- a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
+++ b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
@@ -180,7 +180,7 @@
     <div class="inner-content">
         <span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
         <div class="operating-button">
-            <button nz-button nzType="primary" class="right-btn" (click)="excelOrder()"><i nz-icon nzType="plus" nzTheme="outline"></i>导出订单</button>
+            <button nz-button nzType="primary" class="right-btn" (click)="excelOrder()"><i nz-icon nzType="export" nzTheme="outline"></i>导出订单</button>
         </div>
 
         <!--数组表格 -->
diff --git a/src/app/services/order-manage.service.ts b/src/app/services/order-manage.service.ts
index 6776c29..569e64a 100644
--- a/src/app/services/order-manage.service.ts
+++ b/src/app/services/order-manage.service.ts
@@ -34,7 +34,7 @@ export class OrderManageService {
    * @param  callBack   回调
    */
   public getGasOrderList(param: object, callBack) {
-    this.http.get(environment.orderUrl + 'bweb/getGasOrderList?' + this.common.getWhereCondition(param)).subscribe(data => {
+    this.http.get(environment.orderUrl + 'oil/getOilOrderList?' + this.common.getWhereCondition(param)).subscribe(data => {
       callBack(data);
     });
   }
@@ -46,7 +46,7 @@ export class OrderManageService {
    * @param  callBack   回调
    */
   public getGasOrderDetail(orderNo: string, callBack) {
-    this.http.get(environment.orderUrl + 'bweb/getGasOrderDetail?orderNo=' + orderNo).subscribe(data => {
+    this.http.get(environment.orderUrl + 'oil/getOilOrderDetail?orderNo=' + orderNo).subscribe(data => {
       callBack(data);
     });
   }
@@ -58,7 +58,7 @@ export class OrderManageService {
    * @param  callBack   回调
    */
   public exportGasOrderList(param: object, callBack) {
-    this.http.get(environment.orderUrl + 'bweb/exportGasOrder?' + this.common.getWhereCondition(param)).subscribe(data => {
+    this.http.get(environment.orderUrl + 'oil/exportOilOrder?' + this.common.getWhereCondition(param)).subscribe(data => {
       callBack(data);
     });
   }