Merge branch 'dev' into order

* dev:
  no message
  修改话费订单导出问题
  修改话费订单导出问题
  1
  1
  1
  提交代码
  提交代码
  1
  新增油站生成二维码

# Conflicts:
#	src/app/admin/promotion/distribution-integral-list/distribution-integral-list.component.ts
#	src/app/app-common.module.ts
#	src/app/pipes/index.ts
#	src/app/pipes/paytype.pipe.ts
#	src/environments/environment.ts

src/app/admin/order-manage/order-manage-routing.module.ts

@@ -4,6 +4,7 @@ import {OrderOilListComponent} from './order-oil/order-oil-list/order-oil-list.c
 import {OrderCouponListComponent} from './order-coupon/order-coupon-list/order-coupon-list.component';
 import {OrderIntegralRechargeComponent} from './order-integral-recharge/order-integral-recharge.component';
 import {OrderRefundListComponent} from './order-refund-list/order-refund-list.component';
+import {KfcOrderListComponent} from './kfc-order/kfc-order-list/kfc-order-list.component';
 
 
 const routes: Routes = [

src/app/admin/order-manage/order-manage.module.ts

@@ -10,6 +10,7 @@ import {AppCommonModule} from '../../app-common.module';
 import { OrderCouponListComponent } from './order-coupon/order-coupon-list/order-coupon-list.component';
 import { OrderIntegralRechargeComponent } from './order-integral-recharge/order-integral-recharge.component';
 import { OrderRefundListComponent } from './order-refund-list/order-refund-list.component';
+import {KfcOrderListComponent} from "./kfc-order/kfc-order-list/kfc-order-list.component";
 
 @NgModule({
   declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent],

src/app/admin/promotion/distribution-integral-list/distribution-integral-list.component.ts

@@ -1,10 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
 import {IconService} from '../../../services/icon.service';
-<<<<<<< HEAD
-=======
-import {CommonsService} from '../../../services/commons.service';
->>>>>>> dev
 import {DistributionService} from '../../../services/distribution.service';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {NzMessageService} from 'ng-zorro-antd';

src/app/app-common.module.ts

@@ -61,8 +61,9 @@ import {
     PlatformPipe,
     OilTypePipe,
     OilPriceTaskStatusPipe,
-    OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe
+    OilPriceTaskExecutionTypePipe, OilPriceTaskPriceTypePipe, IntegralTypePipe, IntegralProductPipe, ProductTypePipe
 } from './pipes';
+import {MsgTypePipe} from "./pipes/msg/msg-type.pipe";
 
 
 
@@ -133,11 +134,19 @@ const PIPES = [
     ],
     declarations: [
         ...PIPES,
+        IntegralTypePipe,
+        IntegralProductPipe,
+        ProductTypePipe,
+        MsgTypePipe,
 
     ],
 
     exports: [
         ...PIPES,
+        IntegralTypePipe,
+        IntegralProductPipe,
+        ProductTypePipe,
+        MsgTypePipe,
 
     ],
 })