liting2017 6 years ago
parent
commit
e3642503b6

+ 12 - 0
src/css/newMenu/demand.css

@@ -157,6 +157,7 @@
     margin-bottom: 16px;
     padding: 5px 0;;
     width: 100%;
+<<<<<<< HEAD
     transition:  all .5s ease-out;
 }
 .demandTxt .col-md-7>div:hover{
@@ -165,6 +166,8 @@
 }
 .demandTxt .col-md-7>div:hover .name{
     color: #ff5910;
+=======
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 }
 .demandTxt .col-md-7 div a{
     color:#333;
@@ -216,7 +219,10 @@
     float: right;
     margin-left: 20px;
 }
+<<<<<<< HEAD
 
+=======
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 .demandTxt .colorOrange{
     vertical-align: top;
     margin-top: -20px;
@@ -241,16 +247,22 @@
 .talentsTxt ol li {
     padding: 5px 5px 0px;
     height: 56px;
+<<<<<<< HEAD
     transition: all .5s ease-out;
+=======
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     margin-bottom: 30px;
 }
 .talentsTxt ol li img{
     float: right;
 }
+<<<<<<< HEAD
 .talentsTxt ol li:hover{
     margin-left: -8px;
     transition: all .5s ease-in
 }
+=======
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
 .introduceP{
     padding-left: 10px; 
     margin-top: 12px;

+ 15 - 0
src/css/newMenu/header.css

@@ -305,15 +305,25 @@ input:focus{
 
 .colorWrite {
     color: #ccc;
+<<<<<<< HEAD
     height: 40px;
+=======
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     margin: 12px 0px;
 }
 
 .navMeau .menuList {
+<<<<<<< HEAD
     /* display: none; */
     position: absolute;
     top: 55px;
     padding: 20px 20px 40px;
+=======
+    display: none;
+    position: absolute;
+    top: 55px;
+    padding: 20px 20px 60px;
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     left: 0;
     z-index: 99999;
     background: #3b3b3b;
@@ -325,8 +335,13 @@ input:focus{
     float: left;
     box-sizing: border-box;
     width: 50%;
+<<<<<<< HEAD
     height: 36px;
     line-height: 36px;
+=======
+    height: 40px;
+    line-height: 40px;
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
     text-align: center
 }
 

+ 22 - 0
src/css/newMenu/undefined.model.ts

@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+// 组件
+import { undefinedComponent } from './undefined/undefined.component';
+
+// 定义常量 路由
+const routes: any = [
+    {
+        path: 'undefined',
+        component: undefinedComponent
+    }
+];
+
+@NgModule({
+    imports: [
+        RouterModule.forChild(routes)
+    ],
+    providers: [],
+    declarations: [undefinedComponent]
+})
+export class undefinedModule {}

+ 6 - 0
src/css/newMenu/undefined/undefined.component.html

@@ -0,0 +1,6 @@
+<div style="text-align:center">
+  {{title}}
+</div>
+<div></div>
+
+

+ 0 - 0
src/css/newMenu/undefined/undefined.component.scss


+ 32 - 0
src/css/newMenu/undefined/undefined.component.spec.ts

@@ -0,0 +1,32 @@
+import { TestBed, async } from '@angular/core/testing';
+
+import { undefinedComponent } from './undefined.component';
+
+describe('undefinedComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        undefinedComponent
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the undefined', async(() => {
+    const fixture = TestBed.createComponent(undefinedComponent);
+    const undefined = fixture.debugElement.componentInstance;
+    expect(undefined).toBeTruthy();
+  }));
+
+  it(`should have as title 'undefined'`, async(() => {
+    const fixture = TestBed.createComponent(undefinedComponent);
+    const undefined = fixture.debugElement.componentInstance;
+    expect(undefined.title).toEqual('undefined');
+  }));
+
+  it('should render title in a h1 tag', async(() => {
+    const fixture = TestBed.createComponent(undefinedComponent);
+    fixture.detectChanges();
+    const compiled = fixture.debugElement.nativeElement;
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to undefined!');
+  }));
+});

+ 10 - 0
src/css/newMenu/undefined/undefined.component.ts

@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'undefined-root',
+  templateUrl: './undefined.component.html',
+  styleUrls: ['./undefined.component.css']
+})
+export class undefinedComponent {
+  title = 'undefined';
+}

+ 16 - 0
src/css/newMenu/undefined/undefined.module.ts

@@ -0,0 +1,16 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { undefinedComponent } from './undefined.component';
+
+@NgModule({
+  declarations: [
+    undefinedComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [undefinedComponent]
+})
+export class undefinedModule { }

+ 4 - 0
webpack.config.js

@@ -268,7 +268,11 @@ module.exports = (function () {
             disableHostCheck: true,
             host: '192.168.1.106',
             port: 80,
+<<<<<<< HEAD
             allowedHosts: ['127.0.0.1','192.168.1.222'],
+=======
+            allowedHosts: ['127.0.0.1','192.168.1.101'],
+>>>>>>> 9581e476b11f7020b30f9d3662f3b4fdaa965620
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }