From ad75226eb21e9a295b299bae95a6733d09876b35 Mon Sep 17 00:00:00 2001
From: yyr <yuru.ye@cadgit.com>
Date: Mon, 9 Oct 2017 12:11:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E6=8E=92?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |  2 +-
 public/VCschool.html         | 31 +++++++++++++++++++++++++++----
 {views => public}/index.html | 34 ++++++----------------------------
 public/index1.html           | 33 +++++++++++++++++++++++++++++++++
 public/js/header.js          | 11 +++++++++++
 public/style/header.css      | 15 +++++++++++++++
 public/teacher.html          | 27 +++++++++++++++++++++++++--
 7 files changed, 118 insertions(+), 35 deletions(-)
 rename {views => public}/index.html (84%)
 create mode 100644 public/index1.html
 create mode 100644 public/js/header.js
 create mode 100644 public/style/header.css
diff --git a/package.json b/package.json
index e9004c0..49ad24b 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "express": "^4.15.5"
+    "express": "^4.16.0"
   }
 }
diff --git a/public/VCschool.html b/public/VCschool.html
index dd92fcb..da03e6c 100644
--- a/public/VCschool.html
+++ b/public/VCschool.html
@@ -4,12 +4,12 @@
         <title>VC学院</title>
         <style>
             *{padding: 0;margin: 0;}
-            ul{list-style-position: inside;}
+            ul{list-style-position: inside;list-style: none;}
             body{font-family:"微软雅黑","宋体","Arial Narrow",HELVETICA;}
             img{width: 100%;}
             a{text-decoration: none;color: #43257F;}
             a:hover{/*text-decoration: underline;color: red;*/cursor: pointer;}
-            .container{padding-top: 10px;overflow: hidden;background: #fff;width: 90%; margin: 0 auto;max-width: 1200px;}
+            .container{padding-top: 20px;overflow: hidden;background: #fff;width: 90%; margin: 0 auto;max-width: 1200px;}
             .title{padding: 65px 0;text-align: center;background: url('./images/back1.jpg') no-repeat 50% 0;background-size: 175px;}
             .title span{border-bottom: 5px solid red;display: inline-block;}
 
@@ -44,12 +44,34 @@
             .joinbottom div{float: left;margin-right: 10px;}
             .joinbottom .vcto{transform: rotate(180deg);}
         </style>
+        <link rel="stylesheet" href="./style/header.css">
     </head>
     <body>
         <div class="container">
-            <h1 class="title"><span>VC学院</span></h1>
+            <div class="header">
+                <div class="logo">
+                    <div class='logopic'>
+                        <img src="./images/logo.png" alt="logo">
+                    </div>
+                    <div class="logoword">
+                        <p>LP工会</p>
+                        <p>LPUnion</p>
+                    </div>
+                </div>
+                    
+                <div class="menu" id="menu">
+                    <ul>
+                        <li><a href="./index.html">首页</a></li>
+                        <li><a  class="menuover" href="./VCschool.html" target="_self">VC学院</a></li>
+                        <li><a href="./teacher.html" target="_self">导师介绍</a></li>
+                        <li><a>LP公告</a></li>
+                        <li><a>关于LP</a></li>
+                    </ul>
+                </div>
+            </div>
+            <h1 class="title" style="clear: both;"><span>VC学院</span></h1>
             <div class="content">
-                <div class="menu">
+                <div class="menus">
                     <div class="top">
                         <div class="menu-c">
                             <div class="menu-cc">
@@ -149,4 +171,5 @@
             </div>
         </div>
     </body>
+    <script src="./js/header.js"></script>
 </html>
\ No newline at end of file
diff --git a/views/index.html b/public/index.html
similarity index 84%
rename from views/index.html
rename to public/index.html
index 0a518db..abf0807 100644
--- a/views/index.html
+++ b/public/index.html
@@ -4,6 +4,7 @@
         <meta charset="utf-8">
         <title>lp工会</title>
         <link rel="stylesheet" href="./style/swiper.min.css">
+        <link rel="stylesheet" href="./style/header.css">
         <style>
             *{padding: 0;margin: 0;}
             ul{list-style: none;}
@@ -11,17 +12,7 @@
             a{text-decoration: none;color: #43257F;}
             a:hover{/*text-decoration: underline;color: red;*/cursor: pointer;}
             .container{padding-top: 20px;overflow: hidden;background: #fff;width: 90%; margin: 0 auto;max-width: 1200px;}
-            .header{overflow: hidden}
-            .logo{width: 30%;float: left;}
-            .logopic,.logoword{float: left;}
-            .logopic{margin-left: 50px;}
-            .logoword{margin: 10px 0 0 10px;}
-            .logo img{width: 60px;}
-            .menu{width: 70%;overflow: hidden;}
-            .menu ul li{padding-top: 5px;float: left;text-align: center;width: 20%;font-size: 20px;font-weight: bolder;}
-            .menu ul li a{padding: 10px;display: inline-block;border-bottom: 3px solid #fff;}
-            /* .menu ul li a:hover{border-bottom: 3px solid #43257F;} */
-            .menuover{border-bottom: 3px solid #43257F !important;}
+            
             
             .content{overflow: hidden;background: #f8f8f8;margin-top: 10px;}
             .cont:hover{background: #eee;}
@@ -46,8 +37,6 @@
             .contact:hover{opacity: 1;}
 
             @media screen and (max-width: 750px){
-                .logo{width:100%;}
-                .menu{width: 100%;}
                 .left{width: 100%;}
                 .right{width: 100%;}
                 .middle{width: 100%;}
@@ -78,9 +67,9 @@
                     
                 <div class="menu" id="menu">
                     <ul>
-                        <li><a class="menuover">首页</a></li>
-                        <li><a href="./VCschool.html" target="_blanks">VC学院</a></li>
-                        <li><a href="./teacher.html" target="_blank">导师介绍</a></li>
+                        <li><a class="menuover" href="./index.html">首页</a></li>
+                        <li><a href="./VCschool.html" target="_self">VC学院</a></li>
+                        <li><a href="./teacher.html" target="_self">导师介绍</a></li>
                         <li><a>LP公告</a></li>
                         <li><a>关于LP</a></li>
                     </ul>
@@ -142,19 +131,8 @@
         </div>
     </body>
     <script src="./js/swiper.min.js"></script>
+    <script src="./js/header.js"></script>
     <script>
-        var menua=document.getElementById('menu').getElementsByTagName('ul')[0].getElementsByTagName('a');
-        // console.log(menua);
-        var Length=menua.length;
-        for(var i=0;i<Length;i++){
-            menua[i].onmouseover=function(){
-                for(var j=0;j<Length;j++){
-                    menua[j].removeAttribute('class');
-                }
-                this.setAttribute('class','menuover');
-            }
-        }
-
         var swipertwo = new Swiper('.swiper-partner', {
             // pagination: '.swiper-pagination',
             slidesPerView: 8,
diff --git a/public/index1.html b/public/index1.html
new file mode 100644
index 0000000..5f5f2ff
--- /dev/null
+++ b/public/index1.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>  
+    <head>
+        <meta charset="utf-8">
+        <title>lp工会</title>
+        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> 
+        <link rel="stylesheet" href="./style/bootstrap.min.css">   
+        <script src="./js/jquery-1.8.3.min.js"></script> 
+        <script src="./js/bootstrap.min.js"></script> 
+        <style>
+            *{margin: 0;padding: 0;}
+            .logo{padding-right: 0;}
+            .logo img{width: 100%;}
+            .logoword p{padding: 0;margin: 0;}
+        </style>
+    </head>
+    <body>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-4">
+                    <div class="col-md-4 logo">
+                        <img src="./images/logo.png" alt="logo">
+                    </div>
+                    <div class="col-md-4 logoword" style="padding-top: 20px;">
+                        <p>LP工会</p>
+                        <p>LPUnion</p>
+                    </div>
+                </div>
+                <div class="col-md-8"></div>
+            </div>
+        </div>
+    </body>    
+</html>
\ No newline at end of file
diff --git a/public/js/header.js b/public/js/header.js
new file mode 100644
index 0000000..72799d0
--- /dev/null
+++ b/public/js/header.js
@@ -0,0 +1,11 @@
+var menua=document.getElementById('menu').getElementsByTagName('ul')[0].getElementsByTagName('a');
+// console.log(menua);
+var Length=menua.length;
+for(var i=0;i<Length;i++){
+    menua[i].onmouseover=function(){
+        for(var j=0;j<Length;j++){
+            menua[j].removeAttribute('class');
+        }
+        this.setAttribute('class','menuover');
+    }
+}
\ No newline at end of file
diff --git a/public/style/header.css b/public/style/header.css
new file mode 100644
index 0000000..adf0718
--- /dev/null
+++ b/public/style/header.css
@@ -0,0 +1,15 @@
+.header{overflow: hidden}
+.logo{width: 30%;float: left;}
+.logopic,.logoword{float: left;}
+.logopic{margin-left: 50px;}
+.logoword{margin: 10px 0 0 10px;}
+.logo img{width: 60px;}
+.menu{width: 70%;overflow: hidden;}
+.menu ul li{padding-top: 5px;float: left;text-align: center;width: 20%;font-size: 20px;font-weight: bolder;}
+.menu ul li a{padding: 10px;display: inline-block;border-bottom: 3px solid #fff;}
+/* .menu ul li a:hover{border-bottom: 3px solid #43257F;} */
+.menuover{border-bottom: 3px solid #43257F !important;}
+@media screen and (max-width: 750px){
+    .logo{width:100%;}
+    .menu{width: 100%;}
+}
\ No newline at end of file
diff --git a/public/teacher.html b/public/teacher.html
index 3fd56a6..021d700 100644
--- a/public/teacher.html
+++ b/public/teacher.html
@@ -9,10 +9,10 @@
             img{width: 100%;}
             a{text-decoration: none;color: #43257F;}
             a:hover{/*text-decoration: underline;color: red;*/cursor: pointer;}
-            .container{padding-top: 10px;overflow: hidden;background: #fff;width: 90%; margin: 0 auto;max-width: 1200px;}
+            .container{padding-top: 20px;overflow: hidden;background: #fff;width: 90%; margin: 0 auto;max-width: 1200px;}
             .title{padding: 65px 0;text-align: center;background: url('./images/back1.jpg') no-repeat 50% 0;background-size: 175px;}
             .title span{border-bottom: 5px solid red;display: inline-block;}
-
+            
             .content{background: #f2f2f2;overflow: hidden;padding-bottom: 40px;}
             .teacher{width: 50%;float: left;height: 500px;margin-top: 10px;}
             .details{padding: 20px;}
@@ -38,9 +38,31 @@
                 .teacher{width: 100%;font-size: 20px;}
             }
         </style>
+        <link rel="stylesheet" href="./style/header.css">
     </head>
     <body>
         <div class="container">
+            <div class="header">
+                <div class="logo">
+                    <div class='logopic'>
+                        <img src="./images/logo.png" alt="logo">
+                    </div>
+                    <div class="logoword">
+                        <p>LP工会</p>
+                        <p>LPUnion</p>
+                    </div>
+                </div>
+                    
+                <div class="menu" id="menu">
+                    <ul>
+                        <li><a href="./index.html">首页</a></li>
+                        <li><a href="./VCschool.html" target="_self">VC学院</a></li>
+                        <li><a  class="menuover" href="./teacher.html" target="_self">导师介绍</a></li>
+                        <li><a>LP公告</a></li>
+                        <li><a>关于LP</a></li>
+                    </ul>
+                </div>
+            </div>
             <h1 class="title"><span>老师介绍</span></h1>
             <div class="content" id="content">
 
@@ -171,4 +193,5 @@
         $('#content').children().remove();
         $('#content').append(str);
     </script>
+    <script src="./js/header.js"></script>
 </html>
\ No newline at end of file
-- 
Gitee

