liting2017 6 years ago
parent
commit
37942b0c58

+ 1 - 1
src/css/newMenu/header.css

@@ -176,7 +176,7 @@
 
 .search {
     clear: both;
-    margin-top: 55px;
+    margin-top: 30px;
 }
 
 .navMeau {

+ 0 - 1
src/css/newMenu/serviceList.css

@@ -195,7 +195,6 @@
 }
 .achievementHot ul li:hover{
     box-shadow: 0 0 20px #ccc;
-    transform:  scale(1.02);
     transition: all .2s ease-in;
 }
 .achievementHot ul li .hr {

+ 1 - 1
src/css/public.css

@@ -156,7 +156,7 @@ ol {
 
 .navHeader .nav {
 	float: left;
-	padding-left: 70px;
+	padding-left: 40px;
 }
 
 .navHeader .nav>ul>li {

+ 11 - 0
src/js/newMenu/achievement.js

@@ -12,6 +12,17 @@ $(function(){
     function init(){
         nav();
         searchFun();
+        navTop();
+    }
+    function navTop() {
+        $(window).scroll(function () {
+            var scrolltop = $(document).scrollTop();
+            if (scrolltop > 500) {
+                $('.topNav').addClass('navFix')
+            } else {
+                $('.topNav').removeClass('navFix');
+            }
+        });
     }
     //二级导航
     function nav() {

+ 11 - 0
src/js/newMenu/demand.js

@@ -13,6 +13,17 @@ $(function () {
     function init() {
         nav();
         searchFun();
+        navTop();
+    }
+    function navTop() {
+        $(window).scroll(function () {
+            var scrolltop = $(document).scrollTop();
+            if (scrolltop > 500) {
+                $('.topNav').addClass('navFix')
+            } else {
+                $('.topNav').removeClass('navFix');
+            }
+        });
     }
     //二级导航
     function nav() {

+ 38 - 20
src/js/newMenu/services.js

@@ -1,44 +1,62 @@
 import 'css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
 import 'css/newMenu/public.css';
-import 'css/newMenu/header.css'
+import 'css/newMenu/header.css';
 import 'css/newMenu/services.css';
 import 'js/public.js';
 import 'js/newMenu/map.js';
 
-$(function(){
-   
+$(function () {
+
+
     init();
-    function init(){
+
+    function init() {
         listFun();
         search();
+        navTop();
     };
+
+    function navTop() {
+        $(window).scroll(function () {
+            var scrolltop = $(document).scrollTop();
+            if (scrolltop > 500) {
+                $('.topNav').addClass('navFix')
+            } else {
+                $('.topNav').removeClass('navFix');
+            }
+        });
+    }
     // search
-    function search (){
-        $('.searchBtn').click(function(){
+    function search() {
+        $('.searchBtn').click(function () {
             let name = $('.demandSearch').val().trim();
-            window.location.href=globalConfig.context+'/portal/service/serviceList?name='+name
+            window.location.href = globalConfig.context + '/portal/service/serviceList?name=' + name
         })
     }
-     /*合作客户切换  */
-    function listFun(){
-        let m=0,
+    /*合作客户切换  */
+    function listFun() {
+        let m = 0,
             liW = $('.customerList ul li').width(),
             len = $('.customerList ul li').length;
-        $('.cooperationPeople .listNext').on('click',function(){
+        $('.cooperationPeople .listNext').on('click', function () {
             m++;
-            if(m>len-3){
-                m=len-3;
+            if (m > len - 3) {
+                m = len - 3;
             };
-            $('.customerList ul').animate({marginLeft:-liW*m+'px'})
+            $('.customerList ul').animate({
+                marginLeft: -liW * m + 'px'
+            })
         });
-        $('.cooperationPeople .listPre').on('click',function(){
+        $('.cooperationPeople .listPre').on('click', function () {
             m--;
-            if(m<=0){
-               m=0;
+            if (m <= 0) {
+                m = 0;
             }
-            $('.customerList ul').animate({marginLeft:-liW*m+'px'})
+            $('.customerList ul').animate({
+                marginLeft: -liW * m + 'px'
+            })
         });
     }
-   
-})
+
+})

+ 1 - 1
src/js/technologyTrading/achievementDetail.js

@@ -1,6 +1,6 @@
 import '../../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../../css/public.css';
+import '../../css/newMenu/public.css';
 import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';

+ 1 - 1
src/js/technologyTrading/demandDetail.js

@@ -1,6 +1,6 @@
 import '../../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../../css/public.css';
+import '../../css/newMenu/public.css';
 import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';

+ 1 - 1
src/js/thinkTank/policyDetail.js

@@ -1,6 +1,6 @@
 import '../../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../../css/public.css';
+import '../../css/newMenu/public.css';
 import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';

+ 1 - 1
src/js/thinkTank/policyList.js

@@ -1,6 +1,6 @@
 import '../../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../../css/public.css';
+import '../../css/newMenu/public.css';
 import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';

+ 1 - 1
src/js/thinkTank/thinkerDetail.js

@@ -1,6 +1,6 @@
 import '../../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../../css/public.css';
+import '../../css/newMenu/public.css';
 import '../../js/public.js';
 import '../../css/thinkTank/thinkerDetail.css';
 import {

+ 67 - 56
template/newMenu/demand.html

@@ -43,72 +43,83 @@
         </div>
     </div>
     <!-- search -->
-    <div class="container">
-        <div class="navHeader">
-            <div class="logo">
-                <a href="#">
-                    <img src="../../img/Logo111.png" alt="" title="技淘">
-                </a>
-            </div>
-            <div class="logo_right"></div>
-            <div class="nav">
-                <ul>
-                    <li>
-                        <a href="#">科技服务</a>
-                        <img src="../../img/hot.png">
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">高企认定</a>
-                            </li>
-                            <li>
-                                <a href="#">知识产权</a>
-                            </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">技术交易</a>
-                        <ol class="subnavigation">
-                            <li>
-                                <a href="#">专利产品</a>
-                            </li>
-                            <li>
-                                <a href="#">技术成果</a>
-                            </li>
-                            <li>
-                                <a href="#">技术需求</a>
-                            </li>
+    <div class="topNav">
+            <div class="container">
+                <div class="navHeader">
+                    <div class="logo">
+                        <a href="#">
+                            <img src="../../img/Logo111.png" alt="" title="技淘">
+                        </a>
+                    </div>
+                    <div class="logo_right"></div>
+                    <div class="nav">
+                        <ul>
                             <li>
-                                <a href="#">技术评估</a>
+                                <div>
+                                    <a href="#">科技服务</a>
+                                    <ol class="subnavigation">
+                                        <li>
+                                            <a href="#">高企认定</a>
+                                        </li>
+                                        <li>
+                                            <a href="#">知识产权</a>
+                                        </li>
+                                    </ol>
+                                </div>
                             </li>
-                        </ol>
-                    </li>
-                    <li>
-                        <a href="#">智库咨询</a>
-                        <ol class="subnavigation">
                             <li>
-                                <a href="#">智政</a>
+                                <div>
+                                    <a href="#">技术交易</a>
+                                    <ol class="subnavigation">
+                                        <li>
+                                            <a href="#">专利产品</a>
+                                        </li>
+                                        <li>
+                                            <a href="#">技术成果</a>
+                                        </li>
+                                        <li>
+                                            <a href="#">技术需求</a>
+                                        </li>
+                                        <li>
+                                            <a href="#">技术评估</a>
+                                        </li>
+                                    </ol>
+                                </div>
                             </li>
                             <li>
-                                <a href="/portal/thinkTank/index.html#zizone">智者</a>
+                                <div>
+                                    <a href="#">智库咨询</a>
+                                    <ol class="subnavigation">
+                                        <li>
+                                            <a href="#">智政</a>
+                                        </li>
+                                        <li>
+                                            <a href="/portal/thinkTank/index.html#zizone">智者</a>
+                                        </li>
+                                    </ol>
+                                </div>
                             </li>
-                        </ol>
-                    </li>
-
-                    <li>
-                        <a href="/portal/aboutUs.html">关于公司</a>
-                        <ol class="subnavigation" style="display: none;">
+    
                             <li>
-                                <a href="#">联系我们</a>
+                                <div>
+                                    <a href="/portal/aboutUs.html">关于公司</a>
+                                    <ol class="subnavigation" style="display: none;">
+                                        <li>
+                                            <a href="#">联系我们</a>
+                                        </li>
+                                    </ol>
+                                </div>
                             </li>
-                        </ol>
-                    </li>
-                </ul>
-            </div>
-            <div class="nav_right">
-                <img src="../../img/newMenu/navImg.jpg" alt="">
-                <span>国家技术转移示范机构</span>
+                        </ul>
+                    </div>
+                    <div class="nav_right">
+                        <img src="../../img/newMenu/navImg.jpg" alt="">
+                        <span>国家技术转移示范机构</span>
+                    </div>
+                </div>
             </div>
         </div>
+        <div class="container">
         <div class="clearFix search">
             <div class="navMeau">
                 <div>