pull/1/head
袁野 2 years ago
parent c8cf133b12
commit efe1c343df
  1. 3
      angular.json
  2. 10
      src/app/admin/index/index/index.component.ts
  3. 1
      src/app/app.module.ts
  4. 10
      src/environments/environment.ts
  5. 2
      src/index.html
  6. 11
      src/proxy.conf.json

@ -131,7 +131,8 @@
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "high-web:build" "browserTarget": "high-web:build",
"proxyConfig":"proxy.conf.json"
}, },
"configurations": { "configurations": {
"production": { "production": {

@ -6,6 +6,7 @@ import {environment} from '../../../../environments/environment';
import {NzMessageService} from 'ng-zorro-antd'; import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {CommonsService} from "../../../services/commons.service"; import {CommonsService} from "../../../services/commons.service";
import {HttpClient , HttpClientJsonpModule} from '@angular/common/http';
@Component({ @Component({
@ -51,6 +52,7 @@ export class IndexComponent implements OnInit {
orderStatisticsByProductTypeAll: any; orderStatisticsByProductTypeAll: any;
constructor( constructor(
private store: LocalStorageService, // 数据缓存 private store: LocalStorageService, // 数据缓存
private http: HttpClient,
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private router: Router, private router: Router,
private index: IndexService, private index: IndexService,
@ -59,6 +61,14 @@ export class IndexComponent implements OnInit {
} }
ngOnInit(): void { 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.adminInfoObject = this.store.get(ADMIN_INFO_OBJECT);
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType;
if (this.roleType === 1) { if (this.roleType === 1) {

@ -35,6 +35,7 @@ registerLocaleData(zh);
ReactiveFormsModule, ReactiveFormsModule,
NavigationModule, NavigationModule,
AppCommonModule, AppCommonModule,
NgxEchartsModule, NgxEchartsModule,
], ],
providers: [ providers: [

@ -4,12 +4,12 @@
export const environment = { export const environment = {
production: false, 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/', // 测试环境服务器地址(请求数据地址)
// orderUrl: 'https://hsgcs.dctpay.com/order/',
imageUrl: 'https://hsgcs.dctpay.com/filesystem/', 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=', key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=', inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
}; };

@ -5,7 +5,7 @@
<title>嗨森逛</title> <title>嗨森逛</title>
<base href="/"> <base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<script src="https://webapi.amap.com/maps?v=1.4.3&key=3a42e959c2a1e1d76e691bc1cc25a0b0&plugin=AMap.ToolBar,AMap.Autocomplete,AMap.PlaceSearch"></script> <script src="https://qz.dctpay.com/maps?v=1.4.3&key=3a42e959c2a1e1d76e691bc1cc25a0b0&plugin=AMap.ToolBar,AMap.Autocomplete,AMap.PlaceSearch"></script>
<script src="//webapi.amap.com/ui/1.1/main.js"></script> <script src="//webapi.amap.com/ui/1.1/main.js"></script>
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
</head> </head>

@ -0,0 +1,11 @@
{
"/api":{
"target":"https://geo.datav.aliyun.com",
"secure":false,
"logLevel":"debug",
"changeOrigin":true,
"pathRewrite":{
"^/api":""
}
}
}
Loading…
Cancel
Save