From 83457546087fe89d323dfa59bb290e3128aec2d4 Mon Sep 17 00:00:00 2001
From: YUANYE <418471657@qq.com>
Date: Fri, 23 Jul 2021 17:23:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 angular.json                                  | 31 +++++++++++++++++--
 .../order-c-list/order-c-list.component.ts    |  7 +++--
 .../order-k-list/order-k-list.component.ts    |  6 ++--
 .../price-list/price-list.component.html      | 10 ++++++
 .../price-list/price-list.component.ts        |  2 ++
 src/environments/environment.cz.ts            | 19 ++++++++++++
 6 files changed, 66 insertions(+), 9 deletions(-)
 create mode 100644 src/environments/environment.cz.ts

diff --git a/angular.json b/angular.json
index 0a5bfcf..cc4e66b 100644
--- a/angular.json
+++ b/angular.json
@@ -97,6 +97,34 @@
                   "maximumError": "10kb"
                 }
               ]
+            },
+            "cz": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.cz.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "4mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
             }
           }
         },
@@ -108,9 +136,6 @@
           "configurations": {
             "production": {
               "browserTarget": "high-web:build:production"
-            },
-            "test": {
-              "browserTarget": "high-web:build:production"
             }
           }
         },
diff --git a/src/app/admin/order/order-c-list/order-c-list.component.ts b/src/app/admin/order/order-c-list/order-c-list.component.ts
index c16d2e2..aab9e26 100644
--- a/src/app/admin/order/order-c-list/order-c-list.component.ts
+++ b/src/app/admin/order/order-c-list/order-c-list.component.ts
@@ -1,13 +1,14 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@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 {Router} from '_@angular_router@9.0.7@@angular/router';
+
 import {CompanyService} from '../../../services/company.service';
 import {MerchantService} from '../../../services/merchant.service';
 import {CommonsService} from '../../../services/commons.service';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'app-order-c-list',
diff --git a/src/app/admin/order/order-k-list/order-k-list.component.ts b/src/app/admin/order/order-k-list/order-k-list.component.ts
index acbb0aa..eeb0cd3 100644
--- a/src/app/admin/order/order-k-list/order-k-list.component.ts
+++ b/src/app/admin/order/order-k-list/order-k-list.component.ts
@@ -1,13 +1,13 @@
 import { Component, OnInit } from '@angular/core';
 import {environment} from '../../../../environments/environment';
-import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@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 {Router} from '_@angular_router@9.0.7@@angular/router';
 import {CompanyService} from '../../../services/company.service';
 import {MerchantService} from '../../../services/merchant.service';
 import {CommonsService} from '../../../services/commons.service';
+import {FormBuilder, FormGroup} from '@angular/forms';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Router} from '@angular/router';
 
 @Component({
   selector: 'app-order-k-list',
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html
index ae6da51..ae70d10 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.html
+++ b/src/app/admin/recharge-order/price-list/price-list.component.html
@@ -56,6 +56,7 @@
         <tr>
             <th>编号</th>
             <th>金额类型</th>
+            <th>供货商编号</th>
             <th>商品ID</th>
             <th>充值金额</th>
             <th>支付金额</th>
@@ -67,6 +68,7 @@
         <tr *ngFor="let data of ajaxTable.data; let i = index">
             <td>{{i + 1}}</td>
             <td>{{data.type | rechargePrice}}</td>
+            <td>{{data.channel}}</td>
             <td>{{data.goodsId}}</td>
             <td>{{data.price}}</td>
             <td>{{data.realPrice}}</td>
@@ -91,6 +93,12 @@
                 </nz-select>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSpan]="6" nzRequired>供货商编号</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请输入供货商编号!">
+                <input [type]="'number'" nz-input formControlName="channel" />
+            </nz-form-control>
+        </nz-form-item>
         <nz-form-item>
             <nz-form-label [nzSpan]="6" nzRequired>商品ID</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请输入商品ID!">
@@ -128,6 +136,7 @@
     <nz-table #basicTable [nzData]="goodsArray">
         <thead>
         <tr>
+            <th>供货商编号</th>
             <th>商品ID</th>
             <th>渠道商标识符</th>
             <th>折扣比例</th>
@@ -138,6 +147,7 @@
         </thead>
         <tbody>
         <tr *ngFor="let data of basicTable.data">
+            <td>{{data.channel}}</td>
             <td>{{data.goodsId}}</td>
             <td>{{data.channelMark | channelMark}}</td>
             <td>{{data.discountRatio}}%</td>
diff --git a/src/app/admin/recharge-order/price-list/price-list.component.ts b/src/app/admin/recharge-order/price-list/price-list.component.ts
index d3b8bc5..7d6f173 100644
--- a/src/app/admin/recharge-order/price-list/price-list.component.ts
+++ b/src/app/admin/recharge-order/price-list/price-list.component.ts
@@ -57,6 +57,7 @@ export class PriceListComponent implements OnInit {
             realPrice: [{value: null, disabled: true}, [Validators.required]],
             goodsId: [null, [Validators.required]],
             discount: [null, [Validators.required]],
+            channel: [null, [Validators.required]],
         });
 
 
@@ -175,6 +176,7 @@ export class PriceListComponent implements OnInit {
     public getMemberGoods(): void {
         this.isVisibleGoods = true;
         this.recharge.getMemberGoods(data => {
+            console.log(data);
             this.goodsArray = data['return_data']['data'];
         });
     }
diff --git a/src/environments/environment.cz.ts b/src/environments/environment.cz.ts
new file mode 100644
index 0000000..7c99483
--- /dev/null
+++ b/src/environments/environment.cz.ts
@@ -0,0 +1,19 @@
+// This file can be replaced during build by using the `fileReplacements` array.
+// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
+// The list of file replacements can be found in `angular.json`.
+
+export const environment = {
+  production: false,
+  baseUrl: 'https://cz.cqzhongkahui.com/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://cz.cqzhongkahui.com/filesystem/',
+  key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
+};
+
+/*
+ * For easier debugging in development mode, you can import the following file
+ * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
+ *
+ * This import should be commented out in production mode because it will have a negative impact
+ * on performance if an error is thrown.
+ */
+// import 'zone.js/dist/zone-error';  // Included with Angular CLI.