From 12eeb6630af67db3e2f5adcc44ed396d4b7d39f8 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 24 Jan 2022 20:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../order-list/order-list.component.html | 65 ++++++++++++++++++-
.../order-list/order-list.component.ts | 38 ++++++++++-
.../price-list/price-list.component.html | 22 +++++++
.../price-list/price-list.component.ts | 2 +
4 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/src/app/admin/recharge-order/order-list/order-list.component.html b/src/app/admin/recharge-order/order-list/order-list.component.html
index 41f0ac4..bfe3401 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.html
+++ b/src/app/admin/recharge-order/order-list/order-list.component.html
@@ -35,6 +35,18 @@
+
+
+ 充值类型
+
+
+
+
+
+
+
+
+
支付方式
@@ -113,6 +125,15 @@
共计 {{total}} 条数据
+
+
+
{{data.status | rechargeStatus}}
详情
- 完成充值
-
- 申请退款
+
+
+
|
@@ -194,3 +215,41 @@
+
+
+
+
+ | 序号 |
+ 订单号 |
+ 用户昵称 |
+ 用户联系方式 |
+ 充值类型 |
+ 充值内容 |
+ 支付方式 |
+ 卡号 |
+ 订单金额 |
+ 应付金额 |
+ 订单状态 |
+ 支付时间 |
+ 原因 |
+
+
+
+
+ | {{ i + 1}} |
+ {{data.orderNo}} |
+ {{data.userName}} |
+ {{data.userPhone}} |
+ {{data.rechargeModelName}} |
+ {{data.rechargeContent}} |
+ {{data.payTypeName}} |
+ {{data.cardNo}} |
+ {{data.orderPrice}} |
+ {{data.payRealPrice}} |
+ {{data.statusName}} |
+ {{data.payTime}} |
+ {{data.errorMessage}} |
+
+
+
+
diff --git a/src/app/admin/recharge-order/order-list/order-list.component.ts b/src/app/admin/recharge-order/order-list/order-list.component.ts
index e85bde9..1ac6e1d 100644
--- a/src/app/admin/recharge-order/order-list/order-list.component.ts
+++ b/src/app/admin/recharge-order/order-list/order-list.component.ts
@@ -7,7 +7,7 @@ import {IconService} from '../../../services/icon.service';
import {CommonsService} from '../../../services/commons.service';
import {RechargeService} from '../../../services/recharge.service';
-import {NzMessageService, NzNotificationService} from 'ng-zorro-antd';
+import {NzMessageService, NzModalService, NzNotificationService, NzUploadChangeParam} from 'ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {Router} from '@angular/router';
@@ -18,10 +18,12 @@ import {Router} from '@angular/router';
})
export class OrderListComponent implements OnInit , OnDestroy {
FILE_URL = environment.imageUrl;
+ WEB_SERVE_URL = environment.baseUrl;
searchForm: FormGroup; // 搜索框
validateForm: FormGroup; // 添加框
requestData = []; // 列表数据
-
+ importErrorStudentArray = [];
+ errorStudentVisible = false;
total: number; // 页码
pageNum = 1; // 页码
pageSize = 10; // 条码
@@ -35,6 +37,7 @@ export class OrderListComponent implements OnInit , OnDestroy {
private form: FormBuilder,
private recharge: RechargeService,
private discount: DiscountService,
+ private modal: NzModalService,
private coupon: CouponService,
private iconService: IconService,
private message: NzMessageService,
@@ -77,6 +80,7 @@ export class OrderListComponent implements OnInit , OnDestroy {
idCard: [null],
rechargeContent: [null],
userPhone: [null],
+ rechargeType: [null],
payTime: [null],
payType: [null],
createTime: [null],
@@ -214,5 +218,35 @@ export class OrderListComponent implements OnInit , OnDestroy {
});
}
+ handleChange(info: NzUploadChangeParam): void {
+ 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.errorTotal === 0) {
+ this.message.success('导入成功');
+ this.getRequest(true, this.searchForm.value);
+ } else {
+ this.modal.warning({
+ nzTitle: '提示',
+ nzOkText: '查看失败数据',
+ nzContent: '只有部分数据导入成功',
+ nzOnOk: () => this.showErrorStudentModal(info.file.response.return_data)
+ });
+ }
+ } else {
+ this.loading = false;
+ this.message.error(info.file.response.return_msg);
+ }
+ } else if (info.file.status === 'error') {
+ this.message.error('上传错误');
+ }
+ }
+
+ // 打开模态框
+ showErrorStudentModal(data: []) {
+ this.getRequest(true, this.searchForm.value);
+ this.importErrorStudentArray = data['errorData'];
+ this.errorStudentVisible = true;
+ }
}
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 5039ea2..cd5b651 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
@@ -19,6 +19,17 @@
+
+
+ 充值类型
+
+
+
+
+
+
+
+
@@ -56,6 +67,7 @@
| 编号 |
金额类型 |
+ 充值类型 |
充值金额 |
@@ -68,6 +80,7 @@
| {{i + 1}} |
{{data.type | rechargePrice}} |
+ {{data.rechargeType== 1? '快充':'慢充'}} |
{{data.price}} |
@@ -94,6 +107,15 @@
+
+ 充值类型
+
+
+
+
+
+
+
商品排序
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 bbaaaaf..0f7cd55 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
@@ -50,10 +50,12 @@ export class PriceListComponent implements OnInit {
public init(): void {
this.searchForm = this.form.group({
type: [null],
+ rechargeType: [null],
});
this.validateForm = this.form.group({
type: [null, [Validators.required]],
price: [null, [Validators.required]],
+ rechargeType: [null, [Validators.required]],
realPrice: [{value: null, disabled: true}, [Validators.required]],
// goodsId: [null, [Validators.required]],
discount: [null, [Validators.required]],