Skip to content

Y
ydLife
Commit 4d933413 by sunchao
Options

解决冲突

parent 60d58a2e
Showing with 0 additions and 14 deletions
src/app/my/my-center-home/my-center-home.component.ts
......@@ -113,18 +113,6 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
{
title: '我的展业',
content: [
<<<<<<< HEAD
{ no: 12, subtitle: '我的保单', icon: 'policy', path: '', routerLink: '' },
{ no: 20, subtitle: '我的客户', icon: 'customer', path: '', routerLink: '' },
// { no: 14, subtitle: '我的佣金', icon: 'commission', path: '', routerLink: '' },
{ no: 19, subtitle: '薪资单', icon: 'salary', path: '', routerLink: 'salary' },
{ no: 21, subtitle: '公司制度', icon: 'management', path: '', routerLink: '' },
// { no: 23, subtitle: '我的报聘', icon: 'pin', path: '', routerLink: 'my_application' },
{ no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target' },
{ no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' },
{ no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' },
{ no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' }
=======
{ no: 12, subtitle: '我的保单', icon: 'policy', path: '', routerLink: '',showSubMenu:true },
{ no: 20, subtitle: '我的客户', icon: 'customer', path: '', routerLink: '',showSubMenu:true },
// { no: 14, subtitle: '我的佣金', icon: 'commission', path: '', routerLink: '',showSubMenu:true },
......@@ -134,8 +122,6 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
{ no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target',showSubMenu:true },
{ no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true},
{ no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true}
>>>>>>> dev
],
isShow: true
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment