ws2z3gr2017 %!s(int64=7) %!d(string=hai) anos
pai
achega
e43f008f96

+ 1 - 0
src/css/public.css

@@ -12,6 +12,7 @@ body{font:14px "simsun",Arial,Helvetica,sans-serif;width:100%;
 body,h1,h2,h3,h4,h6,p,ul,ol,dl,dd{margin:0;padding:0;list-style:none;}
 a{color:#000;text-decoration:none;}
 a:hover{color:#000;text-decoration:none;}
+a:focus{text-decoration: none;}
 .lf{float:left;}
 .rf{float:right;}
 .clear{clear:both;}

+ 1 - 1
src/css/thinktank.css

@@ -56,7 +56,7 @@
 .zizone_text>a{font-size: 14px;color: #ffbc09;float: right;margin-right: 20px;margin-top: 10px;}
 .main_zizone ul li:hover{cursor: pointer;}
 .main_zizone ul li:hover .zizone_text{background: #ffb200;}
-.main_zizone ul li:hover .zizone_text h4 a{color: #ffffff;}
+.main_zizone ul li:hover .zizone_text  a{color: #ffffff;}
 .main_zizone ul{height: 368px;overflow: hidden;}
 .zizone_left,.zizone_right{width: 40px;height: 40px;display:inline-block;font-size: 20px;font-weight: 900;border: 1px solid #CCCCCC;border-radius: 50%;text-align: center;line-height: 36px;}
 .zizone_left{position: absolute;left: -60px;top: 50%;margin-top: -30px;}

+ 0 - 9
src/js/Technologytrading.js

@@ -9,7 +9,6 @@ import {
     industryObject,
     getIndustryCategory
     } from './DicIndustryList';
-//实现行业分类的页面加载
 (function(){
     var ul_html="";
     for(var i=0;i<industryObject.length;i++){
@@ -18,7 +17,6 @@ import {
     $(".industry_ul").html(ul_html);
     $(".industry_ul li:first").addClass("action_li");
 })();
-//实现行业分类和右边内容的显示
 (function(){
     $(".title_details ol li").click(function(){
         $(this).addClass("act").siblings().removeClass("act");
@@ -70,7 +68,6 @@ import {
             }
         })
     });
-    //实现右侧内容的分页功能
     $(".pagination_box").on("click","span",function(){
         $(this).addClass("action_span").siblings().removeClass("action_span");
         var page_length=$(this).attr("value");
@@ -97,12 +94,6 @@ import {
 
 })();
 
-<<<<<<< HEAD
- 
-=======
-
-   
->>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
 
 
 

+ 2 - 15
template/Technologytrading.html

@@ -9,18 +9,11 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>科技服务</title>
-<<<<<<< HEAD
+
    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />
     <link rel="stylesheet" href="../src/css/public.css" />
     <link rel="stylesheet" href="../src/css/main_banner.css" />
     <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
-=======
-    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />-->
-    <!--<link rel="stylesheet" href="../src/css/public.css" />-->
-    <!--<link rel="stylesheet" href="../src/css/main_banner.css" />-->
-    <!--<link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>-->
->>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
-
 </head>
 <body>  	
   	<header>
@@ -404,17 +397,11 @@
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
 
-<<<<<<< HEAD
+
 <!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
 <script type="text/javascript" src="../src/js/Technologytrading.js"></script>
 <script type="text/javascript" src="../src/js/public.js"></script>
 <script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
-=======
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/Technologytrading.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/main_banner.js" ></script>-->
->>>>>>> e53e0117f522b5f0aec5953b440a04e83e12665c
 
 
 </html>

+ 3 - 3
template/thinktank.html

@@ -291,7 +291,7 @@
 	 						</div>
 	 					</li>
 	 					<li>
-	 						<img src="../img/think_31.png" alt="" />
+	 						<img src="../img/think_32.png" alt="" />
 	 						<div class="zizone_text">
 		 						<h4><a href="">高新是什家纺的的大学城赴会而</a></h3>
 		 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
@@ -299,7 +299,7 @@
 	 						</div>
 	 					</li>
 	 					<li>
-	 						<img src="../img/think_31.png" alt="" />
+	 						<img src="../img/think_38.png" alt="" />
 	 						<div class="zizone_text">
 		 						<h4><a href="">高新是什家纺的的大学城赴会而</a></h3>
 		 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>
@@ -307,7 +307,7 @@
 	 						</div>
 	 					</li>
 	 					<li>
-	 						<img src="../img/think_31.png" alt="" />
+	 						<img src="../img/think_34.jpg" alt="" />
 	 						<div class="zizone_text">
 		 						<h4><a href="">高新是什家纺的的大学城赴会而</a></h3>
 		 						<p>怒吼道胡非常胡海峰回复哦地科技i将诶耳机哦饿哦降低间谍iOS等会吃饭虽很商务i回复</p>