diff --git a/src/app/admin/navigation/navigation.component.html b/src/app/admin/navigation/navigation.component.html index c3c9d4c..417bc13 100644 --- a/src/app/admin/navigation/navigation.component.html +++ b/src/app/admin/navigation/navigation.component.html @@ -28,7 +28,8 @@ [nzType]="isCollapsed ? 'menu-unfold' : 'menu-fold'" > - + 系统开关： + {{userInfo.secUser.userName}} diff --git a/src/app/admin/navigation/navigation.component.ts b/src/app/admin/navigation/navigation.component.ts index 2ddbb59..bcb4e16 100644 --- a/src/app/admin/navigation/navigation.component.ts +++ b/src/app/admin/navigation/navigation.component.ts @@ -6,6 +6,7 @@ import {NzMessageService} from 'ng-zorro-antd'; import {Router} from '@angular/router'; import {IconService} from '../../services/icon.service'; import {RechargeService} from '../../services/recharge.service'; +import {CommonsService} from '../../services/commons.service'; @Component({ selector: 'app-navigation', @@ -18,10 +19,12 @@ export class NavigationComponent implements OnInit { userInfo: any; menuList: any; routeName: string; + switchValue = false; constructor( private storage: LocalStorageService, private loginService: LoginService, private message: NzMessageService, + private commonsService: CommonsService, private iconService: IconService, private router: Router, ) { } @@ -29,6 +32,9 @@ export class NavigationComponent implements OnInit { ngOnInit(): void { this.routeName = this.storage.get(ROUTENAME) == null ? 'index' : this.storage.get(ROUTENAME); this.userInfo = this.storage.getList(ADMIN_INFO_OBJECT); + this.commonsService.mappingSysNameOl('RECHARGE', data => { + this.switchValue = data['return_data'][0]['codeValue'] === '1'; + }); this.menuList = this.storage.getList(ADMIN_INFO_OBJECT)['menuList']; // 定义菜单数据 } @@ -62,4 +68,9 @@ export class NavigationComponent implements OnInit { history.back(); } + clickSwitch(): void { + this.switchValue = !this.switchValue; + console.log(this.switchValue); + } + } 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 4afeb15..fe9831d 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 @@ -1,14 +1,15 @@ import {Component, OnDestroy, OnInit} from '@angular/core'; import {environment} from '../../../../environments/environment'; -import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms'; + import {DiscountService} from '../../../services/discount.service'; import {CouponService} from '../../../services/coupon.service'; import {IconService} from '../../../services/icon.service'; -import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; -import {Router} from '_@angular_router@9.0.7@@angular/router'; + import {CommonsService} from '../../../services/commons.service'; import {RechargeService} from '../../../services/recharge.service'; -import {NzNotificationService} from "ng-zorro-antd"; +import {NzMessageService, NzNotificationService} from 'ng-zorro-antd'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {Router} from '@angular/router'; @Component({ selector: 'app-order-list', @@ -47,6 +48,7 @@ export class OrderListComponent implements OnInit , OnDestroy { this.init(); this.timer = setInterval(() => { // 设置定时刷新事件，每隔1分钟刷新 this.recharge.countOrder(data => { + this.getRequest(true, this.searchForm.value); this.notification.info( '充值订单', '您有' + data['return_data'] + '条未充值的订单，请尽快充值，点击可查看未充值订单！' 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 87fb051..9f82506 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 @@ -1,13 +1,13 @@ import {Component, OnInit} from '@angular/core'; import {environment} from '../../../../environments/environment'; -import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {DiscountService} from '../../../services/discount.service'; import {CouponService} from '../../../services/coupon.service'; import {IconService} from '../../../services/icon.service'; -import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; -import {Router} from '_@angular_router@9.0.7@@angular/router'; +import {Router} from '@angular/router'; import {CommonsService} from '../../../services/commons.service'; import {RechargeService} from '../../../services/recharge.service'; +import {NzMessageService} from 'ng-zorro-antd'; @Component({ selector: 'app-price-list', diff --git a/src/app/admin/recharge-order/recharge-order.module.ts b/src/app/admin/recharge-order/recharge-order.module.ts index cf95675..2b993a9 100644 --- a/src/app/admin/recharge-order/recharge-order.module.ts +++ b/src/app/admin/recharge-order/recharge-order.module.ts @@ -4,9 +4,9 @@ import { CommonModule } from '@angular/common'; import { RechargeOrderRoutingModule } from './recharge-order-routing.module'; import { OrderListComponent } from './order-list/order-list.component'; import { PriceListComponent } from './price-list/price-list.component'; -import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; +import {NgZorroAntdModule} from 'ng-zorro-antd'; import {SeparateModule} from '../../common/separate/separate.module'; -import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module'; import {RegionSelectorModule} from '../../common/region-selector/region-selector.module'; import {AppCommonModule} from '../../app-common.module'; diff --git a/src/app/services/commons.service.ts b/src/app/services/commons.service.ts index dcce117..2bb81aa 100644 --- a/src/app/services/commons.service.ts +++ b/src/app/services/commons.service.ts @@ -167,6 +167,14 @@ export class CommonsService { }); } + public mappingSysNameOl(codeType: string , callback): any { + this.http.get(environment.baseUrl + '/common/mappingSysNameOl?codeType=' + codeType).subscribe( data => { + callback(data); + }); + } + + + /** * * 获取全部职位类型 diff --git a/src/app/services/recharge.service.ts b/src/app/services/recharge.service.ts index 1f78061..47516e6 100644 --- a/src/app/services/recharge.service.ts +++ b/src/app/services/recharge.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@angular/core'; -import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http'; +import {HttpClient} from '@angular/common/http'; import {CommonsService} from './commons.service'; import {environment} from '../../environments/environment'; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 532a068..0d20ac6 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址) imageUrl: 'http://localhost:9302/filesystem/', - // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) + // baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) // imageUrl: 'https://hsgcs.dctpay.com/filesystem/', };