提交代理商订单页面

2.0-dev
袁野 2 years ago
parent c8e7c6c7aa
commit 331186821a
  1. 2
      src/app/admin/config-manage/config-manage.module.ts
  2. 15
      src/app/admin/index/index/index.component.ts
  3. 4
      src/app/services/commons.service.ts

@ -10,7 +10,7 @@ import {RegionSelectorModule} from '../../common/region-selector/region-selector
import {NgZorroAntdModule} from 'ng-zorro-antd'; import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import { ThirdProductComponent } from './third-product/third-product.component'; import { ThirdProductComponent } from './third-product/third-product.component';
import {AppCommonModule} from "../../app-common.module"; import {AppCommonModule} from '../../app-common.module';
import { MemberProductComponent } from './member-product/member-product.component'; import { MemberProductComponent } from './member-product/member-product.component';
import { IntegralRebateComponent } from './integral-rebate/integral-rebate.component'; import { IntegralRebateComponent } from './integral-rebate/integral-rebate.component';

@ -62,15 +62,9 @@ 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;
console.log(this.roleType);
if (this.roleType === 1) { if (this.roleType === 1) {
this.getIndexCount(); this.getIndexCount();
this.getLineCount(); this.getLineCount();
@ -362,6 +356,12 @@ export class IndexComponent implements OnInit {
yAxis: { yAxis: {
type: 'value' type: 'value'
}, },
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow'
}
},
series: [ series: [
{ {
data: sumData, data: sumData,
@ -410,6 +410,7 @@ export class IndexComponent implements OnInit {
data: productData data: productData
}, },
series: [ series: [
{ {
data: sumData, data: sumData,

@ -352,9 +352,9 @@ export class CommonsService {
*/ */
public dateTimeType(type: number): number { public dateTimeType(type: number): number {
if (type === 1) { if (type === 1) {
return new Date().getDay() - 2; return new Date().getDate() - 1;
} else if (type === 3) { } else if (type === 3) {
return new Date().getMonth() + 1; return new Date().getMonth();
} else { } else {
return 100; return 100;
} }

Loading…
Cancel
Save