diff --git a/src/app/admin/discount/discount-edit/discount-edit.component.html b/src/app/admin/discount/discount-edit/discount-edit.component.html index 46dd779..b7106bd 100644 --- a/src/app/admin/discount/discount-edit/discount-edit.component.html +++ b/src/app/admin/discount/discount-edit/discount-edit.component.html @@ -12,6 +12,28 @@
+
+ + 平台 + + + + + + + +
+
+ + 门店id + + + + + + + +
优惠券名称 diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html index baf789e..d3ee5fd 100644 --- a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html +++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html @@ -34,6 +34,34 @@
+ +
+ + 创建时间 + + + + +
+ +
+ + 支付时间 + + + + +
+ +
+ + 完成时间 + + + + +
+
@@ -109,33 +137,6 @@
- -
- - 创建时间 - - - - -
- -
- - 支付时间 - - - - -
- -
- - 完成时间 - - - - -
diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts index 31c7934..2c510cb 100644 --- a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts +++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts @@ -58,6 +58,18 @@ export class OrderCouponListComponent implements OnInit { ngOnInit(): void { + let currentDate = new Date(); + currentDate.setHours(0); + currentDate.setMinutes(0); + currentDate.setSeconds(0); + let createTimeS = currentDate.getTime(); + + currentDate.setHours(23); + currentDate.setMinutes(59); + currentDate.setSeconds(59); + let createTimeE = currentDate.getTime(); + this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE}; + this.searchForm = this.form.group({ companyId: [null], orderNo: [null], @@ -67,7 +79,7 @@ export class OrderCouponListComponent implements OnInit { couponName: [null], payType: [null], orderStatus: [null], - createTime: [null], + createTime: [[createTimeS,createTimeE]], payTime: [null], finishTime: [null], }); @@ -105,16 +117,16 @@ export class OrderCouponListComponent implements OnInit { */ search(whereObject: object) { if (whereObject['createTime'] != null) { - whereObject['createTimeS'] = whereObject['createTime'][0].getTime(); - whereObject['createTimeE'] = whereObject['createTime'][1].getTime(); + whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime(); + whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime(); } else { whereObject['createTimeS'] = null; whereObject['createTimeE'] = null; } if (whereObject['payTime'] != null) { - whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); - whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime(); + whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime(); } else { whereObject['payTimeS'] = null; whereObject['payTimeE'] = null; diff --git a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html index 4d386d0..1c7e230 100644 --- a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html +++ b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html @@ -37,9 +37,7 @@
- -
支付方式 @@ -77,11 +75,30 @@
+
+ +
+
- 更多条件 +
diff --git a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts index 116856c..d183476 100644 --- a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts +++ b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts @@ -53,13 +53,25 @@ export class OrderIntegralRechargeComponent implements OnInit { ngOnInit(): void { + let currentDate = new Date(); + currentDate.setHours(0); + currentDate.setMinutes(0); + currentDate.setSeconds(0); + let createTimeS = currentDate.getTime(); + + currentDate.setHours(23); + currentDate.setMinutes(59); + currentDate.setSeconds(59); + let createTimeE = currentDate.getTime(); + this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE}; + this.searchForm = this.form.group({ orderNo: [null], memPhone: [null], couponName: [null], payType: [null], status: [null], - createTime: [null], + createTime: [[createTimeS,createTimeE]], payTime: [null], finishTime: [null], }); @@ -89,24 +101,24 @@ export class OrderIntegralRechargeComponent implements OnInit { */ search(whereObject: object) { if (whereObject['createTime'] != null) { - whereObject['createTimeS'] = whereObject['createTime'][0].getTime(); - whereObject['createTimeE'] = whereObject['createTime'][1].getTime(); + whereObject['createTimeS'] = new Date(whereObject['createTime'][0]).getTime(); + whereObject['createTimeE'] = new Date(whereObject['createTime'][1]).getTime(); } else { whereObject['createTimeS'] = null; whereObject['createTimeE'] = null; } if (whereObject['payTime'] != null) { - whereObject['payTimeS'] = whereObject['payTime'][0].getTime(); - whereObject['payTimeE'] = whereObject['payTime'][1].getTime(); + whereObject['payTimeS'] = new Date(whereObject['payTime'][0]).getTime(); + whereObject['payTimeE'] = new Date(whereObject['payTime'][1]).getTime(); } else { whereObject['payTimeS'] = null; whereObject['payTimeE'] = null; } if (whereObject['finishTime'] != null) { - whereObject['finishTimeS'] = whereObject['finishTime'][0].getTime(); - whereObject['finishTimeE'] = whereObject['finishTime'][1].getTime(); + whereObject['finishTimeS'] = new Date(whereObject['finishTime'][0]).getTime(); + whereObject['finishTimeE'] = new Date(whereObject['finishTime'][1]).getTime(); } else { whereObject['finishTimeS'] = null; whereObject['finishTimeE'] = null; diff --git a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html index 444d92d..d8acd01 100644 --- a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html +++ b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html @@ -38,15 +38,17 @@
- -
-
+
- 加油站 + 创建时间 - +
@@ -66,50 +68,52 @@
- 交易状态 + 退款时间 - - - +
-
+
+ +
+ +
- 加油员 + 加油站 - +
- 创建时间 + 交易状态 - + + +
-
+
- 退款时间 + 加油员 - +
+ +
分公司 diff --git a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts index c61f2d3..d7144ea 100644 --- a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts +++ b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.ts @@ -77,6 +77,18 @@ export class OrderOilListComponent implements OnInit { } ngOnInit(): void { + let currentDate = new Date(); + currentDate.setHours(0); + currentDate.setMinutes(0); + currentDate.setSeconds(0); + let createTimeS = currentDate.getTime(); + + currentDate.setHours(23); + currentDate.setMinutes(59); + currentDate.setSeconds(59); + let createTimeE = currentDate.getTime(); + this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE}; + this.REFUND_OIL_BTN = this.commonsService.isBtnCompetence("BTN_REFUND_OIL_BTN"); this.refundForm = this.form.group({ orderNo: [{ value: null, disabled: true}, [Validators.required]], @@ -95,7 +107,7 @@ export class OrderOilListComponent implements OnInit { storeName: [null], memPhone: [null], status: [null], - createTimeArray: [null], + createTimeArray: [[createTimeS,createTimeE]], payTimeArray: [null], refundTimeArray: [null], companyId: [null], diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 7a35916..9e974d4 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -5,10 +5,10 @@ export const environment = { production: false, // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'http://localhost:9304/order/', + orderUrl: 'http://localhost:9304/order/', // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://hsgcs.dctpay.com/order/', + // orderUrl: 'https://hsgcs.dctpay.com/order/', imageUrl: 'https://hsgcs.dctpay.com/filesystem/', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',