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 e1ee179..f902d70 100644 --- a/src/app/admin/audit/audit-coupon/audit-coupon.component.html +++ b/src/app/admin/audit/audit-coupon/audit-coupon.component.html @@ -86,9 +86,9 @@ - + - + @@ -115,8 +115,8 @@
- - + +
diff --git a/src/app/admin/audit/audit-coupon/audit-coupon.component.ts b/src/app/admin/audit/audit-coupon/audit-coupon.component.ts index be0ce01..682bb47 100644 --- a/src/app/admin/audit/audit-coupon/audit-coupon.component.ts +++ b/src/app/admin/audit/audit-coupon/audit-coupon.component.ts @@ -25,6 +25,7 @@ export class AuditCouponComponent implements OnInit { approve: {}, object: {} }; + constructor( private form: FormBuilder, private audit: AuditService, @@ -91,16 +92,17 @@ export class AuditCouponComponent implements OnInit { this.isVisible = false; } - public approveProcessed(statusD: number): void { + public approveProcessed(statusD: number, id: number): void { + this.id = id; const p = { approveId: this.id, status: statusD, remarks: '', }; - this.common.showConfirm('是否确定' , r => { + this.common.showConfirm('是否确定', r => { if (r) { - this.audit.approveProcessed(p , data => { + this.audit.approveProcessed(p, data => { if (data['return_code'] === '000000') { this.isVisible = false; this.getRequest(true, this.searchForm.value); diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html index 3f1f9bc..a9f9fd1 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.html +++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.html @@ -53,14 +53,6 @@ -
- - 卡券面值 - - - - -
销售价格 diff --git a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts index acd91ed..885bae8 100644 --- a/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts +++ b/src/app/admin/coupon/coupon-edit/coupon-edit.component.ts @@ -69,7 +69,6 @@ export class CouponEditComponent implements OnInit { }); this.validateForm = this.fb.group({ couponName: [null, [Validators.required]], - couponPrice: [null, [Validators.required]], couponDesc: [null], couponType: [null, [Validators.required]], salesEndTime: [null, [Validators.required]], 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 945ec4d..e311aa6 100644 --- a/src/app/admin/order/order-list/order-list.component.html +++ b/src/app/admin/order/order-list/order-list.component.html @@ -8,28 +8,30 @@
- 销售码 + 订单号 - + + + +
+
+ + 客户手机号 + +
- - - - - - - -
状态 - - - + + + + + @@ -64,21 +66,33 @@ 编号 - 销售码 - 销售截止时间 - 使用截止时间 - 创建时间 - 状态 + 订单号 + 支付流水号 + 客户名称 + 客户电话 + 支付模式 + 支付方式 + 支付金额 + 支付时间 + 取消时间 + 创建时间 + 状态 {{i+1}} - {{data.salesCode}} + {{data.orderNo}} + {{data.paySerialNo == null ? '暂无': data.paySerialNo}} + {{data.memName == null ? '暂无': data.memName}} + {{data.memPhone == null ? '暂无': data.memPhone}} + {{data.payModel == null ? '暂无': data.payModel}} + {{data.payType == null ? '暂无': data.payType}} + {{data.payPrice == null ? '暂无': data.payPrice}} + {{data.payTime | date: 'yyyy-MM-dd HH:mm'}} + {{data.cancelTime | date: 'yyyy-MM-dd HH:mm'}} {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.useEndTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.status | orderCouponStatus}} + {{data.orderStatus | orderCouponStatus}}
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 b23cb2f..87ba687 100644 --- a/src/app/admin/order/order-list/order-list.component.ts +++ b/src/app/admin/order/order-list/order-list.component.ts @@ -39,8 +39,8 @@ export class OrderListComponent implements OnInit { public init(): void { this.searchForm = this.form.group({ - couponId: [null], - salesCode: [null], + phone: [null], + orderNo: [null], status: [null], }); this.getRequest(true, this.searchForm.value); diff --git a/src/app/pipes/order/order-coupon-status.pipe.ts b/src/app/pipes/order/order-coupon-status.pipe.ts index d5b9963..f0c6b8f 100644 --- a/src/app/pipes/order/order-coupon-status.pipe.ts +++ b/src/app/pipes/order/order-coupon-status.pipe.ts @@ -8,11 +8,15 @@ export class OrderCouponStatusPipe implements PipeTransform { transform(value: number): string { switch (value) { case 1: - return '待销售'; + return '待支付'; case 2: - return '未使用'; + return '已支付'; case 3: - return '已使用'; + return '已完成'; + case 4: + return '已退款'; + case 5: + return '已取消'; } } } diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts index 2df09ad..49898c2 100644 --- a/src/app/services/order.service.ts +++ b/src/app/services/order.service.ts @@ -14,13 +14,13 @@ export class OrderService { ) { } /** - * 查询卡券订单列表 + * 查询订单列表 * * @param paramsObject 对象 * @param callBack 回调 */ public getOrderCouponList(paramsObject: object, callBack) { - this.http.get(environment.baseUrl + 'highOrder/getOrderCouponList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => { + this.http.get(environment.baseUrl + 'highOrder/getOrderList?' + this.common.getWhereCondition(paramsObject)).subscribe(data => { callBack(data); }); }