From 7713ee07ac2be15763143e59ba4ddf2567722f61 Mon Sep 17 00:00:00 2001
From: YUANYE <418471657@qq.com>
Date: Wed, 25 Aug 2021 15:49:00 +0800
Subject: [PATCH] 1

---
 .../order/order-c-list/order-c-list.component.ts     |  2 +-
 .../order/order-k-list/order-k-list.component.ts     |  2 +-
 .../admin/order/order-list/order-list.component.html | 12 ++++++++++--
 .../admin/order/order-list/order-list.component.ts   |  2 ++
 src/environments/environment.ts                      |  8 ++++----
 5 files changed, 18 insertions(+), 8 deletions(-)

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 aab9e26..619839f 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
@@ -86,7 +86,7 @@ export class OrderCListComponent implements OnInit {
     }
     whereObject['pageNum'] = this.pageNum;
     whereObject['pageSize'] = this.pageSize;
-    this.order.getKfcOrderList(whereObject, data => {
+    this.order.getCinemaOrderList(whereObject, data => {
       if (data['return_code'] === '000000') {
         this.requestData = data['return_data'].list;
         this.total = data['return_data'].total;
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 eeb0cd3..0bf055c 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
@@ -85,7 +85,7 @@ export class OrderKListComponent implements OnInit {
     }
     whereObject['pageNum'] = this.pageNum;
     whereObject['pageSize'] = this.pageSize;
-    this.order.getCinemaOrderList(whereObject, data => {
+    this.order.getKfcOrderList(whereObject, data => {
       if (data['return_code'] === '000000') {
         this.requestData = data['return_data'].list;
         this.total = data['return_data'].total;
diff --git a/src/app/admin/order/order-list/order-list.component.html b/src/app/admin/order/order-list/order-list.component.html
index 760b68b..2eb37f9 100644
--- a/src/app/admin/order/order-list/order-list.component.html
+++ b/src/app/admin/order/order-list/order-list.component.html
@@ -36,9 +36,17 @@
             </div>
             <div nz-col nzSpan="8">
                 <nz-form-item>
-                    <nz-form-label [nzSpan]="6">订单流水号</nz-form-label>
+                    <nz-form-label [nzSpan]="6">商品名称</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <input nz-input formControlName="paySerialNo"/>
+                        <input nz-input formControlName="memDiscountName"/>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
+            <div nz-col nzSpan="8">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">用户电话</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <input nz-input formControlName="memPhone"/>
                     </nz-form-control>
                 </nz-form-item>
             </div>
diff --git a/src/app/admin/order/order-list/order-list.component.ts b/src/app/admin/order/order-list/order-list.component.ts
index b1d18b8..f363372 100644
--- a/src/app/admin/order/order-list/order-list.component.ts
+++ b/src/app/admin/order/order-list/order-list.component.ts
@@ -64,6 +64,8 @@ export class OrderListComponent implements OnInit {
       paySerialNo: [null],
       payModel: [null],
       payType: [null],
+      memDiscountName: [null],
+      memPhone: [null],
       orderStatus: [null],
       payTime: [null]
     });
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 6506d77..350d219 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'http://localhost:9302/filesystem/',
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'http://localhost:9302/filesystem/',
+  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  // imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
 };