Merge branch 'dev' of http://139.224.139.2:9091/Sweet/ydLife into dev

src/app/my/menu-item/menu-item.component.ts

@@ -85,7 +85,7 @@ export class MenuItemComponent implements OnInit {
       },
       },
       {
       {
         title: '教育培训',
         title: '教育培训',
-        type:'training',
+        type:'trainingCenter',
         content: [
         content: [
           { no: 5, subtitle: '保险ABC', icon: 'abc', path: `https://${window.location.host}/issue`, routerLink: '' ,showSubMenu:true},
           { no: 5, subtitle: '保险ABC', icon: 'abc', path: `https://${window.location.host}/issue`, routerLink: '' ,showSubMenu:true},
           { no: 6, subtitle: '培训课件', icon: 'train', path: '', routerLink: 'training',showSubMenu:true },
           { no: 6, subtitle: '培训课件', icon: 'train', path: '', routerLink: 'training',showSubMenu:true },
@@ -97,7 +97,6 @@ export class MenuItemComponent implements OnInit {
       }
       }
     ];
     ];
     this.currentMenuLists = this.menuLists.filter(item=>item.type == this.type)[0]['content'];
     this.currentMenuLists = this.menuLists.filter(item=>item.type == this.type)[0]['content'];
-    console.log(this.currentMenuLists)
   }
   }
 
 
 
 

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

@@ -135,7 +135,7 @@
     <div class="part2_item" routerLink="exhibition">
     <div class="part2_item" routerLink="exhibition">
       <span>我的展业</span>
       <span>我的展业</span>
     </div>
     </div>
-    <div class="part2_item" routerLink="training">
+    <div class="part2_item" routerLink="trainingCenter">
     <span>教育培训</span>
     <span>教育培训</span>
     </div>
     </div>
   </div>
   </div>

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

@@ -275,7 +275,7 @@ ul,ol{
           width: 120px;
           width: 120px;
           height: 120px;
           height: 120px;
           border-radius: 50%;
           border-radius: 50%;
-          background: antiquewhite;
+          background: #0c5c90;
           border: 10px solid #fff;
           border: 10px solid #fff;
           display: flex;
           display: flex;
           align-items: center;
           align-items: center;

src/app/my/my-routing.module.ts

@@ -139,7 +139,7 @@ const myRoutes: Routes = [
   { path: 'marketing',component:MenuItemComponent,data:[{title:'银盾保经-营销工具',type:'marketing'}],canActivate:[AuthGuard]},
   { path: 'marketing',component:MenuItemComponent,data:[{title:'银盾保经-营销工具',type:'marketing'}],canActivate:[AuthGuard]},
   { path: 'team',component:MenuItemComponent,data:[{title:'银盾保经-我的团队',type:'team'}],canActivate:[AuthGuard]},
   { path: 'team',component:MenuItemComponent,data:[{title:'银盾保经-我的团队',type:'team'}],canActivate:[AuthGuard]},
   { path: 'exhibition',component:MenuItemComponent,data:[{title:'银盾保经-我的展业',type:'exhibition'}],canActivate:[AuthGuard]},
   { path: 'exhibition',component:MenuItemComponent,data:[{title:'银盾保经-我的展业',type:'exhibition'}],canActivate:[AuthGuard]},
-  { path: 'training',component:MenuItemComponent,data:[{title:'银盾保经-教育培训',type:'training'}],canActivate:[AuthGuard]},
+  { path: 'trainingCenter',component:MenuItemComponent,data:[{title:'银盾保经-教育培训',type:'trainingCenter'}],canActivate:[AuthGuard]},
 
 
 ];
 ];