|  | @@ -9,10 +9,17 @@
 | 
	
		
			
				|  |  |  	<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>  	
 | 
	
	
		
			
				|  | @@ -159,23 +166,15 @@
 | 
	
		
			
				|  |  |  			<div class="industry_left">
 | 
	
		
			
				|  |  |  				<h3>行业分类</h3>
 | 
	
		
			
				|  |  |  				<ul class="industry_ul">
 | 
	
		
			
				|  |  | -					<li class="action_li" value="0"><a href="javascript:;">医学类</a></li>
 | 
	
		
			
				|  |  | -					<li value="1"><a href="javascript:;">教育咨询</a></li>
 | 
	
		
			
				|  |  | -					<li value="2"><a href="javascript:;">航天航空</a></li>
 | 
	
		
			
				|  |  | -					<li value="3"><a href="javascript:;">医学类</a></li>
 | 
	
		
			
				|  |  | -					<li value="4"><a href="javascript:;">教育咨询</a></li>
 | 
	
		
			
				|  |  | -					<li value="5"><a href="javascript:;">航天航空</a></li>
 | 
	
		
			
				|  |  | -					<li value="6"><a href="javascript:;">医学类</a></li>
 | 
	
		
			
				|  |  | -					<li value="7"><a href="javascript:;">教育咨询</a></li>
 | 
	
		
			
				|  |  | -					<li value="8"><a href="javascript:;">航天航空</a></li>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  				</ul>
 | 
	
		
			
				|  |  |  			</div>
 | 
	
		
			
				|  |  |  			<div class="industry_right">
 | 
	
		
			
				|  |  |  				<div class="title_details">
 | 
	
		
			
				|  |  |  					<ol>
 | 
	
		
			
				|  |  | -						<li class="act" value="999" id="patent">专利交易</li>
 | 
	
		
			
				|  |  | -						<li value="0" id="attorn">精品技术转让</li>
 | 
	
		
			
				|  |  | -						<li value="1" id="nedd">精品创业需求</li>
 | 
	
		
			
				|  |  | +						<li class="act" value="0" id="patent">专利交易</li>
 | 
	
		
			
				|  |  | +						<li value="1" id="attorn">精品技术转让</li>
 | 
	
		
			
				|  |  | +						<li value="0" id="nedd">精品创业需求</li>
 | 
	
		
			
				|  |  |  					</ol>
 | 
	
		
			
				|  |  |  				</div>
 | 
	
		
			
				|  |  |  				<div class="main_details checked">
 | 
	
	
		
			
				|  | @@ -251,7 +250,17 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  					</ul>
 | 
	
		
			
				|  |  |  				</div>			
 | 
	
		
			
				|  |  | -				<div class="pagination_box"></div>
 | 
	
		
			
				|  |  | +				<div class="pagination_box">
 | 
	
		
			
				|  |  | +					<div>
 | 
	
		
			
				|  |  | +						<div class="paging_box">
 | 
	
		
			
				|  |  | +							<!--<span value="1" class="action_span">1</span>-->
 | 
	
		
			
				|  |  | +							<!--<span value="2" >2</span>-->
 | 
	
		
			
				|  |  | +							<!--<span value="3" >3</span>-->
 | 
	
		
			
				|  |  | +							<!--<span value="4" >4</span>-->
 | 
	
		
			
				|  |  | +						</div>
 | 
	
		
			
				|  |  | +					</div>
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  | +				</div>
 | 
	
		
			
				|  |  |  			</div>
 | 
	
		
			
				|  |  |  		</div>
 | 
	
		
			
				|  |  |  	<div>
 | 
	
	
		
			
				|  | @@ -395,10 +404,17 @@
 | 
	
		
			
				|  |  |  	<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>
 |