diff --git a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html index 31b4b22..e92fa77 100644 --- a/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html +++ b/src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html @@ -87,9 +87,6 @@ - - -
创建时间 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 01625c5..9ddca3d 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 @@ -75,24 +75,6 @@
-
- -
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 d183476..03c790f 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,16 +53,16 @@ export class OrderIntegralRechargeComponent implements OnInit { ngOnInit(): void { - let currentDate = new Date(); + const currentDate = new Date(); currentDate.setHours(0); currentDate.setMinutes(0); currentDate.setSeconds(0); - let createTimeS = currentDate.getTime(); + const createTimeS = currentDate.getTime(); currentDate.setHours(23); currentDate.setMinutes(59); currentDate.setSeconds(59); - let createTimeE = currentDate.getTime(); + const createTimeE = currentDate.getTime(); this.whereObject = { createTimeS: createTimeS, createTimeE: createTimeE}; this.searchForm = this.form.group({ @@ -71,7 +71,7 @@ export class OrderIntegralRechargeComponent implements OnInit { couponName: [null], payType: [null], status: [null], - createTime: [[createTimeS,createTimeE]], + createTime: [[createTimeS, createTimeE]], payTime: [null], finishTime: [null], }); @@ -189,7 +189,7 @@ export class OrderIntegralRechargeComponent implements OnInit { */ pageSizeChang(pageSize: number) { this.pageSize = pageSize; - this.requestData(1) + this.requestData(1); } } diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index f1eff2d..ba5dbd9 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -11,7 +11,7 @@ import {DiscountUseConditionListComponent} from './discount-use-condition-list/d import {DicountPackageOrderListComponent} from './dicount-package-order-list/dicount-package-order-list.component'; import {PreOrderComponent} from './pre-order/pre-order.component'; import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; - +import {HltChargeOrderComponent} from './hlt-charge-order/hlt-charge-order.component'; const routes: Routes = [ @@ -26,6 +26,7 @@ const routes: Routes = [ { path: 'pre-order', component: PreOrderComponent }, { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent }, { path: 'discount-package-order-list', component: DicountPackageOrderListComponent}, + { path: 'hlt-order-list', component: HltChargeOrderComponent}, ]; @NgModule({ diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts index abaeec8..18ccb4d 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -20,9 +20,10 @@ import {SeparateModule} from '../../common/separate/separate.module'; import {NzSpaceModule} from 'ng-zorro-antd/space'; import {RegionSelectorModule} from '../../common/region-selector/region-selector.module'; import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; +import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.component'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent], imports: [ CommonModule, OrderManageRoutingModule, diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 0082f1d..76173d9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,11 +4,11 @@ export const environment = { production: false, - // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) - // orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) + baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) + orderUrl: 'http://localhost:9304/order/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', - baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) - orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) + // orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址) key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', };