Browse Source

智库模版

ws2z3gr2017 7 years ago
parent
commit
4f3d37ad9e

BIN
img/search_bg.png


BIN
img/search_line.png


BIN
img/technology_bg.png


BIN
img/technology_gain.png


BIN
img/technology_question.png


BIN
img/technology_text.png


+ 84 - 2
src/css/Technologytrading.css

@@ -1,22 +1,97 @@
+
+*{box-sizing: border-box;}
+.clear_line{width:100%;height:1px;}
+#technology{width:100%;height:420px;box-shadow: 0 8px 8px 0 #E4E4E4;}
+.technolo{width:1200px;height:420px;padding-top:40px;margin:0 auto;
+    position: relative;}
+.technolo_left{width:390px;height:340px;display:inline-block;
+    position: absolute;top:40px;left:0;}
+
+.technolo>div>div{width:390px;height:235px;
+    margin-top:45px;position: relative;}
+.technolo>div>h3{color:#256195;}
+.technolo>div>div:hover{background: url("../../img/technology_bg.png") center center;
+background-size: 390px 235px;}
+.technolo_text{width:365px;height:210px;border:1px solid #F4F4F4;
+    margin:12px auto;border-radius: 10px;padding: 50px 10px 35px 30px;}
+.technolo_text>div{margin-bottom: 10px;}
+.technolo_text h5{color:#FF951D;margin:0;}
+.technolo_text p{display: inline-block;}
+.technolo_text a{display: inline-block;color:#FF951D;}
+.technolo>div>div>img{position: absolute;top:-40px;left:20px;}
+.technolo>div>div>span{width:75px;height:35px;background: #FFB200;
+    border-radius: 10px;position: absolute;left:40px;bottom:0;text-align: center;
+    line-height: 35px;color:#fff;}
+.technolo_center{width:390px;height:340px;display:inline-block;
+    position: absolute;top:40px;left:400px;}
+.technolo_right{width:390px;height:340px;display:inline-block;
+    position: absolute;top:40px;right:0;}
+
+/*search*/
+#search{width:100%;height:270px;background: #F5F5F5;padding-top: 25px;margin-top: 10px;}
+.search{width:1200px;height:215px;background: url("../../img/search_bg.png") center center;
+background-size: 1200px 215px;margin:0 auto;position: relative;}
+.search_cont{width:690px;height:180px;position: absolute;top:20px;left:140px;}
+.search_cont>h3{text-align: center;line-height: 60px;color:#000;}
+.search_cont>input{display: block;width:665px;height:40px;
+    border: 1px solid #DDB14B;border-radius: 20px;padding-left: 25px;
+    margin-left:12px; }
+.search_cont>span{width:35px;height:35px;position: absolute;top:63px;right:30px;
+    background: url("../../img/search_line.png") center center;cursor: pointer;}
+.search_cont>div{display: block;width:665px;height:40px;
+    padding-left: 15px;margin-left:12px;margin-top:15px;}
+.search_cont>div>span{font-size: 16px;font-weight: bold;margin-right: 5px;color:#414141;}
+
+
+/*li*/
+.container{width: 1200px;}
+.industry{background: #ffffff;overflow: hidden;margin-bottom: 30px;}
+.industry_left{float: left;width: 300px;height:1000px;text-align: center;
+    padding-top: 40px;background: #2a9ee2;}
+
 body{background: #f5f5f5;}
 body{background: #f5f5f5;}
 .container{width: 1200px;}
 .container{width: 1200px;}
 .industry{background: #ffffff;overflow: hidden;margin-bottom: 30px;}
 .industry{background: #ffffff;overflow: hidden;margin-bottom: 30px;}
 .industry_left{float: left;width: 300px;text-align: center;padding-top: 40px;background: #2a9ee2;height: 100%;}
 .industry_left{float: left;width: 300px;text-align: center;padding-top: 40px;background: #2a9ee2;height: 100%;}
+
 .industry_left h3{font-size: 24px;margin-bottom: 22px;color: #FFFFFF;font-weight:normal;}
 .industry_left h3{font-size: 24px;margin-bottom: 22px;color: #FFFFFF;font-weight:normal;}
 .industry_left ul li a{font-size:16px ;color: #ffffff;}
 .industry_left ul li a{font-size:16px ;color: #ffffff;}
 .industry_left ul li{line-height: 36px;height: 36px;}
 .industry_left ul li{line-height: 36px;height: 36px;}
 .title_details{width: 840px;clear: both;margin-bottom: 36px;}
 .title_details{width: 840px;clear: both;margin-bottom: 36px;}
 .industry_right{float: left;padding-left: 30px;width: 870px;}
 .industry_right{float: left;padding-left: 30px;width: 870px;}
 .title_details ol {width: 100%;overflow: hidden;border-bottom: 1px solid #CCCCCC;}
 .title_details ol {width: 100%;overflow: hidden;border-bottom: 1px solid #CCCCCC;}
+
+.title_details ol li{float: left;padding-left: 12px;padding-right: 12px;
+    font-size: 24px;color: #333333;border-bottom: 1px solid transparent;
+    line-height: 50px;cursor: pointer;}
+.act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
+.action_li{box-shadow: 0 0 10px 0 #ddd inset}
+.checked_no{display:none;}
+.main_details ul{overflow: hidden;}
+.main_details ul li{width: 260px;height:380px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
+
 .title_details ol li{float: left;padding-left: 12px;padding-right: 12px;font-size: 24px;color: #333333;border-bottom: 1px solid transparent;line-height: 50px;}
 .title_details ol li{float: left;padding-left: 12px;padding-right: 12px;font-size: 24px;color: #333333;border-bottom: 1px solid transparent;line-height: 50px;}
 .act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
 .act{color:#074d88 !important;border-bottom: 1px solid #074d88!important;}
 .main_details ul{overflow: hidden;}
 .main_details ul{overflow: hidden;}
 .main_details ul li{width: 260px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
 .main_details ul li{width: 260px;float: left;position: relative;z-index: 10;box-shadow: 0 0 15px #CCCCCC;margin-left: 10px;margin-right: 10px;margin-bottom: 20px;}
+
 .main_details ul li img{;width: 260px;}
 .main_details ul li img{;width: 260px;}
 .main_details ul li .details_fix{position: absolute;top: 145px;background: rgba(131,146,145,0.5);z-index: 12;width: 260px;height: 70px;text-align: center;color: #FFFFFF;}
 .main_details ul li .details_fix{position: absolute;top: 145px;background: rgba(131,146,145,0.5);z-index: 12;width: 260px;height: 70px;text-align: center;color: #FFFFFF;}
 .details_fix p{line-height: 25px;}
 .details_fix p{line-height: 25px;}
 .details_fix p:first-child{margin-top: 10px;}
 .details_fix p:first-child{margin-top: 10px;}
 .details_fix p span{color: #333333;margin-left: 5px;}
 .details_fix p span{color: #333333;margin-left: 5px;}
+
+.details_text{width:260px;padding-top:10px ;position: absolute;left: 0;bottom:0px;}
+.details_text p{width: 200px;margin:5px auto;color: #f68705;font-size: 16px;}
+.details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;text-overflow: ellipsis;white-space: nowrap;}
+.details_text p b{font-weight:normal;color: #333333;width:160px;height:40px ;display: inline-block;vertical-align: top; }
+.details_text a{width: 80px;height: 26px;display: inline-block;
+    background: #ffb200;border-radius: 10px;float: right;
+    line-height: 26px;text-align: center;color: #ffffff;
+    margin-right: 30px;margin-bottom: 16px;margin-top:15px;}
+
+.pagination_box{width: 840px;}
+
 .details_text{width:260px;padding-top:10px ;}
 .details_text{width:260px;padding-top:10px ;}
 .details_text p{width: 200px;margin:5px auto;color: #f68705;font-size: 16px;}
 .details_text p{width: 200px;margin:5px auto;color: #f68705;font-size: 16px;}
 .details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;text-overflow: ellipsis;white-space: nowrap;}
 .details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;text-overflow: ellipsis;white-space: nowrap;}
@@ -36,10 +111,10 @@ body{background: #f5f5f5;}
 .channel ul{overflow: hidden;margin-top: 65px;margin-left: 10px;}
 .channel ul{overflow: hidden;margin-top: 65px;margin-left: 10px;}
 .channel ul li{width: 195px;float: left;height: 195px;margin-left: 40px;}
 .channel ul li{width: 195px;float: left;height: 195px;margin-left: 40px;}
 .channel ul li:first-child{margin-left: 0;}
 .channel ul li:first-child{margin-left: 0;}
-.channel ul li a{color: #ffffff;font-size: 20px;line-height: 195px;height: 195px;display: inline-block;width: 195px;display: inline-block;}
+.channel ul li a{color: #ffffff;font-size: 20px;line-height: 195px;height: 195px;display: inline-block;width: 195px;}
 .channel ul li:nth-child(2n+1){background: url(../../img/Technology_25.png)no-repeat center;}
 .channel ul li:nth-child(2n+1){background: url(../../img/Technology_25.png)no-repeat center;}
 .channel ul li:nth-child(2n){background: url(../../img/Technology_26.png)no-repeat center;margin-top: 50px;}
 .channel ul li:nth-child(2n){background: url(../../img/Technology_26.png)no-repeat center;margin-top: 50px;}
-
+.checkd{display:block;}
 #bottom{margin-top: -150px;}
 #bottom{margin-top: -150px;}
 
 
 
 
@@ -50,3 +125,10 @@ body{background: #f5f5f5;}
 
 
 
 
 
 
+
+
+
+
+
+
+

+ 113 - 76
src/js/Technologytrading.js

@@ -6,84 +6,121 @@ import './public.js';
 import './main_banner.js';
 import './main_banner.js';
 import '../css/Technologytrading.css';
 import '../css/Technologytrading.css';
 
 
-
+(function(){
+    $(".title_details ol li").click(function(){
+        $(this).addClass("act").siblings().removeClass("act");
+        var left_val=$(".industry_ul li.action_li").val();
+        var right_val = $(this).val();
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/portal/search/demandList",
+            data: {
+                category:left_val,
+                fieldA:right_val
+            },
+            success: function (data) {
+                console.log(data);
+            }
+        })
+    });
+    $(".industry_ul li").click(function() {
+        $(".title_details ol li").eq(0).addClass("act").siblings().removeClass("act");
+        $(this).addClass("action_li").siblings().removeClass("action_li");
+        var left_val = $(this).val();
+        var right_val = $(".title_details ol li").eq(0).val();
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/portal/search/demandList",
+            data: {
+                category:left_val,
+                fieldA:right_val
+            },
+            success: function (data) {
+                console.log(data);
+            }
+        })
+    })
+})();
 $(function(){
 $(function(){
-	var industry = $('.industry').innerHeight();
-	$('.industry_left').height(industry)	
+    var industry = $('.industry').innerHeight();
+    $('.industry_left').height(industry)
 })
 })
-var theKeyword, theMode, theFieldA, theFieldB;
-var thePageNo = 1,
-    thePageLength = 1,
-    pageSize = 12;
-var categoryObj = {
-    "0": "精品技术转让",
-    "1": "精品创业需求",    
-};
-function loadDate(pageNo) {
-    $.ajax({
-        method: "get",
-        dataType: "json",
-        url: globalConfig.context + "/portal/search/demandList",
-        data: {
-            pageNo: pageNo || 1,
-            pageSize: pageSize,
-            keyword: theKeyword,
-            sign: 0,
-            demandType: theMode != 999 ? theMode : undefined,
-            industryCategoryA: theFieldA != 999 ? theFieldA : undefined,
-            industryCategoryB: theFieldB != 999 ? theFieldB : undefined,
-        },
-        success: function (data) {
-            var theArr = [];
-            if (data.data && data.data.list) {
-                for (let i = 0; i < data.data.list.length; i++) {
-                    let thisdata = data.data.list[i];
-                    theArr.push([
-//                      '<li>',
-//                      '<img src="../img/Technology_21.png" alt="" />',//图片地址修改
-//                    	'<div class="details_text">',
-//                    	'<p>行业 <span title="' + getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) + '">'+ getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) +'</span></p>',                       
-//                      '<p>价格 <span>'+thisdata.budgetCost+'</span></p>',
-//                   	'<p>简介 <b>' + thisdata.problemDes + '</b></p>',
-//                   	'<a href="#">了解详情</a>',
-//                      '</div>',
-//                      '<div class="details_fix">',
-//                      '<p>专利名 <span>' + thisdata.name + '</span></p>',
-//                      '<p>所有人 <span>'++'</span></p>	',  //所有人
-//                      '</div>',
-//                      '</li>',                       
-                    ].join(''));
-                };
-            };
-            $('#demandList').empty();
-            $('#demandList').append(theArr.join(''));
+//var theKeyword, theMode, theFieldA, theFieldB;
+//var thePageNo = 1,
+//    thePageLength = 1,
+//    pageSize = 12;
+//var categoryObj = {
+//    "0": "绮惧搧鎶�鏈浆璁�",
+//    "1": "绮惧搧鍒涗笟闇�姹�",
+//};
+//function loadDate(pageNo) {
+//    $.ajax({
+//        method: "get",
+//        dataType: "json",
+//        url: globalConfig.context + "/portal/search/demandList",
+//        data: {
+//            pageNo: pageNo || 1,
+//            pageSize: pageSize,
+//            keyword: theKeyword,
+//            sign: 0,
+//            demandType: theMode != 999 ? theMode : undefined,
+//            industryCategoryA: theFieldA != 999 ? theFieldA : undefined,
+//            industryCategoryB: theFieldB != 999 ? theFieldB : undefined,
+//        },
+//        success: function (data) {
+//            var theArr = [];
+//            if (data.data && data.data.list) {
+//                for (let i = 0; i < data.data.list.length; i++) {
+//                    let thisdata = data.data.list[i];
+//                    theArr.push([
+////                      '<li>',
+////                      '<img src="../img/Technology_21.png" alt="" />',//鍥剧墖鍦板潃淇敼
+////                    	'<div class="details_text">',
+////                    	'<p>琛屼笟 <span title="' + getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) + '">'+ getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) +'</span></p>',
+////                      '<p>浠锋牸 <span>'+thisdata.budgetCost+'</span></p>',
+////                   	'<p>绠�浠� <b>' + thisdata.problemDes + '</b></p>',
+////                   	'<a href="#">浜嗚В璇︽儏</a>',
+////                      '</div>',
+////                      '<div class="details_fix">',
+////                      '<p>涓撳埄鍚� <span>' + thisdata.name + '</span></p>',
+////                      '<p>鎵�鏈変汉 <span>'++'</span></p>	',  //鎵�鏈変汉
+////                      '</div>',
+////                      '</li>',
+//                    ].join(''));
+//                };
+//            };
+//            $('#demandList').empty();
+//            $('#demandList').append(theArr.join(''));
+//
+//            $('.totalCount').html("鍏�" + data.data.totalCount + "鏉℃暟鎹�");
+//            thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+//            var pageArr = [],
+//                firstNo = 1,
+//                endNo = 3;//5
+//            if (thePageNo > 3) {
+//                firstNo = thePageNo - 2;
+//                endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+//            } else {
+//                endNo = Math.min(thePageLength, 3);//5
+//            };
+//            for (let i = firstNo; i <= endNo; i++) {
+//                if (i == thePageNo) {
+//                    pageArr.push(
+//                        '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
+//                    );
+//                } else {
+//                    pageArr.push(
+//                        '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
+//                    );
+//                }
+//            };
+//            $('.pageNumber').remove();
+//            $('.pagePre').after(pageArr.join(''));
+//        },
+//    });
+//}
 
 
-            $('.totalCount').html("共" + data.data.totalCount + "条数据");
-            thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
-            var pageArr = [],
-                firstNo = 1,
-                endNo = 3;//5
-            if (thePageNo > 3) {
-                firstNo = thePageNo - 2;
-                endNo = Math.min((Number(thePageNo) + 2), thePageLength);
-            } else {
-                endNo = Math.min(thePageLength, 3);//5
-            };
-            for (let i = firstNo; i <= endNo; i++) {
-                if (i == thePageNo) {
-                    pageArr.push(
-                        '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
-                    );
-                } else {
-                    pageArr.push(
-                        '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
-                    );
-                }
-            };
-            $('.pageNumber').remove();
-            $('.pagePre').after(pageArr.join(''));
-        },
-    });
-}
 
 
 
 

+ 7 - 7
src/js/service.js

@@ -1,10 +1,10 @@
-import '../css/bootstrap.less';
-import 'bootstrap/dist/js/bootstrap.js';
-import '../css/public.css';
-import '../css/service.css';
-import '../css/main_banner.css';
-import './public.js';
-import './main_banner.js'
+//import '../css/bootstrap.less';
+//import 'bootstrap/dist/js/bootstrap.js';
+//import '../css/public.css';
+//import '../css/service.css';
+//import '../css/main_banner.css';
+//import './public.js';
+//import './main_banner.js'
 (function(){     
 (function(){     
     $("#office").click(function(){
     $("#office").click(function(){
         $(this).removeClass("that").addClass("that");
         $(this).removeClass("that").addClass("that");

+ 378 - 1
template/Technologytrading.html

@@ -9,10 +9,24 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 	<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">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>科技服务</title>
     <title>科技服务</title>
+<<<<<<< HEAD
     <link rel="stylesheet" href="../src/css/bootstrap.css" />
     <link rel="stylesheet" href="../src/css/bootstrap.css" />
     <link rel="stylesheet" href="../src/css/public.css" />
     <link rel="stylesheet" href="../src/css/public.css" />
     <link rel="stylesheet" href="../src/css/main_banner.css" />
     <link rel="stylesheet" href="../src/css/main_banner.css" />
     <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>
     <link rel="stylesheet" type="text/css" href="../src/css/Technologytrading.css"/>
+=======
+<<<<<<< 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"/>-->
+>>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
+>>>>>>> 3f034bf88b36b4026efb6faf31c6ceba61bbe447
 </head>
 </head>
 <body>  	
 <body>  	
   	<header>
   	<header>
@@ -52,6 +66,340 @@
 		</a>
 		</a>
 	</div>
 	</div>
   	<!--主体内容区域开始-->
   	<!--主体内容区域开始-->
+<<<<<<< HEAD
+ 	<div id="technology">
+		<div class="technolo">
+			<div class="technolo_left">
+				<h3>技术交易政策</h3>
+				<div>
+					<div class="clear_line"></div>
+					<div class="technolo_text">
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+					</div>
+					<img src="../img/technology_text.png" alt=""/>
+					<span>更 多</span>
+				</div>
+			</div>
+			<div class="technolo_center">
+				<h3>技术交易政策</h3>
+				<div>
+					<div class="clear_line"></div>
+					<div class="technolo_text">
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+					</div>
+					<img src="../img/technology_gain.png" alt=""/>
+					<span>更 多</span>
+				</div>
+			</div>
+			<div class="technolo_right">
+				<h3>技术交易政策</h3>
+				<div>
+					<div class="clear_line"></div>
+					<div class="technolo_text">
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+						<div>
+							<h5>高新是什么?</h5>
+							<p>高新是高科技和新技术的结合...</p>
+							<a href="#">了解更多</a>
+						</div>
+					</div>
+					<img src="../img/technology_question.png" alt=""/>
+					<span>更 多</span>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="search">
+		<div class="search">
+			<form action="">
+				<div class="search_cont">
+					<h3>快速搜索</h3>
+					<input type="text" placeholder="医药生物"/>
+					<span class="search_click"></span>
+					<div>
+						<span>医药</span>
+						<span>教育</span>
+						<span>生物</span>
+						<span>医药</span>
+						<span>教育</span>
+						<span>生物</span>
+						<span>医药</span>
+						<span>教育</span>
+						<span>生物</span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div class="industry">
+		<div class="container">
+			<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>
+					</ol>
+				</div>
+				<div class="main_details checked">
+					<ul id="demandList_patent">
+						<li>
+							<img src="../img/Technology_21.png" alt="" />
+							<div class="details_text">
+								<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
+								<p>价格 <span>10000</span></p>
+								<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
+								<a href="#">了解详情</a>
+							</div>
+							<div class="details_fix">
+								<p>专利名 <span> 医疗四分局王死哦风景</span></p>
+								<p>所有人 <span> 胡海峰</span></p>
+							</div>
+						</li>
+						<li>
+							<img src="../img/Technology_21.png" alt="" />
+							<div class="details_text">
+								<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
+								<p>价格 <span>10000</span></p>
+								<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
+								<a href="#">了解详情</a>
+							</div>
+							<div class="details_fix">
+								<p>专利名 <span> 医疗四分局王死哦风景</span></p>
+								<p>所有人 <span> 胡海峰</span></p>
+
+							</div>
+						</li>
+						<li>
+							<img src="../img/Technology_21.png" alt="" />
+							<div class="details_text">
+								<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
+								<p>价格 <span>10000</span></p>
+								<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
+								<a href="#">了解详情</a>
+							</div>
+							<div class="details_fix">
+								<p>专利名 <span> 医疗四分局王死哦风景</span></p>
+								<p>所有人 <span> 胡海峰</span></p>
+
+							</div>
+						</li>
+						<li>
+							<img src="../img/Technology_21.png" alt="" />
+							<div class="details_text">
+								<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
+								<p>价格 <span>10000</span></p>
+								<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
+								<a href="#">了解详情</a>
+							</div>
+							<div class="details_fix">
+								<p>专利名 <span> 医疗四分局王死哦风景</span></p>
+								<p>所有人 <span> 胡海峰</span></p>
+
+							</div>
+						</li>
+						<li>
+							<img src="../img/Technology_21.png" alt="" />
+							<div class="details_text">
+								<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>
+								<p>价格 <span>10000</span></p>
+								<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>
+								<a href="#">了解详情</a>
+							</div>
+							<div class="details_fix">
+								<p>专利名 <span> 医疗四分局王死哦风景</span></p>
+								<p>所有人 <span> 胡海峰</span></p>
+							</div>
+						</li>
+
+					</ul>
+				</div>
+				<!--<div class="main_details checked_no">-->
+					<!--<ul id="demandList_attorn">-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+							<!--</div>-->
+						<!--</li>-->
+
+					<!--</ul>-->
+				<!--</div>-->
+				<!--<div class="main_details checked_no">-->
+					<!--<ul id="demandList_nedd">-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+
+							<!--</div>-->
+						<!--</li>-->
+						<!--<li>-->
+							<!--<img src="../img/Technology_21.png" alt="" />-->
+							<!--<div class="details_text">-->
+								<!--<p>行业 <span>怒吼道胡非常胡海峰回复</span></p>-->
+								<!--<p>价格 <span>10000</span></p>-->
+								<!--<p>简介 <b>怒吼道胡非常胡海峰回复怒吼道胡非常胡海峰回复</b></p>-->
+								<!--<a href="#">了解详情</a>-->
+							<!--</div>-->
+							<!--<div class="details_fix">-->
+								<!--<p>专利名 <span> 医疗四分局王死哦风景</span></p>-->
+								<!--<p>所有人 <span> 胡海峰</span></p>-->
+							<!--</div>-->
+						<!--</li>-->
+
+					<!--</ul>-->
+				<!--</div>-->
+				<div class="pagination_box">
+=======
  	<!--行业分类-->
  	<!--行业分类-->
  	<div class="industry">
  	<div class="industry">
  		<div class="container">
  		<div class="container">
@@ -151,6 +499,7 @@
 	 				</ul>
 	 				</ul>
 	 			</div>	
 	 			</div>	
 	 			<div class="pagination_box">
 	 			<div class="pagination_box">
+>>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
 					<nav aria-label="Page navigation" class="clearfix">
 					<nav aria-label="Page navigation" class="clearfix">
 						<ul class="pagination">
 						<ul class="pagination">
 							<li class="pagePre">
 							<li class="pagePre">
@@ -168,6 +517,23 @@
 						<span class="totalCount">共0条数据</span>
 						<span class="totalCount">共0条数据</span>
 					</nav>
 					</nav>
 				</div>
 				</div>
+<<<<<<< HEAD
+			</div>
+		</div>
+	</div>
+	<div class="channel">
+		<div class="container">
+			<h5>快速通道</h5>
+			<ul>
+				<li><a href="">技术评估</a></li>
+				<li><a href="">专利申请</a></li>
+				<li><a href="">专利征集</a></li>
+				<li><a href="">发布技术</a></li>
+				<li><a href="">发布需求</a></li>
+			</ul>
+		</div>
+	</div>
+=======
 	 		</div>
 	 		</div>
  		</div>
  		</div>
  	</div>
  	</div>
@@ -183,10 +549,10 @@
  			</ul>
  			</ul>
  		</div>
  		</div>
  	</div>
  	</div>
+>>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
   	<!--主体内容区域结束-->
   	<!--主体内容区域结束-->
 	<div id="bottom">
 	<div id="bottom">
 		<div class="bottom">
 		<div class="bottom">
-			<img src="../img/bottom1_02.png" alt=""/>
 			<div class="bottom_text">
 			<div class="bottom_text">
 				<div class="text_top">
 				<div class="text_top">
 					<a href="#">关于公司/</a>
 					<a href="#">关于公司/</a>
@@ -309,9 +675,20 @@
 	</div>
 	</div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
 </body>
+<<<<<<< HEAD
 <script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
 <script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
+=======
+<<<<<<< HEAD
+<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/service.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/Technologytrading.js"></script>-->
+=======
+<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
+>>>>>>> 3f034bf88b36b4026efb6faf31c6ceba61bbe447
 <script type="text/javascript" src="../src/js/Technologytrading.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/public.js"></script>
 <script type="text/javascript" src="../src/js/main_banner.js" ></script>
 <script type="text/javascript" src="../src/js/main_banner.js" ></script>
 
 
+>>>>>>> 350a3be7ae6655de28f2d85f388298e0857a8e16
 </html>
 </html>