From ddbe85a25a69824ec59ee75f2681641b09ee3416 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 23 Aug 2023 11:24:03 +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

---
 .../statistics/coupon-use/coupon-use.component.ts      | 10 +++++++++-
 src/environments/environment.ts                        |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/app/admin/statistics/coupon-use/coupon-use.component.ts b/src/app/admin/statistics/coupon-use/coupon-use.component.ts
index 98935a5..5ec6494 100644
--- a/src/app/admin/statistics/coupon-use/coupon-use.component.ts
+++ b/src/app/admin/statistics/coupon-use/coupon-use.component.ts
@@ -59,7 +59,15 @@ export class CouponUseComponent implements OnInit {
     param['pageNum'] = this.pageNum;
     param['pageSize'] = this.pageSize;
     this.couponService.getCount(param,response => {
-      this.countObject = response['return_data'];
+      const returnData = response['return_data'];
+      if (returnData != null) {
+        this.countObject = returnData;
+      } else {
+        this.countObject.batchNum = 0;
+        this.countObject.useNum = 0;
+        this.countObject.usePrice = 0;
+        this.countObject.useRate = 0;
+      }
     });
     this.couponService.getBatchUseCount(param, response => {
        this.dataObject = response['return_data'];
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 5e3fc2a..af9ff24 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,9 +4,10 @@
 
 export const environment = {
   production: false,
-baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+// baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
   // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址)
   //     baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+       baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
     orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
   imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',