diff --git a/angular.json b/angular.json index cc4e66b..218e30d 100644 --- a/angular.json +++ b/angular.json @@ -131,7 +131,8 @@ "serve": { "builder": "@angular-devkit/build-angular:dev-server", "options": { - "browserTarget": "high-web:build" + "browserTarget": "high-web:build", + "proxyConfig":"proxy.conf.json" }, "configurations": { "production": { diff --git a/src/app/admin/index/index/index.component.ts b/src/app/admin/index/index/index.component.ts index 01d7cab..ce5dc2b 100644 --- a/src/app/admin/index/index/index.component.ts +++ b/src/app/admin/index/index/index.component.ts @@ -6,6 +6,7 @@ import {environment} from '../../../../environments/environment'; import {NzMessageService} from 'ng-zorro-antd'; import {Router} from '@angular/router'; import {CommonsService} from "../../../services/commons.service"; +import {HttpClient , HttpClientJsonpModule} from '@angular/common/http'; @Component({ @@ -51,6 +52,7 @@ export class IndexComponent implements OnInit { orderStatisticsByProductTypeAll: any; constructor( private store: LocalStorageService, // 数据缓存 + private http: HttpClient, private message: NzMessageService, // 信息提示 private router: Router, private index: IndexService, @@ -59,6 +61,14 @@ export class IndexComponent implements OnInit { } ngOnInit(): void { + + this.http.jsonp('/areas_v3/bound/510000_full.json' , 'features').subscribe(data => { + console.log(data); + }); + + + + this.adminInfoObject = this.store.get(ADMIN_INFO_OBJECT); this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; if (this.roleType === 1) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 98d4ac3..83c1945 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -35,6 +35,7 @@ registerLocaleData(zh); ReactiveFormsModule, NavigationModule, AppCommonModule, + NgxEchartsModule, ], providers: [ diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 264e5d9..74e2ac9 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,12 +4,12 @@ export const environment = { production: false, - 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: '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/', + // 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=', }; diff --git a/src/index.html b/src/index.html index 7e90525..c50cc83 100644 --- a/src/index.html +++ b/src/index.html @@ -5,7 +5,7 @@