'合并代码'

mintty.exe.stackdump

+Stack trace:
+Frame        Function    Args
+000FFFFBC30  001800606B9 (000FFFFBE38, 000FFFFCE00, 001801214F5, 000FFFFDE50)
+00000000002  0018006259A (00000000064, 00000000000, 000000008F0, 00000000000)
+000FFFFBF10  0018012932B (7FFF6D7E5B89, 00000000000, 00000000000, 00000000000)
+000FFFFC1F0  0018012590E (001800A3A25, 00000000000, 00000000000, 00000001000)
+00600000000  00180125E04 (3A6D39335B1BA3BD, 656C69706D6F4320, 7365636375732064, 00000000006)
+00600000000  00180126049 (000FFFFC430, 00000000000, 0018011D727, 00000000001)
+00600000000  0018012632F (00000001000, 00100493280, 00100498320, 00100497D80)
+00600000000  001801623C8 (0018013A3BA, 7FFF6D4610C4, 000FFFFC430, 00100497D80)
+00100493280  001800C02FF (00000000000, 00180328E30, 001004981D0, 00000000000)
+00100493280  001801214AB (00000000000, 00180328E30, 001004981D0, 00000000000)
+00100493280  0010042E591 (001004932B9, FFFFFFFFFFFFFFFF, 7FFF6F735602, 00000000000)
+00000000039  0010040AD0F (000FFFFC510, 7FFF6F777110, 00100497D68, 00600000001)
+000FFFFC510  0010043FF45 (00180192FEC, 0000000000E, 00180059960, 0000000000E)
+000FFFFCCD0  00180049E84 (00000000000, 00000000000, 00000000000, 00000000000)
+00000000000  00180047963 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  00180047A14 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace (more stack frames may be present)

src/app/my/my-center-home/my-center-home.component.ts

@@ -40,6 +40,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
   approvarList:Array<any>;
   approvarList:Array<any>;
   dotFlag:boolean = false;
   dotFlag:boolean = false;
   isShowSalay:boolean;
   isShowSalay:boolean;
+  showSubMenu:boolean;
   constructor(
   constructor(
     private router: Router,
     private router: Router,
     public lifeCommonService: LifeCommonService,
     public lifeCommonService: LifeCommonService,
@@ -113,18 +114,6 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
       {
       {
         title: '我的展业',
         title: '我的展业',
         content: [
         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: 12, subtitle: '我的保单', icon: 'policy', path: '', routerLink: '',showSubMenu:true },
           { no: 20, subtitle: '我的客户', icon: 'customer', path: '', routerLink: '',showSubMenu:true },
           { no: 20, subtitle: '我的客户', icon: 'customer', path: '', routerLink: '',showSubMenu:true },
           // { no: 14, subtitle: '我的佣金', icon: 'commission', path: '', routerLink: '',showSubMenu:true },
           // { no: 14, subtitle: '我的佣金', icon: 'commission', path: '', routerLink: '',showSubMenu:true },
@@ -134,8 +123,6 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
           { no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target',showSubMenu:true },
           { no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target',showSubMenu:true },
           { no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true},
           { no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true},
           { no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true}
           { no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true}
-          
->>>>>>> dev
         ],
         ],
         isShow: true
         isShow: true
       },
       },
@@ -254,7 +241,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
         }
         }
       });
       });
     }
     }
-    
+
   }
   }
 
 
   //截取字符串
   //截取字符串
@@ -402,7 +389,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
           this.dotFlag = false;
           this.dotFlag = false;
         }
         }
       }else{
       }else{
-        alert(res['message'])  
+        alert(res['message'])
       }
       }
     })
     })
   }
   }