liting2017 hace 6 años
padre
commit
15461b6170

+ 15 - 11
src/css/indexNew.css

@@ -109,14 +109,18 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
 .indexServe_img p{
    float: right;
    margin-bottom: 10px;
-   color: #4E4E4E;
+   color: #FF6D0A;
+   transition: all .3s ease-in-out;
 }
 .indexServe_img:hover span{
-    background: #F68705;
+    background: #1697E9;
     color:#ffffff;
+    border-color: #1697E9
 }
 .indexServe_img:hover p{
-    color: #fe7740
+    color: #1697E9;
+    margin-right: -4px;
+    transition: all .3s ease-in;
 }
 .indexServe_img p span {
     width: 34px;
@@ -239,19 +243,20 @@ text-align: center;line-height: 24px;font-size: 16px;}
     transition: all .3s ease-in;
 }
 .indexSeach_two>div:hover .seachMore{
-    transition: all .3s ease-in;
-    padding-right:95px;
-    letter-spacing: 8px
+   
+    
 }
 .indexSeach_two>div:hover .seachMore a{
+    transition: all .3s ease-in;
+    margin-right:-4px;
     color: #1697E9;
 }
 .wit:hover p,.wih:hover p{
-    height: 60px;
+    /* height: 60px;
     line-height: 60px;
-    background: rgba(0, 0, 0, .5);
+    background: rgba(0, 0, 0, .5); */
     transition: all .4s ease-in;
-    color: #fff
+    color: #1697E9
 
 }
 .wit:hover img,.wih:hover img{
@@ -259,8 +264,7 @@ text-align: center;line-height: 24px;font-size: 16px;}
     transition: all .4s ease-in;
 }
 .indexGroom_tables>a>div:hover{
-    box-shadow: 0 4px 10px #ccc;
-    transform: scale(1.01);
+    box-shadow: 0 4px 14px #ccc;
     transition: all .4s ease-in;
 }
 

+ 38 - 14
src/css/newMenu/achievementList.css

@@ -5,7 +5,14 @@
 .search .search-inp {
     width: 100%;
 }
-
+.hotList  li{
+    transition: all .4s ease-in-out;
+}
+.hotList  li:hover{
+    box-shadow: 0 4px 10px #ccc;
+    transform: scale(1.05); 
+    transition: all .4s ease-in;
+}
 .search .search-inp .input-group {
     width: 930px;
 }
@@ -30,14 +37,15 @@
 
 .industry>p {
     float: left;
-    height: 82px;
     width: 115px;
     background: #f9f9f9;
     text-align: center;
     line-height: 82px;
     font-size: 14px;
 }
-
+.industryList ul li.active{
+    color: #ff570c!important;
+}
 .industry .industryList {
     width: 1082px;
     float: left;
@@ -46,6 +54,10 @@
     padding: 18px 0px 22px 0px;
 }
 
+.industry .industryList ul{
+    overflow: hidden;
+}
+
 .industry .industryList ul li {
     width: 90px;
     text-align: center;
@@ -74,8 +86,6 @@
 
 .productionType>p {
     width: 115px;
-    height: 49px;
-    line-height: 50px;
     font-size: 14px;
     text-align: center;
     float: left;
@@ -84,14 +94,17 @@
 
 .productionType ol {
     float: left;
+    width: 1080px;
+}
+.productionType ol li.active{
+    color: #ff570c!important;
 }
-
 .productionType ol li {
     float: left;
-    width: 90px;
+    width: 120px;
     text-align: center;
-    line-height: 50px;
-    color: #7a7878
+    color: #7a7878;
+    line-height: 30px;
 }
 
 .productionType ol li:hover {
@@ -171,7 +184,11 @@
 }
 
 .fineQuality ol li img {
-    width: 100%
+    width: 100%;
+    width: 198px;
+    height: 120px;
+    display: inline-block;
+
 }
 
 .fineQuality ol li .title-sm {
@@ -199,10 +216,13 @@
     float: right;
 }
 
-.achievementHot ul {
+.pagination_box{
+    clear: both;
     overflow: hidden;
 }
-
+.navigation{
+    clear: both;
+}
 .pagination_box {
     width: 100%;
     line-height: 74px
@@ -286,8 +306,9 @@
 }
 
 .achievementHot .btnTxt span {
-    width: 64px;
+  padding: 0 10px;
     height: 24px;
+    margin: 0 auto;
     display: inline-block;
     text-align: center;
     font-size: 14px;
@@ -295,6 +316,9 @@
     border: 1px solid #ff6600;
     line-height: 24px;
     margin: 0 3px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }
 
 .achievementHot ul li .img {
@@ -322,7 +346,7 @@
 
 .achievementHot ul li .txtIntroduce {
     float: left;
-    width: 188px;
+    width: 194px;
     border: 1px solid #efefef;
     height: 114px;
     padding: 0px 10px 12px;

+ 12 - 3
src/css/newMenu/demand.css

@@ -161,7 +161,7 @@
     width: 100%;
     transition:  all .5s ease-out;
 }
-.demandTxt .col-md-7>div:hover{
+.demandTxt .col-md-7>a>div:hover{
     margin-left: -8px;
     transition:  all .5s ease-in;
 }
@@ -531,11 +531,15 @@
     box-shadow: 0 5px 5px #ccc;
     transition: all .3s ease-in
 }
+.capitalMain div ol li:hover h4{
+    color: #0289df;
+}
 .capitalMain .col-sm-2 img{
     width: 100%;
 }
 .capital-administration{
     text-align: center;
+    width: 190px;
 }
 .capital-administration .capitalBj{
     height: 193px;
@@ -549,6 +553,7 @@
     text-overflow:ellipsis; 
     -o-text-overflow:ellipsis;
     overflow: hidden;
+    color: #191919;
 }
 .capital-administration .capitalBj>p{
     height: 100px;
@@ -563,16 +568,20 @@
     -webkit-line-clamp:3;
 
 }
+.capitalMain ol li {
+    width: 233px;
+    height: 322px;
+}
 .capital-administration .capitalBj>div>p{
     font-size: 12px;
     color: #393838;
 }
-.capital-administration a:hover{
+.capital-administration>a:nth-child(2):hover{
     background: #0289df;
     color: #ffffff;
     box-shadow: 0 5px 20px #0289df;
 }
-.capital-administration a{
+.capital-administration>a:nth-child(2){
     clear: both;
     display: inline-block;
     width: 100%;

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

@@ -142,6 +142,7 @@
 
 .pagination_box nav {
     float: right;
+    clear: both;
 }
 
 .pagination_box ul li a {

+ 57 - 11
src/css/newMenu/services.css

@@ -115,8 +115,13 @@
     width: 250px;
     padding-top: 22px;
     padding-left: 12px;
+    transition: all .2s ease-in-out;
     
 }
+.subsidyTxt ul li:hover{
+    box-shadow: 0 4px 10px #ccc;
+    transition: all .2s ease-in;
+}
 .subsidy .subsidyTxt ul li div{
     float: left;
     font-size: 14px;
@@ -158,6 +163,12 @@
      height: 136px;
      background:#ffffff;
      margin-left: 19px;
+     transition: all .2s ease-in-out;
+ }
+ .subsidyList>ul>li:hover{
+     margin-top: -4px;
+     box-shadow: 0 2px 10px #ccc;
+     transition: all .2s ease-in
  }
  .property .subsidyList>ul li:first-child{
      margin-left: 0
@@ -360,6 +371,9 @@
     text-overflow:ellipsis; 
     -o-text-overflow:ellipsis;
 }
+.certificationList ol li:hover{
+    color: #ff5910  
+}
 .certification .certificationList ol li a{
     color:#7a7878;
 }
@@ -384,6 +398,9 @@
     border-top: 1px solid #efefef;
     border-left: 1px solid #efefef
 }
+.administration ul li:hover{
+    color: #ff5910  
+}
 .administration ul li a{
     color:#7a7878
 }
@@ -433,6 +450,7 @@
     text-overflow:ellipsis; 
     -o-text-overflow:ellipsis;
     margin-top: 4px;
+    transition: all .2s ease-in-out;
 }
 .wrapperRight .memo ul li a{
     color: #7a7878;
@@ -450,7 +468,7 @@
 }   
 
 .wrapperRight .memo ul li a:hover{
-    color: #1797e9;
+    color: #ff5d1d;
 }
 
 /* 政策放榜 */
@@ -478,13 +496,18 @@
 }
 .policy ul li{
     margin-top: 5px;
+    transition: all .2s ease-in-out;
 }
 .policy ul li a{
     color: #7a7878;
     font-size: 14px;
 }
+.policy ul li:hover,.memo ul li:hover{
+    margin-left: -4px;
+    transition: all .2s ease-in;
+}
 .policy ul li:hover a{
-    color: #1797e9;
+    color: #ff5d1d;
 }
 
 /* 今日快讯 */
@@ -543,14 +566,19 @@
 .newFlash ul li{
     border-bottom: 1px dashed #eeeeee;
     padding:6px 0;
+    transition: all .2s ease-in;
 }
 .newFlash ul li a{
     color: #686868;
     height: 24px;
     line-height: 24px;
 }
+.newFlash ul li:hover{
+    margin-left: -4px;
+    transition: all .2s ease-in;
+}
 .newFlash ul li a:hover{
-    color: #1797e9;
+    color: #ff5910;
 }
 .newFlash ul li img{
     margin-right: 5px;
@@ -568,7 +596,9 @@
     clear: both;
     overflow: hidden;
     margin-bottom: 18px;
+    transition: all .2s ease-in-out;
 }
+
 .encyclopedias ul li img{
     width: 58px;
     float: left;
@@ -591,10 +621,10 @@
     color: #686868;
 }
 .encyclopedias ul li:hover p a{
-    color: #1797e9;
+    color: #ff5910;
 }
-.encyclopedias ul li:hover img{
-    transform: scale(0.9);
+.encyclopedias ul li:hover{
+    margin-left:-4px;
     transition: all .2s ease-in;
 }
 
@@ -814,19 +844,23 @@
 }
 .scienceList{
     float: left;
-    overflow: hidden;
     width: 660px;
     height: 284px;
     margin-top: 68px;
 }
 .scienceLeft ul{
-    overflow: hidden;
     box-sizing:border-box; 
 }
 .scienceLeft ul li {
     display: inline-block;
     margin-left: 10px;
     margin-bottom: 22px;
+    transition: all .2s ease-in-out;
+}
+.scienceLeft ul li:hover{
+    box-shadow: 0 2px 8px;
+    margin-top: -4px;
+    transition: all .2s ease-in;
 }
 .scienceRight{
     float: right;
@@ -920,6 +954,9 @@
     -o-text-overflow: ellipsis;
     padding: 0 5px;
 }
+.imgLeft ul li:hover{
+    color: #ff5d1d;
+}
 .imgLeft ul li a{
     color: #393838;
 }
@@ -1018,16 +1055,19 @@
 }
 .customerList ul li img{
     width: 96px;
-    height: 112px;
+    height: 96px;
     border-radius: 50%;
     float: left;
     margin-right: 15px;
+    margin-top: 3px;
 }
 .customerList ul li div{
     width: 228px;
     float: left;
 }
-
+.customerList ul li div h5{
+    font-size: 18px;
+}
 .customerList ul li div h5 span{
     color: #ff580e;
     font-size: 14px;
@@ -1036,7 +1076,7 @@
 }
 .customerList ul li div h5 span:first-child{
     font-weight: normal;
-    font-size: 18px;
+    font-size: 14px;
     color: #323232;
     margin-top: 16px;
 }
@@ -1045,6 +1085,12 @@
     color: #686868;
     margin-top: 15px;
 }
+.customerList ul li:hover h5{
+    color: #ff5d1d
+}
+.customerList ul li:hover h5 span{
+    color: #ff5d1d!important;
+}
 /* map */
 .serviceMap {
     float: left;

+ 1 - 0
src/css/register.css

@@ -28,6 +28,7 @@ ul,ol{padding: 0;margin: 0;list-style: none;}
 .registered{width:100%;height:800px;
     background: url(../../img/resiger_bj.jpg) no-repeat ;
     background-size: 100% 100%;
+    margin-top: 65px;
 }
 .reg_con{width:1200px;height:770px;margin:0 auto;
     /* background-image:url(../../img/zhucebg5.jpg) ;*/

+ 5 - 35
src/js/index.js

@@ -16,48 +16,18 @@ import './jquery-2.1.0.js';
 	//搜索功能
 	$(".indexImg1").click(function(){
 		var seachon=$(".indexSeach_one>ul>li.indexActive").index();
-		var key=$("#int").val();
-		localStorage.setItem("indexKeyWord",key);
+		var key=$(this).siblings('div').children().val();
 		switch(seachon){
-			case 0:window.open(globalConfig.context + '/portal/technologyTrading/achievement.html');break;
-			case 1:window.open(globalConfig.context + '/portal/technologyTrading/demand.html');break;
-			case 2:window.open(globalConfig.context + '/portal/technologyTrading/achievement.html');break;
-			case 3:window.open(globalConfig.context + '/portal/thinkTank/policyList.html');break;
-			case 4:window.open(globalConfig.context + '/portal/thinkTank/index.html#zizone');break;
-			case 5:break;
+			case 0:window.open(globalConfig.context + `/portal/technologyTrading/achievementList.html?name=${key}`);break;
+			case 1:window.open(globalConfig.context + `/portal/technologyTrading/demandList.html?name=${key}`);break;
+			case 2:window.open(globalConfig.context + `/portal/thinkTank/policyList?name=${key}`);break;
+			default :break;
 		}
 	})
 	//申请会员
 	$(".indexImg2").click(function(){
 		$(".ret_top>li:nth-child(1)").click();
 	})
-	//搜索栏下面的点击,登录判断
-	$(".seachCont1>div:nth-child(4)>a").click(function(){
-		var islogin=$("#isLogin").attr("islogin");
-        if(islogin=="true"){
-            $(".head_login").click();
-        }else if(islogin=="false"){
-        	$(this).attr("href","/user/account/demand.html#techDemand");
-        	$(this).click();
-        }
-	})
-	$(".seachCont1>div:nth-child(5)>a").click(function(){
-		var islogin=$("#isLogin").attr("islogin");
-        if(islogin=="true"){
-            $(".head_login").click();
-        }else if(islogin=="false"){
-        	$(this).attr("href","/user/account/achievement.html#techAchievement");
-        	$(this).click();
-        }
-	})
-	//搜索框下面的页面链接点击
-	$(".seachMore").click(function(){
-		if($(this).parent().children("#seachCont").children().attr("clicka")=="0"){
-			$(this).parent().children("#seachCont").children().animate({"left":"-138px"},"slow").attr("clicka","1");
-		}else if($(this).parent().children("#seachCont").children().attr("clicka")=="1"){
-			$(this).parent().children("#seachCont").children().animate({"left":"0px"},"slow").attr("clicka","0");
-		}
-	})
 	//成果需求切换
 	$(".indexGroom_table>div").click(function(){
 		$(this).parent().children().removeClass("indexGroom_active");

+ 84 - 66
src/js/newMenu/achievementList.js

@@ -10,10 +10,6 @@ import 'css/newMenu/header.css'
 import 'css/newMenu/achievementList.css';
 import 'js/public.js';
 
-"use strict";
-const globalConfig={
-    context:''
-}
 $(function () {
     var thePageNo = 1,
         thePageLength = 1,
@@ -25,10 +21,10 @@ $(function () {
         pages();
         inpFun();
         summary();
-        search();
         jump();
-        $('.onSelect .preFirst').css('display', 'none');
-        $('.onSelect .next').css('display', 'none');
+        hotSearch();
+        $('.onSelect .preFirst').css('display', 'none')
+        $('.onSelect .next').css('display', 'none')
     };
     //一级界面跳转此页面
     function jump() {
@@ -71,17 +67,36 @@ $(function () {
             }
         } else {
             dataList.name = "",
-            dataList.topId = "", //行业
-            dataList.secondId = "" //类型
+                dataList.topId = "", //行业
+                dataList.secondId = "" //类型
             loadDate();
         }
     }
+    //热搜
+    function hotSearch() {
+        $('.searchMain ol li').click(function () {
+            $(this).addClass('active').siblings().removeClass('active');
+            $('.searchMain ol li').eq(0).addClass('active');
+            dataList.name = $(this).text().trim();
+            let index = $(this).index();
+            $('.productionType ol').html(`<li data-id=''>不限</li>`);
+            $('.industryList ul li').removeClass('active');
+            $('.productionType ol li').removeClass('active')
+            heightFun();
+            if (index) {
+                dataList.topId = '';
+                dataList.secondId = '';
+                loadDate();
+            }
+        })
+    }
 
     function summary() {
+        let hash = window.location.search;
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/portal/service/jtBusiness/getCategoryList",
+            url: globalConfig.context + "/open/industryList",
             data: {
 
             },
@@ -90,39 +105,50 @@ $(function () {
                 if (data.data && data.data.length) {
                     let thisdata = data.data;
                     thisdata.unshift({
-                        topLevelId: '',
-                        topLevel: '不限',
+                        id: '',
+                        name: '不限',
                         children: [{
                             id: '',
                             name: '不限'
                         }]
                     })
-                    thisdata.map(item => {
-                        theArrs.push(`
-                            <li data-id=${item.topLevelId}>${item.topLevel}</li>
-                        `)
+                    thisdata.map((item, index) => {
+                        if (index || hash) {
+                            theArrs.push(`
+                            <li data-id=${item.id}>${item.name}</li>
+                             `)
+                        } else {
+                            theArrs.push(`
+                                <li class="active" data-id=${item.id}>${item.name}</li>
+                                `)
+                        }
                     })
                     $('.industryList ul').html(theArrs);
                     $('.industryList ul li').eq(0).className = "active";
                     $('.productionType ol').html(`<li data-id=''>不限</li>`);
                     $('.productionType ol li ').eq(0).addClass = "active";
+                    heightFun();
                     onSelect(thisdata);
                 };
             }
         })
     }
-   
+    function heightFun(){
+        let proH = $('.productionType ol').height();
+        $('.productionType p').css({height:proH+'px',lineHeight:proH+'px'})
+        $('.productionType').css({height:proH+'px',lineHeight:proH+'px'})
+    }
     function loadDate(pageNo) {
         $.ajax({
             method: "get",
             dataType: "json",
-            url: globalConfig.context + "/portal/service/jtProject/list",
+            url: globalConfig.context + "/open/achievementList",
             data: {
                 pageNo: pageNo || 1,
                 pageSize: 15,
                 name: dataList.name,
-                topId: dataList.topId, //行业
-                secondId: dataList.secondId //类型
+                fieldA: dataList.topId, //行业
+                fieldB: dataList.secondId //类型
             },
             success: function (data) {
                 var theArrs = [];
@@ -130,33 +156,33 @@ $(function () {
                     let nub = data.data.list.length;
                     for (let i = 0; i < nub; i++) {
                         let thisdata = data.data.list[i];
+                        console.log(thisdata.isHot)
                         theArrs.push(`
                         <li>
-                            <div class="img">
-                                <img src="${thisdata.cdn_img}" alt="">
-                                <span></span>
-                            </div>
-                            <div class="txtIntroduce">
-                                <div class="txts">
-                                    <h5>高压电极加热技术哈...</h5>
-                                    <p><span>实用技术</span><span>联合生产</span><span class="hotImg"></span></p>
+                            <a href="${globalConfig.context}/portal/technologyTrading/achievementDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
+                                <div class="img">
+                                    <img src="${thisdata.pictureUrl}" alt="">
                                 </div>
-                                <div class="hr"></div>
-                                <div class="btnTxt">
-                                    <span class="float-left">环保</span>
-                                    <span class="float-left">医疗</span>
+                                <div class="txtIntroduce">
+                                    <div class="txts">
+                                        <h5 title="${thisdata.name}">${thisdata.name}</h5>
+                    <p><span>${thisdata.dataCategoryS?thisdata.dataCategoryS:'实用技术'}</span><span style="display:${thisdata.isHot&&thisdata.isHot!='null'?'block':'none'}"  class="hotImg"></span></p>
+                                    </div>
+                                    <div class="hr"></div>
+                                    <div class="btnTxt">
+                                        <span class="float-left" style="display:${thisdata.fieldAS!=null?'block':'none'}">${thisdata.fieldAS}</span>
+                                    </div>
                                 </div>
-                            </div>
+                            </a>
                         </li>`);
                     };
                 };
-                $('.hotList').empty();
-                $('.hotList').append(theArrs.join(''));
-
+                $('.achievementHot .hotList').empty();
+                $('.achievementHot .hotList').append(theArrs.join(''));
                 $('.pagination_box').css('display', 'block');
                 $('.inp').css('display', 'block');
                 if (data.data.list.length === 0) {
-                    $('.hotList').html("<div class='list_none'></div>");
+                    $('.achievementHot .hotList').html("<div class='list_none'></div>");
                     $('.pagination_box').css('display', 'none')
                     $('.inp').css('display', 'none');
                 };
@@ -216,7 +242,7 @@ $(function () {
     function inpFun() {
         $('.inp .btn').on('click', function () {
             let val = $(this).siblings().val();
-            if (!isNaN(val) && val < thePageLength && val > 0) {
+            if (!isNaN(val) && val <= thePageLength && val > 0) {
                 thePageNo = val;
                 loadDate(thePageNo);
             }
@@ -225,6 +251,8 @@ $(function () {
     //已选类型
     function onSelect(data) {
         $('.industryList ul li').on('click', function () {
+            $('.searchMain ol li').removeClass('active');
+            $('.searchMain ol li').eq(0).addClass('active');
             let secondTxt = [],
                 scondHtml = [];
             $(this).addClass('active').siblings().removeClass('active')
@@ -233,14 +261,14 @@ $(function () {
             dataList.secondId = '';
             $('.next').css('display', 'none')
             data.map(item => {
-                if (item.topLevelId == dataList.topId) {
+                if (item.id == dataList.topId) {
                     secondTxt = item.children
                 }
             })
             secondTxt.map(item => {
                 scondHtml.push(`
-                    <li data-id=${item.id}>${item.name}</li>
-                    `)
+                <li data-id=${item.id}>${item.name}</li>
+                `)
             })
             if (!dataList.topId) {
                 dataList.topId = '';
@@ -250,11 +278,11 @@ $(function () {
                 scondHtml = ['<li>不限</li>'];
             }
             $('.productionType ol').html(scondHtml);
+            heightFun();
             let txt = $(this).text();
             $('.onSelect .preFirst').css('display', 'block').html(`
-                    <span>${txt}</span>
-                    <span class="typeClose">x</span>
-            `)
+                <span>${txt}</span>
+        `)
             loadDate();
             $('.productionType ol li').on('click', function () {
                 dataList.name = '';
@@ -265,39 +293,29 @@ $(function () {
 
                 let txt = $(this).text();
                 $('.onSelect .next').css('display', 'block').html(`
-                        <span>${txt}</span>
-                        <span class="typeClose">x</span>
-                        `)
+                    <span>${txt}</span>
+                    `)
                 loadDate();
             })
         });
     }
-    //搜索
-    function search() {
-        $('.hot ul li').click(function () {
-            dataList.name = $(this).text();
+    $('.searchBtn').click(function () {
+        let val = $('.demandSearch').val();
+        if (val) {
+            dataList.name = val;
             dataList.topId = '';
             dataList.secondId = '';
             loadDate();
-        });
-        $('.searchBtn').click(function () {
-            let val = $('.demandSearch').val();
-            if (val) {
-                dataList.name = val;
-                dataList.topId = '';
-                dataList.secondId = '';
-                loadDate();
-            }
-        })
-    }
-        //提示框渐隐函数    
-	function msg() {
+        }
+    })
+    /* 提示 */
+    //提示框渐隐函数    
+    function msg() {
         $('.smg').addClass('active');
         var lit = $('#msg').val();
         setTimeout(function () {
             $('.smg').removeClass('active')
             $('#msg').val('');
         }, 2000)
-    } 
-
+    }
 })

+ 219 - 76
src/js/newMenu/demandList.js

@@ -11,81 +11,185 @@ import 'css/newMenu/achievementList.css';
 import 'js/public.js';
 
 "use strict";
-$(function() {
+$(function () {
     var thePageNo = 1,
         thePageLength = 1,
-        dataList={},
-        pageSize =12;
+        dataList = {},
+        pageSize = 15;
     init();
-    function init(){
-        loadDate();
+
+    function init() {
         pages();
-        onSelect();
         inpFun();
-        $('.onSelect .preFirst').css('display','none')
-        $('.onSelect .next').css('display','none')
+        summary();
+        jump();
+        hotSearch();
+        $('.onSelect .preFirst').css('display', 'none')
+        $('.onSelect .next').css('display', 'none')
     };
-	function loadDate(pageNo) {
-        console.log(dataList)
+    //一级界面跳转此页面
+    function jump() {
+        let hash = window.location.search;
+        if (hash) {
+            if (hash.indexOf('name') > -1 || hash.indexOf('topId') > -1 || hash.indexOf('secondId') > -1) {
+                let newHash = hash.substr(1, hash.length)
+                if (newHash.indexOf('&') > -1) {
+                    let hashArr = newHash.split('&');
+                    console.log(hashArr)
+                    hashArr.map(item => {
+                        if (item.indexOf('name') > -1) {
+                            let names = item.split('=')
+                            dataList.name = names[1]
+                        }
+                        if (item.indexOf('topId') > -1) {
+                            let topIds = item.split('=')
+                            dataList.topId = topIds[1]
+                        }
+                        if (item.indexOf('secondId') > -1) {
+                            let secondIds = item.split('=')
+                            dataList.secondId = secondIds[1]
+                        }
+                    })
+                } else {
+                    if (newHash.indexOf('name') > -1) {
+                        let names = newHash.split('=')
+                        dataList.name = names[1]
+                    }
+                    if (newHash.indexOf('topId') > -1) {
+                        let topIds = newHash.split('=')
+                        dataList.topId = topIds[1]
+                    }
+                    if (newHash.indexOf('secondId') > -1) {
+                        let secondIds = newHash.split('=')
+                        dataList.secondId = secondIds[1]
+                    }
+                }
+                loadDate()
+            }
+        } else {
+            dataList.name = "",
+                dataList.topId = "", //行业
+                dataList.secondId = "" //类型
+            loadDate();
+        }
+    }
+    //热搜
+    function hotSearch() {
+        $('.searchMain ol li').click(function () {
+            $(this).addClass('active').siblings().removeClass('active');
+            $('.searchMain ol li').eq(0).addClass('active');
+            dataList.name = $(this).text().trim();
+            let index = $(this).index();
+            $('.productionType ol').html(`<li data-id=''>不限</li>`);
+            $('.industryList ul li').removeClass('active');
+            $('.productionType ol li').removeClass('active')
+            heightFun();
+            if (index) {
+                dataList.topId = '';
+                dataList.secondId = '';
+                loadDate();
+            }
+        })
+    }
+
+    function summary() {
+        let hash = window.location.search;
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            url: globalConfig.context + "/open/industryList",
+            data: {
+
+            },
+            success: function (data) {
+                var theArrs = [];
+                if (data.data && data.data.length) {
+                    let thisdata = data.data;
+                    thisdata.unshift({
+                        id: '',
+                        name: '不限',
+                        children: [{
+                            id: '',
+                            name: '不限'
+                        }]
+                    })
+                    thisdata.map((item, index) => {
+                        if (index || hash) {
+                            theArrs.push(`
+                            <li data-id=${item.id}>${item.name}</li>
+                             `)
+                        } else {
+                            theArrs.push(`
+                                <li class="active" data-id=${item.id}>${item.name}</li>
+                                `)
+                        }
+                    })
+                    $('.industryList ul').html(theArrs);
+                    $('.industryList ul li').eq(0).className = "active";
+                    $('.productionType ol').html(`<li data-id=''>不限</li>`);
+                    $('.productionType ol li ').eq(0).addClass = "active";
+                    heightFun();
+                    onSelect(thisdata);
+                };
+            }
+        })
+    }
+    function heightFun(){
+        let proH = $('.productionType ol').height();
+        $('.productionType p').css({height:proH+'px',lineHeight:proH+'px'})
+        $('.productionType').css({height:proH+'px',lineHeight:proH+'px'})
+    }
+    function loadDate(pageNo) {
         $.ajax({
             method: "get",
             dataType: "json",
-            //url: globalConfig.context + "/portal/search/achievementList",
-            url:"https://www.apiopen.top/satinApi",
+            url: globalConfig.context + "/open/demandList",
             data: {
-                //page:1
                 pageNo: pageNo || 1,
-                pageSize: 12,
-                // keyword: theKeyword,
-                fieldA: dataList.industryVal, //行业
-                fieldB: dataList.productionVal //类型
+                pageSize: 15,
+                name: dataList.name,
+                industryCategoryA: dataList.topId, //行业
+                industryCategoryB: dataList.secondId //类型
             },
             success: function (data) {
-                console.log(data)
                 var theArrs = [];
-                data.data.totalCount=400;
-                if (data.data&&data.data.length) {
-                    for (let i = 0; i < 12; i++) {
-                        let thisdata = data.data[i];
+                if (data.data && data.data.list.length) {
+                    let nub = data.data.list.length;
+                    for (let i = 0; i < nub; i++) {
+                        let thisdata = data.data.list[i];
+                        console.log(thisdata.fieldAS)
                         theArrs.push(`
                         <li>
-                            <div class="img">
-                                <img src="${thisdata.cdn_img}" alt="">
-                                <span></span>
-                            </div>
-                            <div class="txtIntroduce">
-                                <div class="txts">
-                                    <h5>高压电极加热技术哈...</h5>
-                                    <p><span>实用技术</span><span>联合生产</span><span class="hotImg"></span></p>
+                            <a href="${globalConfig.context}/portal/technologyTrading/demandDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
+                                <div class="img">
+                                    <img src="${thisdata.pictureUrl}" alt="">
                                 </div>
-                                <div class="hr"></div>
-                                <div class="btnTxt">
-                                    <span class="float-left">环保</span>
-                                    <span class="float-left">医疗</span>
+                                <div class="txtIntroduce">
+                                    <div class="txts">
+                                        <h5 title="${thisdata.name}">${thisdata.name}</h5>
+                    <p><span>${thisdata.demandTypeS?thisdata.demandTypeS:'实用技术'}</span><span style="display:${thisdata.isHot&&thisdata.isHot!='null'?'block':'none'}"  class="hotImg"></span></p>
+                                    </div>
+                                    <div class="hr"></div>
+                                    <div class="btnTxt">
+                                        <span class="float-left" style="display:${thisdata.industryCategory1!=null?'block':'none'}">${thisdata.industryCategory1}</span>
+                                    </div>
                                 </div>
-                            </div>
-                        </li>`
-                     );
+                            </a>
+                        </li>`);
                     };
                 };
                 $('.achievementHot .hotList').empty();
                 $('.achievementHot .hotList').append(theArrs.join(''));
-                
-                //页面里面的详情链接   
-                $(".achievementHot .hotList li").on('click', function () {    	      
-                        var theId = $(this).parents('.list').attr('val');
-                        var thetype=$(this).parents('.list').attr('typ');			       
-                        window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
-                });
-                $('.pagination_box').css('display','block');
-                $('.inp').css('display','block');
-                if(data.data.length===0){
-                        $('.achievementHot .hotList').html("<div class='list_none'></div>")	;
-                        $('.pagination_box').css('display','none')
-                        $('.inp').css('display','none');
+                $('.pagination_box').css('display', 'block');
+                $('.inp').css('display', 'block');
+                if (data.data.list.length === 0) {
+                    $('.achievementHot .hotList').html("<div class='list_none'></div>");
+                    $('.pagination_box').css('display', 'none')
+                    $('.inp').css('display', 'none');
                 };
                 thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
-                $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)    
+                console.log(thePageLength)
+                $('.totalCount').html(`共${data.data.totalCount}条数据 ${thePageLength}页`)
                 var pageArr = [],
                     firstNo = 1,
                     endNo = 5;
@@ -112,7 +216,7 @@ $(function() {
         });
     }
     //f分页
-    function pages(){
+    function pages() {
         $('.pagination').on('click', 'li', function (e) {
             e.preventDefault();
             if (this.className === 'pagePre') {
@@ -137,44 +241,83 @@ $(function() {
         });
     }
     //输入跳转
-    function inpFun(){
-        $('.inp .btn').on('click',function(){
+    function inpFun() {
+        $('.inp .btn').on('click', function () {
             let val = $(this).siblings().val();
-            if(!isNaN(val)&&val<thePageLength&&val>0){
-                thePageNo=val;
+            if (!isNaN(val) && val <=thePageLength && val > 0) {
+                thePageNo = val;
                 loadDate(thePageNo);
             }
         })
     }
     //已选类型
-    function onSelect(){
-       $('.industryList ul li').on('click',function(){
-        dataList.industryVal = $(this).attr('value');
-           let txt = $(this).text();
-           $('.onSelect .preFirst').css('display','block').html(`
+    function onSelect(data) {
+        $('.industryList ul li').on('click', function () {
+            $('.searchMain ol li').removeClass('active');
+            $('.searchMain ol li').eq(0).addClass('active');
+            let secondTxt = [],
+                scondHtml = [];
+            $(this).addClass('active').siblings().removeClass('active')
+            dataList.topId = $(this).attr('data-id');
+            dataList.name = '';
+            dataList.secondId = '';
+            $('.next').css('display', 'none')
+            data.map(item => {
+                if (item.id == dataList.topId) {
+                    secondTxt = item.children
+                }
+            })
+            secondTxt.map(item => {
+                scondHtml.push(`
+                <li data-id=${item.id}>${item.name}</li>
+                `)
+            })
+            if (!dataList.topId) {
+                dataList.topId = '';
+                dataList.secondId = '';
+                $('.preFirst').html('不限');
+                $('.next').css('display', 'none')
+                scondHtml = ['<li>不限</li>'];
+            }
+            $('.productionType ol').html(scondHtml);
+            heightFun();
+            let txt = $(this).text();
+            $('.onSelect .preFirst').css('display', 'block').html(`
                 <span>${txt}</span>
-                <span class="typeClose">x</span>
-           `)
-           loadDate();
-       }) ;
-       $('.productionType ol li').on('click',function(){
-        dataList.productionVal = $(this).attr('value');
-        let txt = $(this).text();
-        $('.onSelect .next').css('display','block').html(`
-             <span>${txt}</span>
-             <span class="typeClose">x</span>
-             `)
-             loadDate();
-        }) 
+        `)
+            loadDate();
+            $('.productionType ol li').on('click', function () {
+                dataList.name = '';
+                dataList.topId = $('.industryList ul li.active').attr('data-id');
+                $(this).addClass('active').siblings().removeClass('active');
+                dataList.secondId = $(this).attr('data-id');
+                if (!dataList.secondId) return;
+
+                let txt = $(this).text();
+                $('.onSelect .next').css('display', 'block').html(`
+                    <span>${txt}</span>
+                    `)
+                loadDate();
+            })
+        });
     }
+    $('.searchBtn').click(function () {
+        let val = $('.demandSearch').val();
+        if (val) {
+            dataList.name = val;
+            dataList.topId = '';
+            dataList.secondId = '';
+            loadDate();
+        }
+    })
     /* 提示 */
     //提示框渐隐函数    
-	function msg() {
+    function msg() {
         $('.smg').addClass('active');
         var lit = $('#msg').val();
         setTimeout(function () {
             $('.smg').removeClass('active')
             $('#msg').val('');
         }, 2000)
-    } 
+    }
 })

+ 12 - 5
src/js/newMenu/serviceList.js

@@ -28,6 +28,7 @@ $(function () {
         $('.onSelect .next').css('display', 'none');
     };
     //一级界面跳转此页面
+   
     function jump() {
         let hash = window.location.search;
         if (hash) {
@@ -75,6 +76,7 @@ $(function () {
     }
 
     function summary() {
+        let hash = window.location.search;
         $.ajax({
             method: "get",
             dataType: "json",
@@ -94,10 +96,16 @@ $(function () {
                             name: '不限'
                         }]
                     })
-                    thisdata.map(item => {
-                        theArrs.push(`
+                    thisdata.map((item,index) => {
+                        if(index||hash){
+                            theArrs.push(`
                             <li data-id=${item.topLevelId}>${item.topLevel}</li>
-                        `)
+                             `)
+                        }else{
+                            theArrs.push(`
+                                <li class="active" data-id=${item.topLevelId}>${item.topLevel}</li>
+                                `)
+                        }
                     })
                     $('.industryList ul').html(theArrs);
                     $('.industryList ul li').eq(0).className = "active";
@@ -213,7 +221,7 @@ $(function () {
     function inpFun() {
         $('.inp .btn').on('click', function () {
             let val = $(this).siblings().val();
-            if (!isNaN(val) && val < thePageLength && val > 0) {
+            if (!isNaN(val) && val <= thePageLength && val > 0) {
                 thePageNo = val;
                 loadDate(thePageNo);
             }
@@ -251,7 +259,6 @@ $(function () {
             let txt = $(this).text();
             $('.onSelect .preFirst').css('display', 'block').html(`
                     <span>${txt}</span>
-                    <span class="typeClose">x</span>
             `)
             loadDate();
             $('.productionType ol li').on('click', function () {

+ 180 - 156
src/js/thinkTank/policyList.js

@@ -6,165 +6,189 @@ import '../../js/public.js';
 import '../../js/main_banner.js';
 import '../../css/thinkTank/policyList.css';
 import {
-    provinceList
-    } from '../../js/NewDicProvinceList';
-$(function(){	
+	provinceList
+} from '../../js/NewDicProvinceList';
+const globalConfig={
+	context:''
+}
+$(function () {
 	//数据处理
-	var theKeyword,pageSize,Province;
-    var thePageNo = 1,
-    thePageLength = 1,
-    pageSize = 6;
-    theKeyword=localStorage.getItem("indexKeyWord");
-    localStorage.removeItem("indexKeyWord");
-    $('#search_on input').val(theKeyword);
-    loadDate();
+	var theKeyword, pageSize, Province;
+	var thePageNo = 1,
+		thePageLength = 1,
+		pageSize = 6;
+	theKeyword = localStorage.getItem("indexKeyWord");
+	localStorage.removeItem("indexKeyWord");
+	jump();
+	//一级界面跳转此页面
+	function jump() {
+		let hash = window.location.search;
+		if (hash) {
+			if (hash.indexOf('name') > -1) {
+				let newHash = hash.substr(1, hash.length)
+				if (newHash.indexOf('&') > -1) {
+					let hashArr = newHash.split('&');
+					hashArr.map(item => {
+						if (item.indexOf('name') > -1) {
+							let names = item.split('=')
+							theKeyword = names[1]
+						}
+					})
+				} else {
+					if (newHash.indexOf('name') > -1) {
+						let names = newHash.split('=')
+						theKeyword = names[1]
+					}
+				}
+				loadDate()
+			}
+		} else {
+			theKeyword = "",
+			loadDate();
+		}
+	}
 	function loadDate(pageNo) {
-	    $.ajax({
-	        method: "get",
-	        dataType: "json",
-	        url: globalConfig.context + "/portal/news/list",
-	        data: {
-	            pageNo: pageNo || 1,
-	            pageSize: pageSize,
-	            keyword: theKeyword,
-	            provinceId: Province != 999 ? Province : undefined	           	             	           
-	        },
-	        success: function (data) {   	        	
-	            var theArr = [];
-	            thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1; 	           
-	            if (data.data && data.data.list) {	            	                		                
-	                for (let i = 0; i < data.data.list.length; i++) {
-	                    let thisdata = data.data.list[i];
-	                    var id=thisdata.id;               	
-	                	var title = thisdata.title; //标题
-	                	var time = thisdata.createTimeFormattedDate; //日期
-	                	var day=time.substr(8,2);//号
-	                	var month=time.substr(0,7) //年、月
-	                	var summary = thisdata.summary;//简介
-	                	if(summary==null){
-	                		summary=='暂无内容'
-	                	};	                	
-	                	var sol='';
-	                	var srctt=globalConfig.context + '/portal/news/newsDetail.html?id=' + id;
-	                    theArr.push([                                       	                   
-						    '<li value="'+id+'">',
-						    '<div class="policy_time">',
-						    '<p>'+day+'</p>',
-						    '<time>'+month+'</time>',
-						    '</div>',
-						    '<div class="policy_details">',
-						    '<h4><a href="'+srctt+'">'+title+'</a></h4>',
-						    '<p>'+summary+'</p>',
-						    '<a href="'+srctt+'">MORE+</a>',
-						    '</div>',
-						    '</li>',      						
-	                    ].join(''));
-	                };
-	            };
-	            $('.policy ul').empty();
-	            $('.policy ul').append(theArr.join(''));
-	            if(data.data.list.length===0){
-	            	$('.policy ul').html('<div class="imgbg"></div>')	
-	            };
-	             $('.totalCount').html("共 "+ thePageLength +" 页 " + data.data.totalCount + " 条数据");	           
-	            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(''));
-		        },
-	    });
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			url: globalConfig.context + "/portal/news/list",
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: pageSize,
+				keyword: theKeyword,
+				provinceId: Province != 999 ? Province : undefined
+			},
+			success: function (data) {
+				var theArr = [];
+				thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
+				if (data.data && data.data.list) {
+					for (let i = 0; i < data.data.list.length; i++) {
+						let thisdata = data.data.list[i];
+						var id = thisdata.id;
+						var title = thisdata.title; //标题
+						var time = thisdata.createTimeFormattedDate; //日期
+						var day = time.substr(8, 2); //号
+						var month = time.substr(0, 7) //年、月
+						var summary = thisdata.summary; //简介
+						if (summary == null) {
+							summary == '暂无内容'
+						};
+						var sol = '';
+						var srctt = globalConfig.context + '/portal/news/newsDetail.html?id=' + id;
+						theArr.push([
+							'<li value="' + id + '">',
+							'<div class="policy_time">',
+							'<p>' + day + '</p>',
+							'<time>' + month + '</time>',
+							'</div>',
+							'<div class="policy_details">',
+							'<h4><a href="' + srctt + '">' + title + '</a></h4>',
+							'<p>' + summary + '</p>',
+							'<a href="' + srctt + '">MORE+</a>',
+							'</div>',
+							'</li>',
+						].join(''));
+					};
+				};
+				$('.policy ul').empty();
+				$('.policy ul').append(theArr.join(''));
+				if (data.data.list.length === 0) {
+                    $('.pagination_box').css('display', 'none')
+                };
+				if (data.data.list.length === 0) {
+					$('.policy ul').html('<div class="imgbg"></div>')
+				};
+				$('.totalCount').html("共 " + thePageLength + " 页 " + data.data.totalCount + " 条数据");
+				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);
-        var search_city=$('#selt').value;
-        Province=search_city
-    };
-    loadDate();
-    //点击分页
-     $('.pagination').on('click', 'li', function (e) {
-        e.preventDefault();
-		 console.log(thePageNo);
-        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);
-            };
-        };
-    });
-    //链接详情
-    $('.invest_imglist ul').on('click', 'li', function () {  
-    	var theId = $(this).attr('value');       
-        window.open(globalConfig.context + '/portal/thinkTank/thinkerDetail.html?id=' + theId );
-    })  	
+	//点击分页
+	$('.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);
+			};
+		};
+	});
+	//链接详情
+	$('.invest_imglist ul').on('click', 'li', function () {
+		var theId = $(this).attr('value');
+		window.open(globalConfig.context + '/portal/thinkTank/thinkerDetail.html?id=' + theId);
+	})
 	//导航城市添加
 	var industryListArr = [],
-        industryChildrenArr = [];
-    industryListArr.push(['<li value="999" class="active">',
-        '<span>',
-        '不限',
-        '</span>',
-        '</li>',
-    ].join(''));
-    provinceList.map(function (item) {    	
-        industryListArr.push(['<li value="' +item.id + '">',
-            '<span>',
-            item.name,
-            '</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");
-        Province=theValue;
-        loadDate();
-    }) 
-    //搜索时
-    $('#btn_search').click(function(e){
-    	e.preventDefault();
-    	var citys=$('#industryList .active').attr('value');   	   	
-    	var val_inp=$('#search_on input').val();   	
-    	Province=citys;    	
-    	theKeyword=val_inp;
-    	loadDate();
-    })
+		industryChildrenArr = [];
+	industryListArr.push(['<li value="999" class="active">',
+		'<span>',
+		'不限',
+		'</span>',
+		'</li>',
+	].join(''));
+	provinceList.map(function (item) {
+		industryListArr.push(['<li value="' + item.id + '">',
+			'<span>',
+			item.name,
+			'</span>',
+			'</li>',
+		].join(''));
+	});
+	if (industryListArr && industryListArr.length) {
+		$('#industryList').append(industryListArr.join(''));
+	};
+	//点击城市时
+	$('#industryList li').click(function () {
+		window.location.hash='';
+		theKeyword = $('#search_on input').val();
+		var theValue = this.value;
+		$(this).siblings("li").removeClass("active");
+		$(this).addClass("active");
+		Province = theValue;
+		loadDate();
+	})
+	//搜索时
+	$('#btn_search').click(function (e) {
+		e.preventDefault();
+		var citys = $('#industryList .active').attr('value');
+		var val_inp = $('#search_on input').val();
+		Province = citys;
+		theKeyword = val_inp;
+		loadDate();
+	})
 })

+ 7 - 7
template/newMenu/demandList.html

@@ -132,21 +132,21 @@
                 </div>
                 <div class="searchMain">
                     <ol>
-                        <li class="active">热搜</li>
-                        <li>
-                            <a href="#" target="_blank">人工智能</a>
+                        <li>热搜</li>
+                        <li class="active">
+                            人工智能
                         </li>
                         <li>
-                            <a href="#">区块链</a>
+                            区块链
                         </li>
                         <li>
-                            <a href="#">环保</a>
+                            环保
                         </li>
                         <li>
-                            <a href="#">金属材料</a>
+                            金属材料
                         </li>
                         <li>
-                            <a href="#">软件开发</a>
+                            软件开发
                         </li>
                     </ol>
                 </div>