Browse Source

整合代码

ws2z3gr2017 7 years ago
parent
commit
aec46ed717

BIN
img/achievement_01.png


BIN
img/achievement_01_next.jpg


BIN
img/achievement_05.png


BIN
img/achievement_check.jpg


BIN
img/achievement_checkno.jpg


BIN
img/achievement_del.jpg


BIN
img/achievement_select.jpg


BIN
img/achievement_star.png


BIN
img/achievement_starbj.png


BIN
img/demand_01.png


BIN
img/demand_starbj.png


+ 10 - 4
src/css/public.css

@@ -32,10 +32,16 @@ header .logo{float: left;padding-left: 20px;}
 .h_fix{position: fixed;top: 0px;left: 0;z-index: 99;box-shadow: 2px 4px 10px #CCCCCC;display:none;}
 
 header .nav{float: left;padding-left: 90px;}
-header .nav ul li{float: left;width: 120px;text-align: center;line-height: 76px;}
-header .nav ul li a{color: #333333;width: 120px;line-height: 76px;display: inline-block;font-size: 16px;}
-header .nav ul li:hover a{color: #074F88;}
+header .nav>ul>li{float: left;width: 120px;text-align: center;line-height: 76px;position: relative;}
+header .nav>ul>li>a{color: #333333;width: 120px;line-height: 76px;display: inline-block;font-size: 16px;}
+header .nav>ul>li:hover a{color: #074F88;}
 .active a{color:#074F88!important;}
+/*2级导航*/
+header .nav ul li .subnavigation{width: 120px;position: absolute;top: 61px;z-index: 9999;background: #ffffff;display: none;}
+.subnavigation ol{padding-top: 15px;padding-bottom: 15px;}
+.subnavigation ol li a{width:120px;height: 30px;line-height: 30px;display: inline-block;color: #333333;}
+.subnavigation ol li:hover a{background: rgba(100,100,100,.7);color: #ffffff!important;}
+.subnavigation ol li{height: 30px;line-height: 30px;}
 /*hot*/
 .nav ul li:hover img{animation: hot 1s infinite linear;transition: all 1s;}
 @keyframes hot{
@@ -77,7 +83,7 @@ header .nav_right a:hover{color: #2a6597;}
 /*右侧挂件*/
 
 .pub_fix{width: 70px;position: fixed;right: 20px;bottom: 100px;border-radius: 10px;border: 1px solid #e0e0e0;overflow: hidden;
-    text-align: center;height: 382px;background: #ffffff;z-index: 999;}
+    text-align: center;height: 390px;background: #ffffff;z-index: 999;}
 
 .pub_fix{width: 70px;position: fixed;right: 20px;bottom: 100px;border-radius: 10px;border: 1px solid #e0e0e0;overflow: hidden;text-align: center;height: 382px;background: #ffffff;}
 

+ 92 - 0
src/css/technologyTrading/achievement.css

@@ -0,0 +1,92 @@
+*{padding: 0;margin: 0;font-family: "微软雅黑";}
+.contant{background: #fbfbfb;box-shadow: 1px 3px 5px #cccccc;}
+.achievement_top{width: 1200px;position: relative;left:50%;margin-left: -600px;}
+.contant img{width: 230px;height: 187px;margin-top: -45px;}
+.container{width: 1200px;}
+/*主体内容顶部*/
+
+.achievement_header{margin-top: 20px;border-bottom: 1px solid #cccccc;overflow:hidden;padding-bottom: 20px;}
+.achievement_header p{float: left;font-size: 16px;color: #696464;margin-right: 10px;line-height: 34px;}
+.achievement_header ul{float: left;}
+.achievement_header ul li{float: left;display: none;;font-size: 16px;color:#5c5c5c;height: 34px;line-height: 34px;border:1px solid #CCCCCC;text-align: center;padding-left: 10px;padding-right: 10px;margin-right: 15px;}
+.achievement_header .text_replace{float: left; }
+.achievement_header .text_replace img{vertical-align: top;margin-top:14px;margin-right: 10px;}
+.achievement_header ul li img:hover{cursor: pointer;}
+.text_replace span{vertical-align: top;margin-top: 6px;display: inline-block;}
+/*行业分类*/
+.wrap { width: 100%; margin: 0 auto;background: #ffffff;border-bottom: 1px solid #cccccc;margin-bottom: 20px;}
+.wrap .portal-content {width: 1200px;margin: 0 auto;padding-top: 18px; }
+.pagination_box {width: 1200px;}  
+.pagination_box .pagination{ float: right;}
+.pagination li{ float: left;}        
+.totalCount {float: right;line-height: 74px; margin-right: 20px; color: #999;} 
+ 
+ .search-criteria {margin-bottom: 15px;}    
+.search-select ul li{float: left;margin-right: 0px;margin-bottom: 10px; height: 30px; line-height: 30px; padding: 0 16px;font-size: 12px;}
+.search-select  ul li.active{background: #ffb200;}
+.search-select  ul li.active span{color:#ffffff}
+.search-select  ul li span { font-size: 12px; line-height: 26px;color: #666; }        
+.search-select  ul li:hover,.search-select ul li.active{cursor: pointer;}
+.search-title span{width: 88px;height: 38px;background: #2f85d0;color: #ffffff;line-height: 38px;display: inline-block;text-align: center;}
+.search-select{margin-top: 4px;}
+.portal-content{padding-left: 10px;}
+.search-select ul li label{font-weight: normal;color:#666;}
+.search-select ul li input{margin-left: 10px;visibility: hidden;}
+.search-select ul li .patent{background: url(../../../img/achievement_check.jpg) no-repeat center right;background-size:34% 50%;}
+.search-select ul li .demand{background: url(../../../img/achievement_checkno.jpg) no-repeat center right;background-size:34% 50%;}
+.search-select ul li label:hover{cursor: pointer;}
+/*内容详情列表区域*/
+
+.achievement_main{background: #f5f5f5;width: 100%;overflow: hidden;}
+.main-header .head-left{float: left;color: #4b4b4b;padding-top: 30px;}
+.main-header .head_right{float: right;color: #4b4b4b;}
+/*排序方式*/
+.main-header .head-left>p{font-size: 16px;width: 80px;text-align: center;float: left;margin-right: 15px;margin-top: 6px;}
+.main-header .head-left ul{float: left;}
+.main-header .head-left>ul>li{float: left;margin-right: 20px;position: relative;padding: 0 10px;height: 32px;line-height: 32px;}
+.main-header .head-left ul li p{width: 80px;text-align: center;}
+.main-header .head-left ul li p img{margin-left: 5px;float: right;vertical-align: top;margin-top: 15px;}
+.main-header .head-left ul li .time_select{position: absolute;top: 32px;background: rgba(255,255,255,.7);z-index: 999;display: none;}
+
+.time_select ul li{height: 30px;line-height: 30px;width: 80px;text-align: center;}
+.head-left ul li.active{background: #ffb200;color:#ffffff}
+.time_select ul li:hover{background: #0C79FF;color: #FFFFFF;}
+
+
+/*搜索*/
+.searchs{width: 360px;position: relative;height: 40px;background: #ffffff;box-shadow: 2px 0px 5px #333333;border-radius: 20px;float: left;margin-top: 18px;}
+.searchs .select select{-webkit-appearance: none;appearance:none;-moz-appearance:none;;position: absolute;width: 100px;height: 40px;line-height: 40px;color: #f18101;display: inline-block;border: none;font-size: 16px;left:10px;border-radius:10px;background: url(../../../img/think_top.png) no-repeat center right;padding-left: 22px;}
+.searchs .select select:focus{outline: none;}
+#search_on input{position: absolute;left: 110px;width: 180px;height: 40px;line-height: 40px;border: none;border-left: 1px solid #CCCCCC;background: #ffffff;padding-left: 5px;font-size: 14px;color: #777777;}
+.searchs .select select option:focus{outline: none;}
+.searchs .select select option{text-align: center;border:1px solid transparent;background: #FFFFFF;display: block;}
+.searchs .select select option:hover{background: red;}
+.searchs button{width: 64px;height: 40px;position: absolute;right: 5px;background: url(../../../img/think_search.png) no-repeat center center;border: none;}
+.searchs button:focus{outline: none;}
+.head_right ol li{float: left;margin-left: 10px;margin-top: 10px;margin-bottom: 10px;}
+.head_right ol li:hover,.head-left ul li:hover{cursor: pointer;}
+
+/*列表*/
+.main_introduce{clear: both;padding-top: 20px;overflow: hidden;width: 1200px;}
+.main_introduce ul {overflow: hidden;}
+.main_introduce>ul>li{float: left;margin: 0 15px;width: 270px;height: 360px;background: #ffffff;position: relative;margin-bottom: 16px;}
+.main_introduce ul li>img{width:270px ;height: 184px;}
+.list_text {padding-left: 28px;padding-top: 10px;}
+.list_text p{line-height: 30px;height: 30px;color: #2f85d0;font-size: 16px;}
+.list_text p span{margin-left: 8px;color: #787878;font-size: 14px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 168px;vertical-align: top;}
+.list_text a{float: right;width: 80px;height: 30px;display: inline-block;text-align: center;background: #2b8de2;margin-top: 8px;border-radius: 10px;margin-right: 20px;line-height: 30px;color: #ffffff;}
+.main_introduce ul li .star{width: 242px;height:56px;position: absolute;top: 138px;background: url(../../../img/achievement_starbj.png)no-repeat center left;left:-10px;background-size:cover ;}
+.main_introduce ul li .star p{color: #FFFFFF;font-size: 24px;margin-top: 8px;margin-left: 15px;float: left;}
+.main_introduce ul li .star ol li{width: 24px;height: 22px;background: url(../../../img/achievement_star.png)no-repeat center;float: left;margin-right:2px;}
+.main_introduce ul li .star ol{float: left;overflow: hidden;margin-top: 13px;margin-left: 2px;}
+.main_introduce>ul>li:hover{cursor: pointer;}
+/*分页*/
+.pagination_box {width: 1200px;margin-bottom: 130px;margin-top: 20px;}  
+.pagination_box .pagination{ float: right;}
+.pagination li{ float: left;}        
+.totalCount {float: right;line-height: 74px; margin-right: 20px; color: #999;} 
+
+
+#bottom{margin-top: -150px;}
+
+

+ 7 - 0
src/css/technologyTrading/demand.css

@@ -0,0 +1,7 @@
+.main_introduce ul li .star{width: 230px;background: url(../../../img/demand_starbj.png) no-repeat center left;background-size: 100% 100%;}
+.list_text p{color: #f68705;line-height: 37px;height: 37px;}
+.list_text a{background: #f68705;margin-top: -35px;}
+.list_text .money span{color: #f68705;}
+
+.money span{width: 100px!important;display: inline-block;}
+

+ 5 - 1
src/js/public.js

@@ -15,6 +15,10 @@ $(function(){
 				$('.pub_fix').fadeOut(200);	
 			}
 		});	
+	//二级导航
+	$('.nav ul li').hover(function(){		
+		$(this).find('.subnavigation').slideToggle(200)
+	})
 	//挂件
 	$('.pendent_box').click(function(e){	
 			e.preventDefault();
@@ -27,7 +31,7 @@ $(function(){
 	$('#Lo_user').focus(function(){		
 		$(this).css({color:'#333333'})						
 	})
-	$('#Lo_pass').focus(function(){				
+	$('#Lo_pass').focus(function(){			
 			$(this).val('').css({color:'#333333'});					
 	});	
 	$('#checks').attr('checked',true)

+ 324 - 0
src/js/technologyTrading/achievement.js

@@ -5,3 +5,327 @@ import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';
 import '../../css/technologyTrading/achievement.css';
+import {
+    provinceList
+    } from '../../js/NewDicProvinceList';
+import {
+    industryObject,
+    getIndustryCategory
+} from '../DicIndustryList';
+
+
+$(function(){
+	
+	//数据处理
+	var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,timeSort,priceSort;
+var thePageNo = 1,
+    thePageLength = 1,
+    pageSize = 12;
+    var categoryObj = {
+    "0": "专利",
+    "1": "软著",
+    "2": "项目",
+    "3": "版权",
+    "4": "工业设计",
+    "5": "配方",
+    "6": "非标"
+};
+    var transferModeObj = {
+    "0": "完全转让",
+    "1": "许可转让",
+    "2": "技术入股",
+    "3": "5年独占许可转让"
+};
+function loadDate(pageNo) {
+    $.ajax({
+        method: "get",
+        dataType: "json",
+        //url: globalConfig.context + "/portal/search/achievementList",
+        data: {
+            pageNo: pageNo || 1,
+            pageSize: pageSize,
+            keyword: theKeyword,
+            transferMode: theMode != 999 ? theMode : undefined,
+            fieldA: theFieldA != 999 ? theFieldA : undefined,
+            fieldB: theFieldB != 999 ? theFieldB : undefined,
+            dataCategory:dataCategory != 999 ? dataCategory : undefined,
+            category:category != 999 ? category : undefined,  
+            timeSort:timeSort,
+            priceSort:priceSort,
+            
+        },
+        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];
+                    var star='';
+                    for(var n=0;n<thisdata.maturity;n++){
+                    	star+='<li></li>';
+                    }                     
+                    theArr.push([                                       
+                        '<li>',		//图片地址				
+						'<img src="' + globalConfig.avatarHost + '/upload' + thisdata.technicalPictureUrl + '" alt="行业" />',
+	 					'<div class="list_text">',
+	 					'<p>行业<span>' + getIndustryCategory(thisdata.fieldA, thisdata.fieldB) + '</span></p>',
+	 					'<p>名称<span title=' + thisdata.name + '>' + thisdata.name + '</span></p>',
+	 					'<p>类型<span>' + (thisdata.category ? categoryObj[thisdata.category] : '') + '</span></p>',
+	 					'<p>交易方式<span>' + (thisdata.transferMode ? transferModeObj[thisdata.transferMode] : '') + '</span></p>',
+	 					'<a href="#">了解详情</a>',
+	 					'</div>',
+	 					'<div class="star">',
+	 					'<p>成熟度</p>',
+	 					'<ol>'+star+'</ol>',	 									 					
+	 					'</div>',
+	 					'<input type="hidden" class="achievementId" value="' + thisdata.id + '">',
+                        '<input type="hidden" class="achievementType" value="' + thisdata.dataCategory + '">',
+					    '</li>',                                             
+                    ].join(''));
+                };
+            };
+            $('.main_introduce ul').empty();
+            $('.main_introduce ul').append(theArr.join(''));
+            $('.totalCount').html("共" + data.data.totalCount + "条数据");
+            thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+            var pageArr = [],
+                firstNo = 1,
+                endNo = 5;
+            if (thePageNo > 3) {
+                firstNo = thePageNo - 2;
+                endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+            } else {
+                endNo = Math.min(thePageLength, 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(''));
+        },
+    });
+}
+    if (window.location.search) {
+        let theUrl = window.location.search
+        theKeyword = theUrl.substring(1, theUrl.length);
+        theKeyword = decodeURIComponent(theKeyword);
+        $('#search_on input').val(theKeyword);
+    };
+    loadDate();
+    var industryListArr = [],
+        industryChildrenArr = [];
+    industryListArr.push(['<li value="999" class="active">',
+        '<span>',
+        '不限',
+        '</span>',
+        '</li>',
+    ].join(''));
+    industryObject.map(function (item) {
+        industryListArr.push(['<li value="' + item.value + '">',
+            '<span>',
+            item.label,
+            '</span>',
+            '</li>',
+        ].join(''));
+    });
+    if (industryListArr && industryListArr.length) {
+        $('#industryList').append(industryListArr.join(''));
+    };
+    $('#industryList li').click(function () {
+        var theValue = this.value;
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        industryChildrenArr = [];
+        industryChildrenArr.push(['<li value="999" class="active">',
+            '<span>',
+            '不限',
+            '</span>',
+            '</li>',
+        ].join(''));
+        if (theValue !== 999) {
+            $('#industryChildrenBox').css("display", "block");
+            industryObject.map(function (item) {
+                if (item.value == theValue) {
+                    item.children.map(function (child) {
+                        industryChildrenArr.push(['<li value="' + child.value + '">',
+                            '<span>',
+                            child.label,
+                            '</span>',
+                            '</li>',
+                        ].join(''));
+                    });
+                };
+            });
+        } else {
+            $('#industryChildrenBox').css("display", "none");
+        };
+        if (industryChildrenArr && industryChildrenArr.length) {
+            $('#industryChildrenList').empty();
+            $('#industryChildrenList').append(industryChildrenArr.join(''));
+        };
+        theFieldA = this.value;
+        theFieldB = '999';
+        loadDate();
+    });
+    $('#industryChildrenList').on('click', 'li', function () {
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        theFieldB = this.value;
+        loadDate();
+    });
+    $('#transferModeList').on('click', 'li', function () {
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        theMode = this.value;
+        loadDate();
+    });
+    $('#btn_search').click(function () {
+        theKeyword = $('#search_on input').val();
+        loadDate();
+    });
+    $('.pagination').on('click', 'li', function (e) {
+        e.preventDefault();
+        if (this.className === 'pagePre') {
+            if (thePageNo > 1) {
+                thePageNo = 1;
+                loadDate(thePageNo);
+            }
+        } else if (this.className === 'pageNext') {
+            if (thePageNo < thePageLength) {
+                thePageNo = thePageLength;
+                loadDate(thePageNo);
+            }
+        } else {
+            var nextPageNo = $(this).children()[0].text;
+            if (thePageNo != nextPageNo) {
+                $(this).siblings("li").removeClass("active");
+                $(this).addClass("active");
+                thePageNo = nextPageNo;
+                loadDate(thePageNo);
+            };
+        };
+    });
+    $('.main_introduce ul').on('click', 'li', function () {
+        var theId = $(this).find(".achievementId")[0].value;
+        var theType = $(this).find(".achievementType")[0].value;
+        window.open(globalConfig.context + '/portal/detail/achievementDetail.html?id=' + theId + '&type=' + theType);
+    })    
+    $('#industryList li').click(function(){
+		$('.achievement_header ul li').eq(0).show();
+		var text_ind=$(this).find('span').text();		
+		$('.achievement_header ul li').eq(0).find('p').text(text_ind);
+	})
+     //点击搜索下面的字段快捷搜索
+    $('.head_right ol li').click(function () {    	
+        theKeyword = $(this).text();        
+        $('#technologyModeList li').eq(0).addClass('active').siblings().removeClass('active');
+        $('#transferModeList li').eq(0).addClass('active').siblings().removeClass('active');
+        $('.achievement_header ul li').eq(0).show().siblings().hide();
+        $('.achievement_header ul li').eq(0).find('p').text(theKeyword);
+        $('#search_on input').val(theKeyword);
+        loadDate();       
+    });
+    //单选
+	$('#patent').prop('checked',false);
+	$('#selectAct li:first-child').click(function(){
+		$(this).addClass('active');
+		$('#patent').prop('checked',false);
+		$('#demand').prop('checked',false);
+		$('#demand,#patent').parent().addClass('demand').removeClass('patent');					
+		category=null;
+		dataCategory=null;
+		loadDate();  
+	})
+	$('#patent').click(function(){	
+		$('#selectAct li').eq(0).removeClass('active')
+		$(this).prop('checked',true);		
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#demand').attr('checked',false);
+		$('#demand').parent().addClass('demand').removeClass('patent')
+		category=null;
+		dataCategory=1;
+		loadDate(); 
+	})
+	$('#demand').click(function(){
+		$('#selectAct li').eq(0).removeClass('active')
+		$(this).prop('checked',true);
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#patent').attr('checked',false);
+		$('#patent').parent().addClass('demand').removeClass('patent')
+		category=0;
+		dataCategory=null;
+		loadDate(); 
+	})
+	
+	//排序下拉选择
+	$('.head-left ul li p').click(function(){
+		$(this).siblings().slideToggle(300);	
+	})
+	$('.head-left ul li').mouseleave(function(){
+		$(this).find('.time_select').slideUp(300);
+	})
+	$('.time_select ul li').click(function(){
+		var txt=$(this).text();
+		$(this).parents('.time_select').siblings('p').find('span').text(txt);
+		$('.time_select').hide();		
+	});	
+	$('.timeSelect li').click(function(){
+		var timeTxt=$(this).attr('value');	
+		$('head-left ul li:first-child').removeClass('active')		
+		timeSort=timeTxt;
+		loadDate();
+	})
+	$('.priceSeclct li').click(function(){
+		var timeTxt=$(this).attr('value');	
+		$('head-left ul li:first-child').removeClass('active')		
+		priceSort=timeTxt;
+		loadDate();
+	})
+	$('#industryList li:first-child').click(function(){		 
+		theFieldA = $(this).attr('value');
+        theFieldB = '999';
+        loadDate();
+	})
+	//搜索城市下拉
+	var addlength=provinceList.length;
+	var soption='';	
+	for(var i=0;i<addlength;i++){		
+		soption+="<option value='"+provinceList[i].id+"'>"+provinceList[i].name+"</option>";			
+	};	
+	$('#selt').html(soption);	
+	//全部结果查询
+	$('.achievement_header ul li img').click(function(){
+		$(this).parent().hide();				
+		var lilen=$('.achievement_header ul li').css('display');
+		if(lilen=='none'){			
+			$('#search_on input').val('');
+			$('.searchs button').click();
+		}
+	});
+	$('.text_replace').hide()
+	//	搜索功能关联关键字	
+	$('.searchs button').click(function(e){		
+		e.preventDefault();		
+		var search_txt=$('#search_on input').val();		
+		$('.text_replace span').text(search_txt);
+		if(search_txt==''){
+			$('.text_replace').hide()
+		}else{
+			$('.text_replace').show()
+		}
+	})
+	//点击行业分类		
+	$('#transferModeList li').click(function(){	
+		$('.achievement_header ul li').eq(1).show()
+		$(this).addClass('active').siblings().removeClass('active')
+		var txt_tech=$(this).find('span').text();		
+		$('.achievement_header ul li').eq(1).find('p').text(txt_tech);
+	})
+})

+ 336 - 0
src/js/technologyTrading/demand.js

@@ -5,3 +5,339 @@ import '../../css/main_banner.css';
 import '../../js/public.js';
 import '../../js/main_banner.js';
 import '../../css/technologyTrading/demand.css';
+import '../../css/technologyTrading/achievement.css';
+import {
+    provinceList
+    } from '../../js/NewDicProvinceList';
+import {
+    industryObject,
+    getIndustryCategory
+} from '../DicIndustryList'; 
+ 
+$(function(){
+//	//排序下拉选择
+//	$('.head-left ul li p').click(function(){
+//		$(this).siblings().slideToggle(300);	
+//	})
+//	$('.head-left ul li').mouseleave(function(){
+//		$(this).find('.time_select').slideUp(300);
+//	})
+//	$('.time_select ul li').click(function(){
+//		var txt=$(this).text();
+//		$(this).parents('.time_select').siblings('p').find('span').text(txt);
+//		$('.time_select').hide();
+//	});
+//	//搜索城市下拉
+//	var addlength=provinceList.length;
+//	var soption='';	
+//	for(var i=0;i<addlength;i++){		
+//		soption+="<option value='"+provinceList[i].id+"'>"+provinceList[i].name+"</option>";			
+//	};	
+//	$('#selt').html(soption);
+//	//全部结果查询
+//	$('.achievement_header ul li img').click(function(){
+//		$(this).parent().hide()
+//	});
+//	$('.text_replace').hide();	
+//	//	搜索功能关联关键字	
+//	$('.searchs button').click(function(e){	
+//		e.preventDefault();		
+//		var search_txt=$('#search_on input').val();		
+//		$('.text_replace span').text(search_txt);
+//		if(search_txt==''){
+//			$('.text_replace').hide();
+//		}else{
+//			$('.text_replace').show();
+//		}
+//	})
+//	//点击行业分类	
+//	$('#technologyModeList li').click(function(){
+//		$('.achievement_header ul li').eq(1).show();
+//		$(this).addClass('active').siblings().removeClass('active');
+//		var txt_tech=$(this).find('span').text();
+//		$('.achievement_header ul li').eq(1).find('p').text(txt_tech);
+//	})
+	//数据处理
+	var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,timeSort,priceSort;
+	var thePageNo = 1,
+	    thePageLength = 1,
+	    pageSize = 12;
+	var categoryObj = {
+	    "0": "技术购买型需求",
+	    "1": "技术设备类需求",
+	    "2": "技术方案型需求",
+	    "3": "技术攻关型需求",
+	    "4": "技术咨询型需求",
+	    "5": "技术人才型需求",
+	};
+	
+
+	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,	           
+	            timeSort:timeSort,
+	            priceSort:priceSort,
+	        },
+	        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];
+	                    var star='';
+                  		for(var n=0;n<thisdata.maturity;n++){
+                    	   star+='<li></li>'
+                   		}        
+	                    theArr.push([	                      	                        
+	                        '<li>',		//图片地址				
+							'<img src="' + globalConfig.avatarHost + '/upload' + thisdata.personPortraitUrl + '" alt="行业" />',
+		 					'<div class="list_text">',
+		 					'<p>行业<span>' + getIndustryCategory(thisdata.industryCategoryA, thisdata.industryCategoryB) + '</span></p>',
+		 					'<p>名称<span title=' + thisdata.name + '>' + thisdata.name + '</span></p>',
+		 					'<p>类型<span>' + thisdata.demandType ? categoryObj[thisdata.demandType] : '' + '</span></p>',
+		 					'<p class="money">预算<span>'+ (thisdata.budgetCost ? (thisdata.budgetCost + '万元') : '价格面议') + '</span></p>',
+		 					'<a href="#">了解详情</a>',
+		 					'</div>',
+		 					'<div class="star">',
+		 					'<p>成熟度</p>',
+		 					'<ol>'+star+'</ol>',	 									 					
+		 					'</div>',
+		 					'<input type="hidden" class="demandId" value="' + thisdata.id + '">',
+                            '<input type="hidden" class="demandType" value="' + thisdata.dataCategory + '">',
+						    '</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 = 5;
+	            if (thePageNo > 3) {
+	                firstNo = thePageNo - 2;
+	                endNo = Math.min((Number(thePageNo) + 2), thePageLength);
+	            } else {
+	                endNo = Math.min(thePageLength, 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(''));
+	        },
+	    });
+	}
+	if (window.location.search) {
+        let theUrl = window.location.search
+        theKeyword = theUrl.substring(1, theUrl.length);
+        theKeyword = decodeURIComponent(theKeyword);
+        $('#search_on input').val(theKeyword);
+    };
+    loadDate();
+    var industryListArr = [],
+        industryChildrenArr = [];
+    industryListArr.push(['<li value="999" class="active">',
+        '<span>',
+        '不限',
+        '</span>',
+        '</li>',
+    ].join(''));
+    industryObject.map(function (item) {
+        industryListArr.push(['<li value="' + item.value + '">',
+            '<span>',
+            item.label,
+            '</span>',
+            '</li>',
+        ].join(''));
+    });
+    if (industryListArr && industryListArr.length) {
+        $('#industryList').append(industryListArr.join(''));
+    };
+    $('#industryList li').click(function () {
+        var theValue = this.value;
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        industryChildrenArr = [];
+        industryChildrenArr.push(['<li value="999" class="active">',
+            '<span>',
+            '不限',
+            '</span>',
+            '</li>',
+        ].join(''));
+        if (theValue !== 999) {
+            $('#industryChildrenBox').css("display", "block");
+            industryObject.map(function (item) {
+                if (item.value == theValue) {
+                    item.children.map(function (child) {
+                        industryChildrenArr.push(['<li value="' + child.value + '">',
+                            '<span>',
+                            child.label,
+                            '</span>',
+                            '</li>',
+                        ].join(''));
+                    });
+                };
+            });
+        } else {
+            $('#industryChildrenBox').css("display", "none");
+        };
+        if (industryChildrenArr && industryChildrenArr.length) {
+            $('#industryChildrenList').empty();
+            $('#industryChildrenList').append(industryChildrenArr.join(''));
+        };
+        theFieldA = this.value;
+        theFieldB = '999';
+        loadDate();
+    });
+    $('#industryChildrenList').on('click', 'li', function () {
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        theFieldB = this.value;
+        loadDate();
+    });
+    $('#technologyModeList').on('click', 'li', function () {
+        $(this).siblings("li").removeClass("active");
+        $(this).addClass("active");
+        theMode = this.value;
+        loadDate();
+    });
+    $('#btt_search').click(function () {
+        theKeyword = $('#search_on input').val();
+        loadDate();
+    });
+    $('.pagination').on('click', 'li', function (e) {
+        e.preventDefault();
+        if (this.className === 'pagePre') {
+            if (thePageNo > 1) {
+                thePageNo = 1;
+                loadDate(thePageNo);
+            }
+        } else if (this.className === 'pageNext') {
+            if (thePageNo < thePageLength) {
+                thePageNo = thePageLength;
+                loadDate(thePageNo);
+            }
+        } else {
+            var nextPageNo = $(this).children()[0].text;
+            if (thePageNo != nextPageNo) {
+                $(this).siblings("li").removeClass("active");
+                $(this).addClass("active");
+                thePageNo = nextPageNo;
+                loadDate(thePageNo);
+            };
+        };
+    });
+    $('main_introduce').on('click', 'li', function () {
+        var theId = $(this).children(".demandId")[0].value;
+        var theType = $(this).children(".demandType")[0].value;
+        window.open(globalConfig.context + '/portal/detail/demandDetail.html?id=' + theId + '&type=' + theType);
+    })
+    $('#industryList li').click(function(){
+		var text_ind=$(this).find('span').text();
+		$('.achievement_header ul li').eq(0).show()
+		$('.achievement_header ul li').eq(0).find('p').text(text_ind);
+	})
+    
+  //搜索城市下拉
+	var addlength=provinceList.length;
+	var soption='';	
+	for(var i=0;i<addlength;i++){		
+		soption+="<option value='"+provinceList[i].id+"'>"+provinceList[i].name+"</option>";			
+	};	
+	$('#selt').html(soption);	
+	//全部结果查询
+	$('.achievement_header ul li img').click(function(){
+		$(this).parent().hide();				
+		var lilen=$('.achievement_header ul li').css('display');
+		if(lilen=='none'){			
+			$('#search_on input').val('');
+			$('.searchs button').click();			
+		}
+	});
+	$('.text_replace').hide()
+	//	搜索功能关联关键字	
+	$('.searchs button').click(function(e){		
+		e.preventDefault();		
+		var search_txt=$('#search_on input').val();		
+		$('.text_replace span').text(search_txt);
+		if(search_txt==''){
+			$('.text_replace').hide()
+		}else{
+			$('.text_replace').show()
+		}
+	})
+	//点击技术类型		
+	$('#technologyModeList li').click(function(){	
+		$('.achievement_header ul li').eq(1).show()
+		$(this).addClass('active').siblings().removeClass('active')
+		var txt_tech=$(this).find('span').text();		
+		$('.achievement_header ul li').eq(1).find('p').text(txt_tech);
+	})
+	 //点击搜索下面的字段快捷搜索
+    $('.head_right ol li').click(function () {    	
+        theKeyword = $(this).text();        
+        $('#technologyModeList li').eq(0).addClass('active').siblings().removeClass('active');
+        $('#transferModeList li').eq(0).addClass('active').siblings().removeClass('active');
+        $('.achievement_header ul li').eq(0).show().siblings().hide();
+        $('.achievement_header ul li').eq(0).find('p').text(theKeyword);
+        $('#search_on input').val(theKeyword);
+        loadDate();       
+    });
+    //点击行业分类
+    $('#industryList li').click(function(){
+		$('.achievement_header ul li').eq(0).show();
+		var text_ind=$(this).find('span').text();		
+		$('.achievement_header ul li').eq(0).find('p').text(text_ind);
+	})
+    //排序下拉选择
+	$('.head-left ul li p').click(function(){
+		$(this).siblings().slideToggle(300);	
+	})
+	$('.head-left ul li').mouseleave(function(){
+		$(this).find('.time_select').slideUp(300);
+	})
+	$('.time_select ul li').click(function(){
+		var txt=$(this).text();
+		$(this).parents('.time_select').siblings('p').find('span').text(txt);
+		$('.time_select').hide();		
+	});	
+	$('.timeSelect li').click(function(){
+		var timeTxt=$(this).attr('value');	
+		alert(timeTxt)
+		$('head-left ul li:first-child').removeClass('active')		
+		timeSort=timeTxt;
+		loadDate();
+	})
+	$('.priceSeclct li').click(function(){
+		var timeTxt=$(this).attr('value');	
+		alert(timeTxt)
+		$('head-left ul li:first-child').removeClass('active')		
+		priceSort=timeTxt;
+		loadDate();
+	})
+	$('#industryList li:first-child').click(function(){		 
+		theFieldA = $(this).attr('value');
+        theFieldB = '999';
+        loadDate();
+	})
+})   

+ 2 - 3
src/js/thinktank.js

@@ -4,7 +4,7 @@ import '../css/public.css';
 import '../css/main_banner.css';
 import './public.js';
 import './main_banner.js';
-import '../css/thinktank.css';
+import '../css/thinkTank.css';
 import {
     provinceList
     } from './NewDicProvinceList';
@@ -245,8 +245,7 @@ $(function(){
 		t--;
 		if(t<=1){
 			t=1			
-		}
-		alert(t)
+		}		
 		$.ajax({
             method: "get",
             dataType: "json",

+ 1 - 1
template/Technologytrading.html

@@ -376,7 +376,7 @@
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+						<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">

+ 1 - 1
template/index.html

@@ -407,7 +407,7 @@
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+					<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 1 - 1
template/register.html

@@ -239,7 +239,7 @@
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+					<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 1 - 1
template/service.html

@@ -446,7 +446,7 @@
 				</div>
 				<div class="login_pass">
 					<label for="pass"><img src="../img/login_password.png"/></label>
-					<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+					<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 				</div>
 				<div class="login_check">
 					<label for="checks" class="lab_check">

+ 5 - 5
template/technologyFinancial.html

@@ -8,10 +8,10 @@
 	<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>
-    <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/main_banner.css" />
-    <link rel="stylesheet" type="text/css" href="../src/css/technologyFinancial.css"/>
+    <link rel="stylesheet" type="text/css" href="../src/css/technologyFinancial.css"/>-->
 </head>
 <body>  	
   	<header>
@@ -176,7 +176,7 @@
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+						<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">
@@ -197,8 +197,8 @@
 	</div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
-<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>
 <script type="text/javascript" src="../src/js/technologyFinancial.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>-->
 </html>

+ 217 - 12
template/technologyTrading/achievement.html

@@ -8,10 +8,10 @@
 	<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>
-    <!--<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/achievement.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/achievement.css"/>-->
 </head>
 <body>  	
   	<header>
@@ -19,10 +19,20 @@
   			<div class="logo"><a href="../../template/index.html"><img src="../../img/Logo111.png" alt="" title="技淘"/></a></div>
   			<div  class="nav">
   				<ul>
-  					<li><a href="#">技术交易</a></li>
-  					<li><a href="#">科技服务</a><img src="../../img/hot.png" alt="HOT"/></li> 					
+  					<li class="active">
+  						<a href="#">技术交易</a>
+  						<div class="subnavigation">
+  							<ol>
+  								<li><a href="#">科技专利</a></li>
+  								<li><a href="#">科技需求</a></li>
+  							</ol>
+  						</div>
+  					</li>
+  					<li>
+  						<a href="#">科技服务</a><img src="../../img/hot.png" alt="HOT"/>  						
+  					</li> 					
   					<li><a href="#">智库咨询</a></li>
-  					<li class="active"><a href="#">科技金融</a></li>
+  					<li ><a href="#">科技金融</a></li>
   					<li><a href="#">科技活动</a></li>
   					<li><a href="#">平台共建</a></li> 					
   				</ul>
@@ -51,6 +61,200 @@
 		</a>
 	</div>
   	<!--主体内容区域开始-->
+  	<div class="contant">
+  		<div class="achievement_top"><img src="../../img/achievement_01.png" alt=""/></div>  		
+  	</div>
+  	<div class="container">
+  		<div class="achievement_header">
+  			<p>全部结果: </p>
+  			<ul>
+  				<li>  					
+  					<p>教育休闲</p>
+  					<img src="../../img/achievement_del.jpg" class="del"/>
+  				</li>
+  				<li>  					
+  					<p>教育休闲</p>
+  					<img src="../../img/achievement_del.jpg" class="del"/>
+  				</li>  				
+  			</ul>
+  			<div class="text_replace">
+  				<img src="../../img/achievement_01_next.jpg" alt="" /><span></span>
+  			</div>
+  		</div>
+  		<div class="wrap active">
+			<div class="portal-body">
+				<div class="portal-content">
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>行业分类</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="industryList" class="clearfix"></ul>
+						</div>
+					</div>
+					<div class="search-criteria row" >
+						<div class="search-title col-md-1">
+							<span>技术类型</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="selectAct">
+								<li class="active"><span>不限</span></li>
+								<li>
+									<label for="patent" class="demand">
+										专利<input type="checkbox" name="fot" id="patent" value="0" />
+									</label>
+								</li>
+								<li>
+									<label for="demand" class="demand">
+										技术<input type="checkbox" name="fot" id="demand" value="1" />
+									</label>
+								</li>
+							</ul>
+						</div>
+					</div>
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>交易方式</span>
+						</div>
+						<div class="search-select col-md-6">
+							<ul id="transferModeList" class="clearfix">
+								<li value="999" class="active"><span>不限</span></li>
+								<li value="0"><span>完全转让</span></li>
+								<li value="1"><span>许可转让</span></li>
+								<li value="2"><span>技术入股</span></li>
+								<li value="3"><span>5年独占许可转让</span></li>
+							</ul>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="achievement_main">
+		<div class="container">
+			<div class="main-header">
+				<div class="head-left">
+					<p>排序方式</p>
+					<ul>													
+						<li>
+							<p><span>发布时间</span><img src="../../img/achievement_select.jpg" alt="" /></p>
+							<div class="time_select">
+								<ul class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</li>									
+								</ul>
+							</div>
+						</li>
+						<li>
+							<p><span>价格</span><img src="../../img/achievement_select.jpg" alt="" /></p>
+							<div class="time_select">
+								<ul class="priceSeclct">
+									<li value="0">从低到高</li>
+									<li value="1">从高到低</li>									
+								</ul>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<div class="head_right">
+					<div class="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<div id="search_on">					
+		 					<input type="search" placeholder="医药生物"/>
+		 				</div>
+		 				<button id="btn_search"></button>				
+		 			</div>
+		 			<ol>
+		 				<li>医药生物</li>
+		 				<li>建筑科技</li>
+		 				<li>教育休闲</li>
+		 				<li>航空航天</li>
+		 			</ol>
+				</div>
+			</div>
+			<div class="main_introduce">
+				<ul>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p>交易方式<span>怒吼道胡非常胡海</span></p>
+	 						<a href="#">了解详情</a>
+	 					</div>
+	 					<div class="star">
+	 						<p>成熟度</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>	 							
+	 						</ol>
+	 					</div>
+					</li>					
+				</ul>
+			</div>
+			<div class="container pagination_box">
+				<nav aria-label="Page navigation" class="clearfix">
+					<ul class="pagination">
+						<li class="pagePre">
+							<a href="#" aria-label="Previous">
+								<span aria-hidden="true">&laquo;</span>
+							</a>
+						</li>
+						<li class="pageNumber"><a href="#" value="1">1</a></li>
+						<li class="pageNext">
+							<a href="#" aria-label="Next">
+								<span aria-hidden="true">&raquo;</span>
+							</a>
+						</li>
+					</ul>
+					<span class="totalCount">共0条数据</span>
+				</nav>
+			</div>
+		</div>
+	</div>
   	
   	<!--主体内容区域结束-->
 	<div id="bottom">
@@ -157,7 +361,7 @@
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+						<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">
@@ -178,8 +382,9 @@
 	</div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
-<script type="text/javascript" src="../src/js/achievement.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/achievement.js"></script>
+<script type="text/javascript" src="../../src/js/technologyTrading/tech_public.js"></script>
+<script type="text/javascript" src="../../src/js/public.js"></script>
+<script type="text/javascript" src="../../src/js/main_banner.js" ></script>-->
 </html>

+ 252 - 9
template/technologyTrading/demand.html

@@ -8,10 +8,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>
-    <!--<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/demand.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/achievement.css"/>
+    <link rel="stylesheet" type="text/css" href="../../src/css/technologyTrading/demand.css"/>-->
 </head>
 <body>  	
   	<header>
@@ -51,6 +52,247 @@
 		</a>
 	</div>
   	<!--主体内容区域开始-->
+  	<div class="contant">
+  		<div class="achievement_top"><img src="../../img/demand_01.png" alt=""/></div>  		
+  	</div>
+  	<div class="container">
+  		<div class="achievement_header">
+  			<p>全部结果: </p>
+  			<ul>
+  				<li>  					
+  					<p>教育休闲</p>
+  					<img src="../../img/achievement_del.jpg" class="del"/>
+  				</li>
+  				<li>  					
+  					<p>教育休闲</p>
+  					<img src="../../img/achievement_del.jpg" class="del"/>
+  				</li> 				
+  			</ul>
+  			<div class="text_replace">
+  				<img src="../../img/achievement_01_next.jpg" alt="" /><span></span>
+  			</div>
+  		</div>
+  		<div class="wrap active">
+			<div class="portal-body">
+				<div class="portal-content">
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>行业分类</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="industryList" class="clearfix"></ul>
+						</div>
+					</div>								
+					<div class="search-criteria row">
+						<div class="search-title col-md-1">
+							<span>技术类型</span>
+						</div>
+						<div class="search-select col-md-11">
+							<ul id="technologyModeList" class="clearfix">
+								<li value="999" class="active"><span>不限</span></li>
+								<li value="0"><span>技术购买型需求</span></li>
+								<li value="1"><span>技术设备类需求</span></li>
+								<li value="2"><span>技术方案型需求</span></li>
+								<li value="3"><span>技术攻关型需求</span></li>
+								<li value="4"><span>技术咨询型需求</span></li>
+								<li value="5"><span>技术人才型需求</span></li>
+							</ul>
+						</div>					
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="achievement_main">
+		<div class="container">
+			<div class="main-header">
+				<div class="head-left">
+					<p>排序方式</p>
+					<ul>													
+						<li>
+							<p><span>发布时间</span><img src="../../img/achievement_select.jpg" alt="" /></p>
+							<div class="time_select">
+								<ul class="timeSelect">
+									<li value="0">由远到近</li>
+									<li value="1">由近到远</li>	
+								</ul>
+							</div>
+						</li>
+						<li>
+							<p><span>价格</span><img src="../../img/achievement_select.jpg" alt="" /></p>
+							<div class="time_select">
+								<ul class="priceSeclct">
+									<li value="0">从低到高</li>
+									<li value="1">从高到低</li>	
+								</ul>
+							</div>
+						</li>
+					</ul>
+				</div>
+				<div class="head_right">
+					<div class="searchs">
+		 				<div class="select">
+		 					<select name="" id="selt">
+		 											
+		 					</select>	 					
+		 				</div> 				
+		 				<div id="search_on">					
+		 					<input type="search" placeholder="医药生物"/>
+		 				</div>
+		 				<button id="btt_search"></button>				
+		 			</div>
+		 			<ol>
+		 				<li>医药生物</li>
+		 				<li>建筑科技</li>
+		 				<li>教育休闲</li>
+		 				<li>航空航天</li>
+		 			</ol>
+				</div>
+			</div>
+			<div class="main_introduce">
+				<ul>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+					<li>
+						<img src="../../img/achievement_05.png" alt="" />
+	 					<div class="list_text">
+	 						<p>行业<span>怒吼道胡非常胡海峰回复11111</span></p>
+	 						<p>名称<span>怒吼道</span></p>
+	 						<p>类型<span>怒吼道胡非常胡海峰回复</span></p>
+	 						<p class="money">预算<span>10万</span></p>	 							 							
+	 						<a href="#">了解详情</a>	 							 						
+	 					</div>
+	 					<div class="star">
+	 						<p>精品</p>
+	 						<ol>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 							<li></li>
+	 						</ol>
+	 					</div>
+					</li>
+				</ul>
+			</div>
+			<div class="container pagination_box">
+				<nav aria-label="Page navigation" class="clearfix">
+					<ul class="pagination">
+						<li class="pagePre">
+							<a href="#" aria-label="Previous">
+								<span aria-hidden="true">&laquo;</span>
+							</a>
+						</li>
+						<li class="pageNumber"><a href="#" value="1">1</a></li>
+						<li class="pageNext">
+							<a href="#" aria-label="Next">
+								<span aria-hidden="true">&raquo;</span>
+							</a>
+						</li>
+					</ul>
+					<span class="totalCount">共0条数据</span>
+				</nav>
+			</div>
+		</div>
+	</div>
   	
   	<!--主体内容区域结束-->
 	<div id="bottom">
@@ -157,7 +399,7 @@
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+						<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">
@@ -178,8 +420,9 @@
 	</div>
 	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
-<script type="text/javascript" src="../src/js/demand.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/demand.js"></script>
+<script type="text/javascript" src="../../src/js/technologyTrading/tech_public.js"></script>
+<script type="text/javascript" src="../../src/js/public.js"></script>
+<script type="text/javascript" src="../../src/js/main_banner.js" ></script>-->
 </html>

+ 1 - 1
template/thinktank.html

@@ -424,7 +424,7 @@
 					</div>
 					<div class="login_pass">
 						<label for="pass"><img src="../img/login_password.png"/></label>
-						<input type="text" name="pass" id="Lo_pass" placeholder="请输入密码" />
+						<input type="password" name="pass" id="Lo_pass" placeholder="请输入密码" />
 					</div>
 					<div class="login_check">
 						<label for="checks" class="lab_check">

+ 3 - 3
webpack.config.js

@@ -64,9 +64,9 @@ module.exports = (function () {
         }),
         new HtmlWebpackPlugin({
             title: '科技智库',
-            filename: 'html/thinktank.html',
-            template: './template/thinktank.html',
-            chunks: ['thinktank', 'vendors']
+            filename: 'html/thinkTank.html',
+            template: './template/thinkTank.html',
+            chunks: ['thinkTank', 'vendors']
         }),
         new HtmlWebpackPlugin({
             title: '科技智库',

+ 3 - 3
webpack/entry.config.js

@@ -4,7 +4,7 @@ module.exports = {
     'service': './src/js/service.js',
     'register': './src/js/register.js',
     'technologyTrading': './src/js/technologyTrading.js',
-    'thinktank': './src/js/thinktank.js',
+    'thinkTank': './src/js/thinkTank.js',
     'technologyFinancial': './src/js/technologyFinancial.js',
     'technologyTrading/achievement': './src/js/technologyTrading/achievement.js',
     'technologyTrading/demand': './src/js/technologyTrading/demand.js',
@@ -26,9 +26,9 @@ module.exports = {
     'webpack/hot/only-dev-server',
     './src/js/technologyTrading.js'
     ],
-   'thinktank': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+   'thinkTank': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
    'webpack/hot/only-dev-server',
-    './src/js/thinktank.js'
+    './src/js/thinkTank.js'
     ],
     'technologyFinancial': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
    'webpack/hot/only-dev-server',