dengzhiguo 7 years ago
parent
commit
86d425b9fa

+ 3 - 3
src/css/Technologytrading.css

@@ -78,14 +78,14 @@ body{background: #f5f5f5;}
 .main_details ul li img{;width: 260px;height:211px;}
 .main_details ul li .details_fix{position: absolute;top: 140px;background: rgba(0,0,0,0.5);z-index: 12;width: 260px;height: 70px;
     text-align: left;color: #FFFFFF;padding-left: 10px;}
-.main_details ul li .details_fix>p>span{color:#ccc;}
+.main_details ul li .details_fix>p>span{color:#ccc;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;width:190px;display: inline-block;line-height: 13px;}
 .details_fix p{height:30px;width:100%;line-height: 35px;}
 .details_fix p:first-child{margin-top: 0;}
 .details_fix p span{color: #333333;margin-left: 5px;}
 
 .details_text{width:260px;padding-top:10px ;position: absolute;left: 0;bottom:0;}
 .details_text p{width: 200px;margin:5px auto;color: #f68705;font-size: 16px;}
-.details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;
+.details_text p span{color: #333333;display: inline-block;width: 155px;overflow: hidden;height: 20px;
     vertical-align: top;text-overflow: ellipsis;white-space: nowrap;margin-left: 8px;}
 .details_text p b{font-weight:normal;color: #333333;width:160px;height:40px ;display: inline-block;vertical-align: top; }
 .details_text a{width: 80px;height: 26px;display: inline-block;
@@ -97,7 +97,7 @@ body{background: #f5f5f5;}
 #demandList_patent{list-style: none;}
 .details_text{width:260px;padding-top:10px ;}
 .details_text p{width: 200px;margin:5px auto;color: #f68705;font-size: 16px;}
-.details_text p span{color: #333333;display: inline-block;width: 160px;overflow: hidden;height: 20px;vertical-align: top;text-overflow: ellipsis;white-space: nowrap;}
+.details_text p span{color: #333333;display: inline-block;width: 155px;overflow: hidden;height: 20px;vertical-align: top;text-overflow: ellipsis;white-space: nowrap;}
 .details_text p b{font-weight:normal;color: #333333;width:160px;height:40px ;display: inline-block;vertical-align: top; }
 .details_text a{width: 80px;height: 26px;display: inline-block;background: #ffb200;border-radius: 10px;float: right;line-height: 26px;text-align: center;color: #ffffff;margin-right: 30px;margin-bottom: 16px;}
 

+ 4 - 2
src/css/financialIndex.css

@@ -108,12 +108,14 @@ form>img{position: absolute;top:2px;right:10px;}
 .place_city ul li:hover{cursor: pointer;}
 .place_city ul li.thon{background: #2f85d0;color: #ffffff;}
 .more_city{float:left; position: relative;width: 160px;}
-.more_city .list_city{position: absolute;top: 49px;right: 0;text-align: center;font-size:16px ;color: #333333;width:161px;height: 302px;overflow: scroll;overflow-x: hidden;border: 1px solid #333333;padding-bottom: 15px;background: #ffffff;padding-bottom: 20px;}
+.more_city .list_city{position: absolute;top: 49px;right: 0;text-align: center;font-size:16px ;color: #333333;
+    width:161px;height: 302px;overflow: scroll;overflow-x: hidden;border: 1px solid #333333;padding-bottom: 15px;
+    background: #ffffff;padding-bottom: 20px;z-index: 1000;}
 .list_city p{width:160px;line-height:30px;height: 30px;}
 .list_city p:hover{box-shadow: inset 0 0 3px #cccccc;background:#f79624;color: #ffffff;}
 .more_city .thon{background: #2f85d0;color: #ffffff!important;}
 .more_city:hover .inp{cursor: pointer;}
-
+#demandList_patent li{cursor: pointer;}
 .allproduct_center{width:1200px;height:100px;margin: 0 auto;
 position: relative;}
 .allproduct_center>div{display: inline-block;}

+ 7 - 2
src/css/technologyTrading/achievementDetail.css

@@ -52,7 +52,12 @@ padding: 0 30px;}
 .line{width:1080px;height:20px;border: 1px solid #C8CACE;margin: 0 auto;border-bottom: none;
 text-align: center;font-size: 22px;line-height: 40px;color:#4E4E4E;}
 
-
+div.pointer{cursor: pointer;}
+.fine>div>p{text-overflow:ellipsis;overflow: hidden;}
+.fine>div>p.achievementId{display: none;}
+.fine>div>p.achievementTyp{display: none;}
+.main_introduce ul>li>div>p.likeId{display: none;}
+.main_introduce ul>li>div>p.likeType{display: none;}
 .main_introduce{clear: both;padding-top: 40px;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;}
@@ -60,7 +65,7 @@ text-align: center;font-size: 22px;line-height: 40px;color:#4E4E4E;}
 .list_text {padding-left: 28px;padding-top: 10px;position: absolute;
     bottom: 0;padding-bottom: 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 p span{margin-left: 8px;color: #787878;font-size: 14px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;width: 165px;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;}

+ 1 - 1
src/css/technologyTrading/demand.css

@@ -1,4 +1,4 @@
-.main_introduce ul li .star{width: 230px;background: url(../../../img/demand_starbj.png) no-repeat center left;background-size: 100% 100%;}
+.main_introduce ul li .star{width: 252px;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;}

+ 12 - 2
src/css/technologyTrading/demandDetail.css

@@ -18,12 +18,21 @@
 .big_img>img{width:470px;}
 .basic{width:300px;height:490px;position: absolute;top:95px;left:550px;}
 .basic>div{width:220px;height:55px;border-bottom: 1px solid #EFEFEF;}
+.basic>div>p{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .basic>span{width:30px;height:30px;display: inline-block;position: absolute;bottom:-50px;left: -500px;}
 .basic>span>img{margin-top: -5px;}
 .basic>span>span{line-height: 30px;}
 .basic>div.detail_btn{width:152px;height:45px;background: #FFB200;color:#fff;
     font-weight: bold;font-size: 18px;line-height: 45px;text-align: center;position: absolute;
     bottom: 0;left:0;}
+div.pointer{cursor: pointer;}
+div.pointer>p{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;padding: 0 5px;}
+.fine>div>p{text-overflow:ellipsis;overflow: hidden;}
+.fine>div>p.demandId{display: none;}
+.fine>div>p.demandTyp{display: none;}
+.main_introduce ul>li{cursor: pointer;}
+.main_introduce ul>li>div>p.demandId{display: none;}
+.main_introduce ul>li>div>p.demandTyp{display: none;}
 .basic h5{font-weight: bold;}
 .basic>div.inline_span{padding-top: 30px;}
 .fine{width:240px;height:545px;position: absolute;top:45px;right:80px;}
@@ -33,8 +42,9 @@
 .fine>div{width:240px;height:160px;margin-top: 10px;position: relative;}
 .fine>div>img{width:240px;height:160px;}
 .fine>div>p{width:240px;height:35px;position: absolute;left:0;bottom:0;background: #7A7572;
-    color:#fff;text-align: center;line-height: 35px;}
-
+    color:#fff;text-align: center;line-height: 35px;text-overflow:ellipsis;overflow: hidden;}
+.fine>div>p.achievementId{display: none;}
+.fine>div>p.achievementTyp{display: none;}
 .detail_centertext{width:1200px;height:240px;padding:30px 50px 0 50px;position: relative;}
 .detail_centertext>div{width:550px;height:240px;display: inline-block;}
 .text_right>div{width:1100px;border-bottom:1px solid #F0F0F1;line-height: 40px;font-size: 16px;  }

+ 20 - 26
src/js/Technologytrading.js

@@ -34,7 +34,6 @@ import {
        else{
             window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
         }
-
 });
 //处理data数据函数提取
     function manage(data){
@@ -48,27 +47,27 @@ import {
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
                 "<div class='imgnull'></div>" +
                 "<div class='details_text'>" +
-                "<p>行业<span>"+catalog+"</span></p>" +
-                "<p>价格<span>"+price+"</span></p>" +
-                "<p>简介<span>"+sketch+"..."+"</span></p>" +
+                "<p>行业:<span>"+catalog+"</span></p>" +
+                "<p>价格:<span>"+price+"</span></p>" +
+                "<p>简介:<span>"+sketch+"..."+"</span></p>" +
                 "<a href='#'>了解详情</a>" +
                 "</div>" +
                 "<div class='details_fix'>" +
-                "<p>专利名<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人<span>"+data.list[i].personName+"</span></p>" +
+                "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
+                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }else{
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
                 "<img src='"+globalConfig.avatarUploadHost+data.list[i].pictureUrl+"' alt=''/>" +
                 "<div class='details_text'>" +
-                "<p>行业<span>"+catalog+"</span></p>" +
-                "<p>价格<span>"+price+"</span></p>" +
-                "<p>简介<span>"+sketch+"..."+"</span></p>" +
+                "<p>行业:<span>"+catalog+"</span></p>" +
+                "<p>价格:<span>"+price+"</span></p>" +
+                "<p>简介:<span>"+sketch+"..."+"</span></p>" +
                 "<a href='#'>了解详情</a>" +
                 "</div>" +
                 "<div class='details_fix'>" +
-                "<p>专利名<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人<span>"+data.list[i].personName+"</span></p>" +
+                "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
+                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }
         }
@@ -149,27 +148,27 @@ import {
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
                 "<div class='imgnull'></div>" +
                 "<div class='details_text'>" +
-                "<p>行业<span>"+catalog+"</span></p>" +
-                "<p>价格<span>"+price+"</span></p>" +
-                "<p>简介<span>"+sketch+"..."+"</span></p>" +
+                "<p>行业:<span>"+catalog+"</span></p>" +
+                "<p>价格:<span>"+price+"</span></p>" +
+                "<p>简介:<span>"+sketch+"..."+"</span></p>" +
                 "<a href='#'>了解详情</a>" +
                 "</div>" +
                 "<div class='details_fix'>" +
-                "<p>专利名<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人<span>"+data.list[i].personName+"</span></p>" +
+                "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
+                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }else{
                 demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
                 "<img src='"+globalConfig.avatarUploadHost+data.list[i].pictureUrl+"' alt=''/>" +
                 "<div class='details_text'>" +
-                "<p>行业<span>"+catalog+"</span></p>" +
-                "<p>价格<span>"+price+"</span></p>" +
-                "<p>简介<span>"+sketch+"..."+"</span></p>" +
+                "<p>行业:<span>"+catalog+"</span></p>" +
+                "<p>价格:<span>"+price+"</span></p>" +
+                "<p>简介:<span>"+sketch+"..."+"</span></p>" +
                 "<a href='#'>了解详情</a>" +
                 "</div>" +
                 "<div class='details_fix'>" +
-                "<p>专利名<span>"+data.list[i].name+"</span></p>" +
-                "<p>所有人<span>"+data.list[i].personName+"</span></p>" +
+                "<p>专利名:<span>"+data.list[i].name+"</span></p>" +
+                "<p>所有人:<span>"+(data.list[i].personName?data.list[i].personName:"佚名")+"</span></p>" +
                 "</div></li>"
             }
         }
@@ -198,7 +197,6 @@ import {
                 }else{
                     //$(".pagination_box").css("display","block");
                     thePageNo=1;
-                    console.log("进来了");
                     manage(data.data);
                     page_ol(data.data.totalCount);
                     $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/6));
@@ -308,7 +306,6 @@ import {
         }
         $('.pageNumber').remove();
         for (let i = firstNo; i <= endNo; i++) {
-            console.log(i);
             if (i == thePageNo) {
                 pageArr.push(
                     '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
@@ -334,10 +331,7 @@ import {
             endNo = Math.min(date, 5);
         }
         $('.pageNumber').remove();
-        console.log(firstNo);
-        console.log(endNo);
         for (let i = firstNo; i <= endNo; i++) {
-            console.log(i);
             if (i == thePageNo) {
                 pageArr.push(
                     '<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'

+ 133 - 30
src/js/financialIndex.js

@@ -12,6 +12,15 @@ import {
 
 (function(){
     $("#demandList_patent").on('click', 'li', function () {
+        var theId = $(this).attr('val');
+        var thetype=$(this).attr('typ');
+            window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
+    });
+    var theKeyword,Province;
+    var thePageNo = 1,
+        thePageLength = 1,
+        pageSize = 6;
+    $("#demandList_patent").on('click', 'li', function () {
         var theId = $(this).attr('value');
         window.open(globalConfig.context + '/portal/financial/investmentDetail.html?organizationId=' + theId );
     });
@@ -62,7 +71,8 @@ import {
                     $("#demandList_patent").html("<div class='list_none'></div>");
                 }else{
                      manage(data.data,ptxt);
-                    page(data.data.totalCount);
+                    page_ol(data.data.totalCount);
+                    $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
                 }
             }
         })
@@ -98,6 +108,7 @@ import {
                 }else{
                 manage(data.data,"教育休闲");
                 page(data.data.totalCount);
+                 $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
                 }
             }
         })
@@ -106,26 +117,43 @@ import {
     function manage(data,ptxt){
         var demand_html="";
         for(var i=0;i<data.list.length;i++){
-            var price=data.list[i].transferPrice?data.list[i].transferPrice:"面议"
-            var  people=data.list[i].ownerName?data.list[i].ownerName:"保密"
+            var hangye=$(".place_city .thon").html();
+            var price=data.list[i].transferPrice?data.list[i].transferPrice:"面议";
+            var  people=data.list[i].ownerName?data.list[i].ownerName:"保密";
             var  sketch=data.list[i].sketch?data.list[i].sketch.substring(0,18):"暂无简介";
-            demand_html+="<li value='"+data.list[i].id+"'>" +
-            "<img src='"+globalConfig.avatarUploadHost+data.list[i].technicalPictureUrl+"' alt=''/>" +
-            "<div class='details_text'>" +
-            "<p>融资金额:<span>"+price+"</span></p>" +
-            "<p>所属行业:<span>"+ptxt+"</span></p>" +
-            "<p>所有人:<span>"+people+"</span></p>" +
-            "<p>项目简介:<b>"+sketch+"..."+"</b></p>" +
-            "<a href='#'>会谈</a>" +
-            "</div>" +
-            "<div class='details_fix'>" +
-            "<p>项目名:<span>"+data.list[i].name+"</span></p>" +
-            "</div></li>"
+            if(!data.list[i].pictureUrl){
+                demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
+                "<div class='imgnull'></div>" +
+                "<div class='details_text'>" +
+                "<p>融资金额:<span>"+price+"</span></p>" +
+                "<p>所属行业:<span>"+hangye+"</span></p>" +
+                "<p>所有人:<span>"+people+"</span></p>" +
+                "<p>项目简介:<b>"+sketch+"..."+"</b></p>" +
+                "<a href='#'>会谈</a>" +
+                "</div>" +
+                "<div class='details_fix'>" +
+                "<p>项目名:<span>"+data.list[i].name+"</span></p>" +
+                "</div></li>"
+            }else{
+                demand_html+="<li val='"+data.list[i].id+"' typ='"+data.list[i].ownerType+"'>" +
+                "<img src='"+globalConfig.avatarUploadHost+data.list[i].technicalPictureUrl+"' alt=''/>" +
+                "<div class='details_text'>" +
+                "<p>融资金额:<span>"+price+"</span></p>" +
+                "<p>所属行业:<span>"+hangye+"</span></p>" +
+                "<p>所有人:<span>"+people+"</span></p>" +
+                "<p>项目简介:<b>"+sketch+"..."+"</b></p>" +
+                "<a href='#'>会谈</a>" +
+                "</div>" +
+                "<div class='details_fix'>" +
+                "<p>项目名:<span>"+data.list[i].name+"</span></p>" +
+                "</div></li>"
+            }
         }
         $("#demandList_patent").html(demand_html);
     }
 
     function page(data){
+        thePageNo=$(".pagination li.active").children()[0].text;
         var date=Math.ceil(data/8);
         $('.totalCount').html("共 "+ date +" 页 " + data + " 条数据");
         var pageArr = [],
@@ -151,9 +179,59 @@ import {
         $('.pageNumber').remove();
         $('.pagePre').after(pageArr.join(''));
     }
-    $(".paging_box").on("click","span",function(e){
-        $(".pagination_box").css("display","block");
-        var page_length=$(this).attr("value");
+    function page_ol(data){
+        thePageNo=1;
+        var date=Math.ceil(data/8);
+        $('.totalCount').html("共 "+ date +" 页 " + data + " 条数据");
+        var pageArr = [],
+            firstNo = 1,
+            endNo = 5;
+        if (thePageNo > 3) {
+            firstNo = thePageNo - 2;
+            endNo = Math.min((Number(thePageNo) + 2), date);
+        } else {
+            endNo = Math.min(date, 5);
+        }
+        $('.pageNumber').remove();
+        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>'
+                );
+            }
+        }
+        $('.pagePre').after(pageArr.join(''));
+    }
+    $('.pagination').on('click', 'li', function (e) {
+        e.preventDefault();
+        thePageNo=$(".pagination li.active").children()[0].text;
+        if (this.className === 'pagePre') {
+            if (thePageNo > 1) {
+                thePageNo = 1;
+                loadDate(thePageNo);
+            }
+        } else if (this.className === 'pageNext') {
+            thePageLength=$(".pageNext").attr("all_length");
+            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);
+            }
+        }
+    });
+    //右侧内容的分页功能,点击一次发送一个ajax的请求,只请求6组数据
+    function loadDate(pageNo) {
         var left_val=$(".place_city .thon").attr("value");
         $.ajax({
             method: "get",
@@ -162,22 +240,46 @@ import {
             data: {
                 fieldA:left_val,
                 dataCategory:2,
-                pageNo:page_length,
+                pageNo:pageNo,
                 pageSize:8
             },
             success: function (data) {
-                if(data.data.totalCount==0){
-                    $(".pagination_box").css("display","none");
-                    $("#demandList_patent").html("<div class='list_none'>敬请期待...</div>");
-                }else{
-                    manage(data.data,"教育休闲");
-                    page(data.data.totalCount);
-                    $(".paging_box span").eq(page_length-1).addClass("action_span").siblings().removeClass("action_span");
+                if (data.data.totalCount == 0) {
+                    $("#demandList_patent").html("<div class='list_none'></div>");
+                } else {
+                    manage(data.data);
+                    var data=data.data.totalCount;
+                    var date=Math.ceil(data/8);
+                    $(".pageNext").attr("all_length",date);
+                    $('.totalCount').html("共 "+ date +" 页 " + data + " 条数据");
+                    var pageArr = [],
+                        firstNo = 1,
+                        endNo = 5;
+                    if (thePageNo > 3) {
+                        firstNo = thePageNo - 2;
+                        endNo = Math.min((Number(thePageNo) + 2), date);
+                    } else {
+                        endNo = Math.min(date, 5);
+                    };
+                    $('.pageNumber').remove();
+                    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>'
+                            );
+                        }
+                    };
+                    $('.pagePre').after(pageArr.join(''));
                 }
+                $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
             }
-        })
 
-    });
+        });
+    }
     $('.place_city ul li').click(function() {
         $(".pagination_box").css("display","block");
         $(this).addClass('thon').siblings().removeClass('thon')
@@ -197,11 +299,12 @@ import {
             },
             success: function (data) {
                 if(data.data.totalCount==0){
-                    //$(".pagination_box").css("display","none");
+                    $(".pagination_box").css("display","none");
                     $("#demandList_patent").html("<div class='list_none'></div>");
                 }else{
                     manage(data.data,"教育休闲");
-                    page(data.data.totalCount);
+                    page_ol(data.data.totalCount);
+                    $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
                     }
             }
         })

+ 5 - 2
src/js/public.js

@@ -16,9 +16,12 @@ $(function(){
 			}
 		});	
 	//二级导航
-	$('.nav ul li').hover(function(){	
+	$('.nav ul li').hover(function(){
 		$(this).find('.subnavigation').slideToggle(200);
-	})
+	});
+	$('.nav ul li').mouseleave(function(){
+		$('.nav ul li').stop(false,true);
+	});
 	//挂件
 	$('.pendent_box').click(function(e){	
 			e.preventDefault();

+ 11 - 5
src/js/technologyTrading/achievement.js

@@ -15,7 +15,13 @@ import {
 
 
 $(function(){
-	
+    //页面里面的详情链接
+    $(".main_introduce ul").on('click', 'li', function () {
+        var ol_index= $(".title_details ol>li.act").index();
+        var theId = $(this).attr('val');
+        var thetype=$(this).attr('typ');
+            window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
+    });
 	//数据处理
 	var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,dateSort,lowerPrice,upperPrice;
 var thePageNo = 1,
@@ -52,7 +58,7 @@ function loadDate(pageNo) {
             category:category != 999 ? category : undefined,  
             dateSort:dateSort,
             lowerPrice:lowerPrice,
-	        upperPrice:upperPrice,            
+	        upperPrice:upperPrice
         },
         success: function (data) {        	
             var theArr = [];
@@ -66,7 +72,7 @@ function loadDate(pageNo) {
                     	star+='<li></li>';
                     }                     
                     theArr.push([                                       
-                        '<li>',		//图片地址				
+                        '<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">',		//图片地址
 						'<img src="' + globalConfig.avatarHost + '/upload' + imgUrl + '"/>',
 	 					'<div class="list_text">',
 	 					'<p>行业<span>' + getIndustryCategory(thisdata.fieldA, thisdata.fieldB) + '</span></p>',
@@ -76,7 +82,7 @@ function loadDate(pageNo) {
 	 					'<a href="#">了解详情</a>',
 	 					'</div>',
 	 					'<div class="star">',
-	 					'<p>成熟度</p>',
+	 					'<p>成熟度:<span>'+thisdata.maturityS+'</span></p>',
 	 					'<ol>'+star+'</ol>',	 									 					
 	 					'</div>',
 	 					'<input type="hidden" class="achievementId" value="' + thisdata.id + '">',
@@ -114,7 +120,7 @@ function loadDate(pageNo) {
             };
             $('.pageNumber').remove();
             $('.pagePre').after(pageArr.join(''));
-        },
+        }
     });
 }
     if (window.location.search) {

+ 11 - 2
src/js/technologyTrading/achievementDetail.js

@@ -10,6 +10,15 @@ import '../../css/technologyTrading/achievementDetail.css';
         var smallsrc=$(this).attr("src");
         $(".big_img img").attr("src",smallsrc);              
     })
-   
-    
+
+    $(".fine").on('click', 'div.pointer', function () {
+        var theId = $(this).children("p.achievementId").html();
+        var thetype=$(this).children("p.achievementTyp").html();
+        window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
+    });
+    $(".main_introduce ul").on("click","li",function(){
+        var theId = $(this).children("div").children("p.likeId").html();
+        var thetype=$(this).children("div").children("p.likeType").html();
+        window.open(globalConfig.context + '/portal/technologyTrading/achievementDetail?id=' + theId+'&type='+thetype );
+    })
 })();

+ 13 - 7
src/js/technologyTrading/demand.js

@@ -15,7 +15,13 @@ import {
 } from '../DicIndustryList'; 
  
 $(function(){
-
+	//页面里面的详情链接
+	$(".main_introduce ul").on('click', 'li', function () {
+		var ol_index= $(".title_details ol>li.act").index();
+		var theId = $(this).attr('val');
+		var thetype=$(this).attr('typ');
+		window.open(globalConfig.context + '/portal/technologyTrading/demandDetail?id=' + theId+'&type='+thetype );
+	});
 	//数据处理
 	var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,dateSort,budgetCostLower,budgetCostUpper;
 	var thePageNo = 1,
@@ -46,30 +52,30 @@ $(function(){
 	            industryCategoryB: theFieldB != 999 ? theFieldB : undefined,	           
 	            dateSort:dateSort,
 	            budgetCostLower:budgetCostLower,
-	            budgetCostUpper:budgetCostUpper,
+	            budgetCostUpper:budgetCostUpper
 	        },
 	        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 imgUrl=thisdata.personPortraitUrl!==null?thisdata.personPortraitUrl:"/img/timg.gif";
+	                     var imgUrl=thisdata.pictureUrl!==null?thisdata.pictureUrl:"/img/timg.gif";
 	                    var star='';
                   		for(var n=0;n<thisdata.maturity;n++){
                     	   star+='<li></li>'
                    		}        
-	                    theArr.push([	                      	                        
-	                        '<li>',		//图片地址				
+	                    theArr.push([
+							'<li val="'+thisdata.id+'" typ="'+thisdata.dataCategory+'">',			//图片地址
 							'<img src="' + globalConfig.avatarHost + '/upload' + imgUrl + '"/>',
 		 					'<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>类型<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>',
+		 					'<p>成熟度:<ol><li></li><li></li><li></li><li></li><li></li></ol></p>',
 		 					'<ol>'+star+'</ol>',	 									 					
 		 					'</div>',
 		 					'<input type="hidden" class="demandId" value="' + thisdata.id + '">',

+ 12 - 1
src/js/technologyTrading/demandDetail.js

@@ -7,4 +7,15 @@ import '../../js/main_banner.js';
 import '../../css/technologyTrading/demandDetail.css';
 
 
-
+(function(){
+    $(".fine").on('click', 'div.pointer', function () {
+        var theId = $(this).children("p.demandId").html();
+        var thetype=$(this).children("p.demandTyp").html();
+        window.open(globalConfig.context + '/portal/technologyTrading/demandDetail?id=' + theId+'&type='+thetype );
+    });
+    $(".main_introduce ul").on("click","li",function(){
+        var theId = $(this).children("div").children("p.demandId").html();
+        var thetype=$(this).children("div").children("p.demandTyp").html();
+        window.open(globalConfig.context + '/portal/technologyTrading/demandDetail?id=' + theId+'&type='+thetype );
+    })
+})();