提交代理商订单页面

src/app/admin/order-manage/member-charge-order/member-charge-order-list/member-charge-order-list.component.html

@@ -87,9 +87,6 @@
                     </nz-form-item>
                 </div>
 
-
-
-
                 <div nz-col nzSpan="8">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">创建时间</nz-form-label>

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html

@@ -75,24 +75,6 @@
 
             </div>
 
-            <div nz-row *ngIf="isCollapse">
- <!--               <div nz-col nzSpan="8">
-                    <nz-form-item>
-                        <nz-form-label [nzSpan]="8">支付方式</nz-form-label>
-                        <nz-form-control [nzSpan]="14">
-                            <nz-select nzAllowClear formControlName="payType">
-                                <nz-option nzValue="1" nzLabel="支付宝"></nz-option>
-                                <nz-option nzValue="2" nzLabel="微信"></nz-option>
-                                <nz-option nzValue="3" nzLabel="积分抵扣"></nz-option>
-                                <nz-option nzValue="4" nzLabel="汇联通工会卡"></nz-option>
-                                <nz-option nzValue="5" nzLabel="银联"></nz-option>
-                                <nz-option nzValue="6" nzLabel="银联分期"></nz-option>
-                                <nz-option nzValue="7" nzLabel="嗨森逛油卡"></nz-option>
-                            </nz-select>
-                        </nz-form-control>
-                    </nz-form-item>
-                </div>-->
-            </div>
 
             <div nz-row>
                 <div nz-col nzSpan="24" class="search-button">

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);
   }
 
 }

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({

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,

src/environments/environment.ts

@@ -4,11 +4,11 @@
 
 export const environment = {
   production: false,
-  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  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/', // 测试环境服务器地址(请求数据地址)
+  // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
+  // 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=',
 };