From 254bc7bf8630110eb7cc12b96005193edd8dc0aa Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Sun, 28 Mar 2021 10:17:09 +0800
Subject: [PATCH] 1
---
.../audit-coupon/audit-coupon.component.html | 9 +-
.../coupon-list/coupon-list.component.html | 10 +-
.../sales-code-list.component.ts | 5 +-
.../store-list/store-list.component.html | 2 +-
.../merchant-edit/merchant-edit.component.ts | 6 +-
.../merchant-list/merchant-list.component.ts | 3 +-
.../price-list/price-list.component.html | 113 +++++++++++++++-
.../price-list/price-list.component.scss | 4 +
.../price/price-list/price-list.component.ts | 122 +++++++++++++++++-
src/app/pipes/system.pipe.ts | 2 +
10 files changed, 257 insertions(+), 19 deletions(-)
diff --git a/src/app/admin/audit/audit-coupon/audit-coupon.component.html b/src/app/admin/audit/audit-coupon/audit-coupon.component.html
index 64917a8..e1ee179 100644
--- a/src/app/admin/audit/audit-coupon/audit-coupon.component.html
+++ b/src/app/admin/audit/audit-coupon/audit-coupon.component.html
@@ -85,6 +85,10 @@
{{data.status | auditStatus}} |
+
+
+
+
|
@@ -110,8 +114,9 @@
-
-
+
+
+
diff --git a/src/app/admin/coupon/coupon-list/coupon-list.component.html b/src/app/admin/coupon/coupon-list/coupon-list.component.html
index 5c2988f..e75d625 100644
--- a/src/app/admin/coupon/coupon-list/coupon-list.component.html
+++ b/src/app/admin/coupon/coupon-list/coupon-list.component.html
@@ -99,15 +99,15 @@
编号 |
- 卡券编号 |
- 卡券名称 |
+ 卡券编号 |
+ 卡券名称 |
卡券面值 |
销售价格 |
有效库存 |
卡券类型 |
- 卡券状态 |
- 销售截止时间 |
- 创建时间 |
+ 卡券状态 |
+ 销售截止时间 |
+ 创建时间 |
操作 |
diff --git a/src/app/admin/coupon/sales-code-list/sales-code-list.component.ts b/src/app/admin/coupon/sales-code-list/sales-code-list.component.ts
index adb5dbb..bebdd97 100644
--- a/src/app/admin/coupon/sales-code-list/sales-code-list.component.ts
+++ b/src/app/admin/coupon/sales-code-list/sales-code-list.component.ts
@@ -118,13 +118,10 @@ export class SalesCodeListComponent implements OnInit {
}
handleChange(info: NzUploadChangeParam): void {
- if (info.file.status !== 'uploading') {
- console.log(info.file, info.fileList);
- }
if (info.file.status === 'done') {
if (info.file.response.return_code === '000000') {
this.loading = false;
- if (info.file.response.return_data == null || info.file.response.return_data.length === 0) {
+ if (info.file.response.return_data == null || info.file.response.return_data.errorTotal === 0) {
this.message.success('导入成功');
this.getRequest(true, this.searchForm.value);
} else {
diff --git a/src/app/admin/merchant-store/store-list/store-list.component.html b/src/app/admin/merchant-store/store-list/store-list.component.html
index 3e6e7de..075bef1 100644
--- a/src/app/admin/merchant-store/store-list/store-list.component.html
+++ b/src/app/admin/merchant-store/store-list/store-list.component.html
@@ -41,7 +41,7 @@
商戶名称:
{{name}}
-