提交代码

package.json

@@ -24,6 +24,7 @@
     "echarts": "^4.9.0",
     "jquery": "^3.5.1",
     "ng-zorro-antd": "^9.3.0",
+    "ngx-clipboard": "^12.3.0",
     "ngx-echarts": "^4.2.2",
     "rxjs": "~6.5.4",
     "tslib": "^1.10.0",

src/app/admin/activate/activate-edit/activate-edit.component.ts

@@ -1,12 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
-import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
 import {CouponService} from '../../../services/coupon.service';
 import {ActivateService} from '../../../services/activate.service';
-import {NzUploadFile} from 'ng-zorro-antd';
+import {NzMessageService, NzUploadFile} from 'ng-zorro-antd';
 import {environment} from '../../../../environments/environment';
 import {AgentService} from '../../../services/agent.service';
+import {ActivatedRoute} from '@angular/router';
 
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {
   return new Promise((resolve, reject) => {

src/app/admin/activate/activate-list/activate-list.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
 import {CompanyService} from '../../../services/company.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
 import {CommonsService} from '../../../services/commons.service';
 import {FormBuilder, FormGroup} from '@angular/forms';
 import {Router} from '@angular/router';

src/app/admin/activate/activate-lottery-record/activate-lottery-record.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from "_@angular_forms@9.0.7@@angular/forms";
 import {ActivateService} from "../../../services/activate.service";
 import {IconService} from "../../../services/icon.service";
-import {NzMessageService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd";
 import { Params, ActivatedRoute } from '@angular/router';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
 
 @Component({
   selector: 'app-activate-lottery-record',

src/app/admin/activate/activate.module.ts

@@ -4,9 +4,9 @@ import { CommonModule } from '@angular/common';
 import { ActivateRoutingModule } from './activate-routing.module';
 import { ActivateListComponent } from './activate-list/activate-list.component';
 import { ActivateEditComponent } from './activate-edit/activate-edit.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
 import {SeparateModule} from '../../common/separate/separate.module';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from "../../app-common.module";

src/app/admin/agent/agent-list/agent-list.component.html

@@ -141,8 +141,8 @@
     </form>
 </nz-modal>
 
-<nz-modal [(nzVisible)]="isVisibleDiscount" nzWidth="1000" nzTitle="分配优惠券列表" (nzOnCancel)="handleCancelDiscount()"
+<nz-modal [(nzVisible)]="isVisibleDiscount" nzWidth="1000" nzTitle="代理商优惠券列表" (nzOnCancel)="handleCancelDiscount()"
-          (nzOnOk)="handleCancelDiscount()">
+          (nzOnOk)="handleCancelDiscount()" [nzFooter]="null">
     <nz-table
             class="table"
             #ajaxTableDiscount
@@ -165,6 +165,7 @@
             <th nzWidth="70px">有效天数</th>
             <th nzWidth="100px">截止日期</th>
             <th nzWidth="100px">库存数量</th>
+            <th nzWidth="100px">操作</th>
         </tr>
         </thead>
         <tbody>
@@ -186,6 +187,15 @@
             <td>{{data['highDiscount'].effectiveDay}}</td>
             <td>{{data['highDiscount'].salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.stockCount}}</td>
+            <td>
+                <a nz-dropdown [nzDropdownMenu]="menu">操作列表 <i nz-icon nzType="down"></i></a>
+                <nz-dropdown-menu #menu="nzDropdownMenu">
+                    <ul nz-menu nzSelectable>
+                        <li nz-menu-item (click)="copyReceiveDiscountLink(data.id)">复制领取链接</li>
+                        <li nz-menu-item>分发用户</li>
+                    </ul>
+                </nz-dropdown-menu>
+            </td>
         </tbody>
     </nz-table>
 </nz-modal>

src/app/admin/agent/agent-list/agent-list.component.ts

@@ -8,6 +8,7 @@ import {CommonsService} from '../../../services/commons.service';
 import {AgentService} from '../../../services/agent.service';
 import {DiscountService} from '../../../services/discount.service';
 import {CouponService} from '../../../services/coupon.service';
+import {ClipboardService} from "ngx-clipboard";
 
 @Component({
     selector: 'app-agent-list',
@@ -57,6 +58,7 @@ export class AgentListComponent implements OnInit {
         private iconService: IconService,
         private message: NzMessageService,
         private router: Router,
+        private clipboardService: ClipboardService,
         private common: CommonsService
     ) {
     }
@@ -317,5 +319,17 @@ export class AgentListComponent implements OnInit {
             }
         });
     }
+
+
+    copyReceiveDiscountLink(id: number) {
+        this.agent.getReceiveLink(id, data => {
+           if (data['return_code']) {
+               this.clipboardService.copy(data['return_data']);
+               this.message.success('复制成功');
+           } else {
+               this.message.error('复制失败');
+           }
+        });
+    }
 }
 

src/app/admin/agent/agent.module.ts

@@ -10,6 +10,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from '../../app-common.module';
+import {ClipboardModule} from 'ngx-clipboard';
 
 
 @NgModule({
@@ -23,6 +24,7 @@ import {AppCommonModule} from '../../app-common.module';
         FormsModule,
         BreadcrumbModule,
         RegionSelectorModule,
+        ClipboardModule,
         AppCommonModule
     ]
 })

src/app/admin/api-merchants/api-merchants.module.ts

@@ -3,12 +3,12 @@ import {CommonModule} from '@angular/common';
 
 import {ApiMerchantsRoutingModule} from './api-merchants-routing.module';
 import {ListComponent} from './list/list.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {SeparateModule} from '../../common/separate/separate.module';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from '../../app-common.module';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
 
 @NgModule({

src/app/admin/api-merchants/list/list.component.ts

@@ -1,13 +1,13 @@
 import {Component, OnInit} from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
 import {CouponService} from '../../../services/coupon.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {ApiMerchantsService} from '../../../services/api-merchants.service';
 import {ApiProductService} from '../../../services/api-product.service';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 
 @Component({

src/app/admin/api-product/api-product.module.ts

@@ -3,12 +3,12 @@ import {CommonModule} from '@angular/common';
 
 import {ApiProductRoutingModule} from './api-product-routing.module';
 import {ListComponent} from './list/list.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {SeparateModule} from '../../common/separate/separate.module';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from '../../app-common.module';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
 
 @NgModule({

src/app/admin/api-product/list/list.component.ts

@@ -1,14 +1,14 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
 import {RechargeService} from '../../../services/recharge.service';
 import {DiscountService} from '../../../services/discount.service';
 import {CouponService} from '../../../services/coupon.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {ApiProductService} from '../../../services/api-product.service';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'app-list',

src/app/admin/company-amount/company-amount-record/company-amount-record.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {OrganizationService} from '../../../services/organization.service';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';

src/app/admin/company-amount/company-amount.module.ts

@@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
 
 import { CompanyAmountRoutingModule } from './company-amount-routing.module';
 import { CompanyAmountRecordComponent } from './company-amount-record/company-amount-record.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
+import {NgxEchartsModule} from 'ngx-echarts';
 import { PayPwdComponent } from './pay-pwd/pay-pwd.component';
 
 

src/app/admin/company-amount/pay-pwd/pay-pwd.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormControl, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
 import {ValidatorsService} from '../../../services/validators.service';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {LoginService} from '../../../services/login.service';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {CommonsService} from '../../../services/commons.service';
 import {CompanyTwoPwdService} from '../../../services/company-two-pwd.service';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {IconService} from '../../../services/icon.service';
 
 @Component({

src/app/admin/config-manage/brand/brand.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService, NzModalService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {ConfigService} from '../../../services/config.service';
 
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {

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

@@ -4,11 +4,11 @@ import { CommonModule } from '@angular/common';
 import { ConfigManageRoutingModule } from './config-manage-routing.module';
 import { GoodsTypeComponent } from './goods-type/goods-type.component';
 import { BrandComponent } from './brand/brand.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {SeparateModule} from '../../common/separate/separate.module';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
 
 @NgModule({

src/app/admin/config-manage/goods-type/goods-type.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService, NzModalService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
 import {ConfigService} from '../../../services/config.service';
+import {Router} from '@angular/router';
 
 function getBase64(file: File): Promise<string | ArrayBuffer | null> {
   return new Promise((resolve, reject) => {

src/app/admin/device/device-list/device-list.component.ts

@@ -1,15 +1,15 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {OilCardService} from '../../../services/oil-card.service';
 import {OrganizationService} from '../../../services/organization.service';
 import {CompanyAccountService} from '../../../services/company-account.service';
-import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {ValidatorsService} from '../../../services/validators.service';
 import {DeviceService} from "../../../services/device.service";
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
   selector: 'app-device-list',

src/app/admin/device/device.module.ts

@@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
 
 import { DeviceRoutingModule } from './device-routing.module';
 import { DeviceListComponent } from './device-list/device-list.component';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
+import {NgxEchartsModule} from 'ngx-echarts';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 
 
 @NgModule({

src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {CouponService} from '../../../services/coupon.service';
 import {ActivateService} from '../../../services/activate.service';
 import {NzUploadFile} from 'ng-zorro-antd';

src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {CompanyService} from '../../../services/company.service';
 import {ActivateService} from '../../../services/activate.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {DiscountPackageService} from '../../../services/discount-package.service';
 

src/app/admin/discount-package/discount-package.module.ts

@@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common';
 
 import { DiscountPackageRoutingModule } from './discount-package-routing.module';
 import { DiscountPackageListComponent } from './discount-package-list/discount-package-list.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
 import {SeparateModule} from '../../common/separate/separate.module';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
 import {AppCommonModule} from '../../app-common.module';

src/app/admin/discount-package/inventory-record/inventory-record.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {CompanyService} from '../../../services/company.service';
 import {ActivateService} from '../../../services/activate.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {DiscountPackageService} from '../../../services/discount-package.service';
 

src/app/admin/discount-package/order-list/order-list.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {CompanyService} from '../../../services/company.service';
 import {ActivateService} from '../../../services/activate.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {DiscountPackageService} from '../../../services/discount-package.service';
 

src/app/admin/discount/discount-edit/discount-edit.component.html

@@ -72,8 +72,8 @@
 
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
-                    <nz-form-label [nzFor]="'salesEndTime'" nzRequired>截止日期</nz-form-label>
+                    <nz-form-label [nzFor]="'salesEndTime'" nzRequired>使用截止日期</nz-form-label>
-                    <nz-form-control nzErrorTip="请选择销售截止日期!">
+                    <nz-form-control>
                         <nz-date-picker
                                 nzFormat="yyyy-MM-dd"
                                 [formControlName]="'salesEndTime'"
@@ -90,6 +90,16 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+
+            <div nz-col [nzSpan]="8">
+                <nz-form-item>
+                    <nz-form-label [nzFor]="'effectiveDay'" nzRequired>可领取次数</nz-form-label>
+                    <nz-form-control nzErrorTip="请输入可领取次数!">
+                        <nz-input-number [formControlName]="'receiveNumber'" [nzMin]="0" [nzStep]="1" [nzMax]="999"></nz-input-number>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
+
             <div nz-col [nzSpan]="8">
                 <nz-form-item>
                     <nz-form-label nzRequired>优惠券图片</nz-form-label>

src/app/admin/discount/discount-edit/discount-edit.component.ts

@@ -61,6 +61,7 @@ export class DiscountEditComponent implements OnInit {
             salesEndTime: [null, [Validators.required]],
             useScope: [null, [Validators.required]],
             effectiveDay: [1, [Validators.required]],
+            receiveNumber: [1, [Validators.required]],
             status: [null],
             usingRange: [null],
             createTime: [null],

src/app/admin/discount/discount-list/discount-list.component.html

@@ -73,16 +73,17 @@
             (nzPageSizeChange)="getRequest(false , searchForm.value)">
         <thead nzSingleSort>
         <tr>
-            <th nzWidth="50px">编号</th>
+            <th nzWidth="60px">编号</th>
-            <th nzWidth="80px">优惠券KEY</th>
+            <th nzWidth="150px">优惠券KEY</th>
-            <th nzWidth="80px">优惠券名称</th>
+            <th nzWidth="130px">优惠券名称</th>
-            <th nzWidth="80px">优惠券类型</th>
+            <th nzWidth="100px">优惠券类型</th>
-            <th nzWidth="70px">优惠内容</th>
+            <th nzWidth="100px">优惠内容</th>
-            <th nzWidth="70px">有效天数</th>
+            <th nzWidth="100px">有效天数</th>
+            <th nzWidth="100px">可领取次数</th>
             <th nzWidth="100px">截止日期</th>
             <th nzWidth="100px">创建时间</th>
             <th nzWidth="100px">状态</th>
-            <th nzWidth="80px" nzRight="0px">操作</th>
+            <th nzWidth="110px" nzRight="0px">操作</th>
         </tr>
         </thead>
         <tbody>
@@ -103,8 +104,9 @@
                 </span>
             </td>
             <td>{{data.effectiveDay}}</td>
-            <td>{{data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{data.receiveNumber}}</td>
-            <td>{{data.createTime}}</td>
+            <td>{{data.salesEndTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td>{{data.createTime  | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
             <td>{{data.status | discountStatus}}</td>
             <td nzRight="0px" class="table-td-operation">
 <!--                                <a (click)="getEdit(data.id)"><i nz-icon nzType="form" nzTheme="outline" nz-tooltip="编辑"></i></a>-->

src/app/admin/gas-oil-price/gas-oil-price.module.ts

@@ -3,13 +3,14 @@ import { CommonModule } from '@angular/common';
 
 import { GasOilPriceRoutingModule } from './gas-oil-price-routing.module';
 import { OilPriceOfficialListComponent } from './oil-price-official-list/oil-price-official-list.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
 import { OilPriceTaskListComponent } from './oil-price-task-list/oil-price-task-list.component';
 import { OilPriceTaskEditComponent } from './oil-price-task-edit/oil-price-task-edit.component';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
+import {NgxEchartsModule} from 'ngx-echarts';
 
 
 @NgModule({

src/app/admin/gas-oil-price/oil-price-official-list/oil-price-official-list.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {CommonsService} from '../../../services/commons.service';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {OilPriceOfficialService} from '../../../services/oil-price/oil-price-official.service';
 

src/app/admin/gas-oil-price/oil-price-task-edit/oil-price-task-edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzModalService} from 'ng-zorro-antd';
-import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service';
 import {LocalStorageService} from "../../../services/local-storage.service";

src/app/admin/gas-oil-price/oil-price-task-list/oil-price-task-list.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {CommonsService} from '../../../services/commons.service';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service';
 

src/app/admin/gas-staff/gas-staff-edit/gas-staff-edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzModalService} from 'ng-zorro-antd';
-import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {GasStaffService} from '../../../services/gas-staff.service';
 import {CommonsService} from "../../../services/commons.service";
 import {ValidatorsService} from "../../../services/validators.service";

src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {OrganizationService} from '../../../services/organization.service';
 import {CompanyAccountService} from '../../../services/company-account.service';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {GasStaffService} from '../../../services/gas-staff.service';
 import {CommonsService} from "../../../services/commons.service";

src/app/admin/gas-staff/gas-staff.module.ts

@@ -4,11 +4,11 @@ import { CommonModule } from '@angular/common';
 import { GasStaffRoutingModule } from './gas-staff-routing.module';
 import { GasStaffListComponent } from './gas-staff-list/gas-staff-list.component';
 import { GasStaffEditComponent } from './gas-staff-edit/gas-staff-edit.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
+import {NgxEchartsModule} from 'ngx-echarts';
 
 
 @NgModule({

src/app/admin/gz-sinopec/gz-sinopec.module.ts

@@ -4,10 +4,10 @@ import { CommonModule } from '@angular/common';
 import { GzSinopecRoutingModule } from './gz-sinopec-routing.module';
 import { OfflineAssignComponent } from './offline-assign/offline-assign.component';
 import { UseOrderComponent } from './use-order/use-order.component';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
 
 @NgModule({
   declarations: [OfflineAssignComponent, UseOrderComponent],

src/app/admin/gz-sinopec/offline-assign/offline-assign.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {TyAgentService} from '../../../services/ty-agent.service';
 import {CouponService} from "../../../services/coupon.service";
 import {environment} from "../../../../environments/environment";

src/app/admin/gz-sinopec/use-order/use-order.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {CouponService} from '../../../services/coupon.service';
 
 @Component({

src/app/admin/index/index/index.component.ts

@@ -2,9 +2,9 @@ import {Component, OnInit} from '@angular/core';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {IndexService} from '../../../services/index.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
 import {environment} from '../../../../environments/environment';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 
 @Component({

src/app/admin/index/test/test.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {Params} from '@angular/router';
 import {WebsocketService} from '../../../services/websocket.service';
 

src/app/admin/merchant-store/gas-station-list/gas-station-list.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {CompanyAccountService} from '../../../services/company-account.service';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {IndexService} from '../../../services/index.service';
 import {Validators} from '@angular/forms';

src/app/admin/merchant-store/oli/oli.component.ts

@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {environment} from '../../../../environments/environment';
 import {MerchantStoreService} from '../../../services/merchant-store.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
-import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {LocalStorageService} from '../../../services/local-storage.service';

src/app/admin/oil-card/oil-card-list/oil-card-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {OilCardService} from '../../../services/oil-card.service';
@@ -8,7 +8,7 @@ import {CompanyAccountService} from '../../../services/company-account.service';
 import {OrganizationService} from "../../../services/organization.service";
 import {NavigationComponent} from "../../navigation/navigation.component";
 import {environment} from "../../../../environments/environment";
-import {Router} from "_@angular_router@9.0.7@@angular/router";
+import {Router} from "@angular/router";
 import {ValidatorsService} from "../../../services/validators.service";
 
 @Component({

src/app/admin/oil-card/oil-card-op-record-list/oil-card-op-record-list.component.ts

@@ -1,14 +1,14 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from "_@angular_forms@9.0.7@@angular/forms";
-import {NzMessageService, NzModalService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd";
 import {LocalStorageService} from "../../../services/local-storage.service";
 import {OilCardService} from "../../../services/oil-card.service";
 import {OrganizationService} from "../../../services/organization.service";
 import {NavigationComponent} from "../../navigation/navigation.component";
 import {CompanyAccountService} from "../../../services/company-account.service";
-import {ActivatedRoute} from "_@angular_router@9.0.7@@angular/router";
-import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
 
+import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
+import {FormBuilder, FormGroup} from "@angular/forms";
+import {ActivatedRoute} from "@angular/router";
 @Component({
   selector: 'app-oil-card-op-record-list',
   templateUrl: './oil-card-op-record-list.component.html',

src/app/admin/oil-card/oil-card-order/oil-card-order.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {OilCardService} from '../../../services/oil-card.service';
 import {OrganizationService} from '../../../services/organization.service';
 import {NavigationComponent} from '../../navigation/navigation.component';
 import {CompanyAccountService} from '../../../services/company-account.service';
-import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute} from '@angular/router';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {environment} from '../../../../environments/environment';
 

src/app/admin/oil-card/oil-card-record-list/oil-card-record-list.component.ts

@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {OilCardService} from '../../../services/oil-card.service';
 import {OrganizationService} from '../../../services/organization.service';
 import {NavigationComponent} from '../../navigation/navigation.component';
 import {CompanyAccountService} from '../../../services/company-account.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
-import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute} from '@angular/router';
 
 @Component({
   selector: 'app-oil-card-record-list',

src/app/admin/oil-card/oil-card.module.ts

@@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
 
 import { OilCardRoutingModule } from './oil-card-routing.module';
 import { OilCardListComponent } from './oil-card-list/oil-card-list.component';
-import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NgZorroAntdModule} from 'ng-zorro-antd';
-import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
 import {AppCommonModule} from '../../app-common.module';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
+import {NgxEchartsModule} from 'ngx-echarts';
 import { OilCardRecordListComponent } from './oil-card-record-list/oil-card-record-list.component';
 import { OilCardOpRecordListComponent } from './oil-card-op-record-list/oil-card-op-record-list.component';
 import { OilCardOrderComponent } from './oil-card-order/oil-card-order.component';

src/app/admin/order/discount-use-condition-list/discount-use-condition-list.component.ts

@@ -1,12 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
 import {RechargeService} from '../../../services/recharge.service';
 import {DiscountService} from '../../../services/discount.service';
 import {CouponService} from '../../../services/coupon.service';
 import {LocalStorageService} from '../../../services/local-storage.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {NzModalService} from "ng-zorro-antd";
 import {AgentService} from "../../../services/agent.service";

src/app/admin/order/oil-station-order/oil-station-order.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {OrderService} from '../../../services/order.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CompanyService} from '../../../services/company.service';
 import {MerchantService} from '../../../services/merchant.service';
 import {LocalStorageService} from '../../../services/local-storage.service';

src/app/admin/order/order-agent/order-agent.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {OrderService} from '../../../services/order.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CompanyService} from '../../../services/company.service';
 import {MerchantService} from '../../../services/merchant.service';
 import {CommonsService} from '../../../services/commons.service';

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

@@ -21,7 +21,7 @@ import { PreOrderComponent } from './pre-order/pre-order.component';
 import { PackageRecordListComponent } from './package-record-list/package-record-list.component';
 import { DiscountUseConditionListComponent } from './discount-use-condition-list/discount-use-condition-list.component';
 import {DicountPackageOrderListComponent} from "./dicount-package-order-list/dicount-package-order-list.component";
-import {NzSpaceModule} from "_ng-zorro-antd@9.3.0@ng-zorro-antd/space";
+import {NzSpaceModule} from "ng-zorro-antd/space";
 import { OilStationOrderComponent } from './oil-station-order/oil-station-order.component';
 
 @NgModule({

src/app/admin/order/package-record-list/package-record-list.component.ts

@@ -1,11 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {CompanyService} from '../../../services/company.service';
 import {ActivateService} from '../../../services/activate.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
-import {Router} from '_@angular_router@9.0.7@@angular/router';
+import {Router} from '@angular/router';
 import {CommonsService} from '../../../services/commons.service';
 import {DiscountPackageService} from '../../../services/discount-package.service';
 

src/app/admin/tuanyou-agent/order-st/order-st.component.ts

@@ -1,8 +1,8 @@
 import {Component, OnInit} from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
 import {AuditService} from '../../../services/audit.service';
 import {IconService} from '../../../services/icon.service';
-import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService} from 'ng-zorro-antd';
 import {CommonsService} from '../../../services/commons.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {LocalStorageService} from '../../../services/local-storage.service';

src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {TyAgentOilStationService} from '../../../../services/ty-agent-oil-station.service';
 import {ADMIN_INFO_OBJECT} from "../../../../services/local-storage.namespace";
 import {LocalStorageService} from "../../../../services/local-storage.service";

src/app/admin/tuanyou-agent/petrol-station-manage/petrol-station-manage.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {TyAgentService} from '../../../services/ty-agent.service';
 import {TyAgentOilStationService} from '../../../services/ty-agent-oil-station.service';
 import {Validators} from '@angular/forms';

src/app/admin/tuanyou-agent/tuanyou-agent.module.ts

@@ -13,7 +13,7 @@ import { TySalesmanListComponent } from './ty-salesman/ty-salesman-list/ty-sales
 import { TySalesmanEditComponent } from './ty-salesman/ty-salesman-edit/ty-salesman-edit.component';
 import { OrderStComponent } from './order-st/order-st.component';
 import { TyOrderListComponent } from './order/ty-order-list/ty-order-list.component';
-import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
+import {NgxEchartsModule} from 'ngx-echarts';
 
 @NgModule({
   declarations: [PetrolStationManageComponent, TyAgentListComponent, TyAgentEditComponent, TySalesmanListComponent, TySalesmanEditComponent, OrderStComponent, TyOrderListComponent],

src/app/admin/tuanyou-agent/ty-agent/ty-agent-list/ty-agent-list.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {TyAgentService} from '../../../../services/ty-agent.service';
 
 @Component({

src/app/admin/tuanyou-agent/ty-salesman/ty-salesman-edit/ty-salesman-edit.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
-import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzModalService} from 'ng-zorro-antd';
-import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 import {TySalesmanService} from '../../../../services/ty-salesman.service';
 
 @Component({

src/app/admin/tuanyou-agent/ty-salesman/ty-salesman-list/ty-salesman-list.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
+import {FormBuilder, FormGroup} from '@angular/forms';
-import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
+import {NzMessageService, NzModalService} from 'ng-zorro-antd';
 import {TySalesmanService} from '../../../../services/ty-salesman.service';
 import {ADMIN_INFO_OBJECT} from "../../../../services/local-storage.namespace";
 import {LocalStorageService} from "../../../../services/local-storage.service";
-import {ActivatedRoute} from "_@angular_router@9.0.7@@angular/router";
+import {ActivatedRoute} from "@angular/router";
 
 @Component({
   selector: 'app-ty-salesman-list',

src/app/services/activate.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/agent.service.ts

@@ -185,4 +185,10 @@ export class AgentService {
             callBack(data);
         });
     }
+
+    public getReceiveLink(id: number, callBack) {
+        this.http.get(environment.baseUrl + 'discountAgentRel/getReceiveLink?id=' + id).subscribe(data => {
+            callBack(data);
+        });
+    }
 }

src/app/services/api-merchants.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from "_@angular_common@9.0.7@@angular/common/http";
 import {CommonsService} from './commons.service';
 import {environment} from "../../environments/environment";
+import {HttpClient} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'

src/app/services/api-product.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from "../../environments/environment";
+import {HttpClient} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'

src/app/services/company-account.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/company-two-pwd.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/config.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/device.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/gas-staff.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/gas.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/mer-amount.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/merchant-tripartite-platform.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
+import {HttpClient} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'

src/app/services/oil-card.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/oil-price/oil-price-official.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from '../commons.service';
 import {environment} from '../../../environments/environment';
 

src/app/services/oil-price/oil-price-task.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from '../commons.service';
 import {environment} from '../../../environments/environment';
 

src/app/services/organization.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/ty-agent-oil-station.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/ty-agent-price.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from "_@angular_common@9.0.7@@angular/common/http";
 import {CommonsService} from "./commons.service";
 import {environment} from "../../environments/environment";
+import {HttpClient} from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'

src/app/services/ty-agent.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';
 

src/app/services/ty-salesman.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
+import {HttpClient} from  '@angular/common/http';
 import {CommonsService} from './commons.service';
 import {environment} from '../../environments/environment';