dengzhiguo 7 years ago
parent
commit
65801b110f

BIN
img/assessment.jpg


BIN
img/thinkerDetail_banner01.jpg


+ 2 - 2
src/css/index_home.css

@@ -32,7 +32,7 @@ display: inline-block;box-sizing: border-box;padding: 0 10px;}
 .demand_img{width:300px;height:75px;position: relative;}
 .demand_img>img{width:75px;height:75px;display: inline-block;}
 .demand_img>div{width:185px;height:75px;display: inline-block;position: absolute;left:90px;top:0;}
-.demand_img>div>h5{margin: 0;margin-top:10px;font-size: 15px;letter-spacing: 2px;height:34px;font-weight: bold;color:#3B3B3B;
+.demand_img>div>h5{margin: 0;margin-top:10px;font-size: 15px;letter-spacing: 2px;height:32px;font-weight: bold;color:#3B3B3B;font-family: "微软雅黑";
 text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical; -webkit-line-clamp: 2;}
 
 .demand_img>div>p{margin: 0;margin-top:5px;height:30px;line-height:25px;width:210px;position: relative;padding-left:25px;}
@@ -56,7 +56,7 @@ text-align: center;background:#2F83CE;margin-top: 15px;position: relative;paddin
 .policy_date{width:80px;height:55px;position: absolute;top:0;left:0;text-align:left;padding-top:5px;}
 .policy_date>h4{color:#505050;font-size: 20px;font-weight: bold;letter-spacing: 2px;}
 .policy_date>p{color:#7A7878;}
-.policy_line{width:0;height:55px;position: absolute;top:0;left:95px;border:1px solid #BCBBBB;}
+.policy_line{width:0;height:45px;position: absolute;top:0;left:95px;border-left:1px solid #BCBBBB;}
 .policy_p_cont{width:510px;height:55px;position: absolute;top:0;right:0;}
 .policy_p_cont>h5{font-size:15px;color:#3B3B3B;margin-top: 0;font-weight: bold;}
 .policy_p_cont>p{color:#7f7f7f;font-size:14px;margin-top:5px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}

+ 4 - 2
src/css/technologyTrading/achievement.css

@@ -40,8 +40,10 @@
 .portal-content{padding-left: 10px;}
 .search-select ul li label{font-weight: normal;color:#616161;font-size: 14px;}
 .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 .patent{background: url(../../../img/achievement_check.jpg) no-repeat center right;background-size:30% 50%;}
+.search-select ul li .demand{background: url(../../../img/achievement_checkno.jpg) no-repeat center right;background-size:30% 50%;}
+#selectInt li .patent{background: url(../../../img/achievement_check.jpg) no-repeat center right;background-size:45% 50%;}
+#selectInt li .demand{background: url(../../../img/achievement_checkno.jpg) no-repeat center right;background-size:45% 50%;}
 .search-select ul li label:hover{cursor: pointer;}
 /*内容详情列表区域*/
 #maxprice{margin-right: 10px;}

+ 0 - 1
src/css/technologyTrading/assessMent.css

@@ -11,7 +11,6 @@
 .assessMent .container ul li:hover{cursor: pointer;}
 .assessMent .container ul li:hover .people{margin-left: -10px;}
 .assessMent .container ul li:hover span{margin-left: -10px;}
-.carouselt{height:470px;}
 
 
 .process{width:1200px;height:520px;margin:30px auto 0;position:relative;}

+ 6 - 4
src/css/thinkTank.css

@@ -144,10 +144,12 @@ width:600px;height:195px;border-bottom: 5px solid #2D83CE}
 .pagination li.active a{background: #ffd800; color: #ffffff!important;border: 1px solid #ffd800;} 
 .pagination > li > a, .pagination > li > span {color: #000000;}
        
-     
-         
-        
-       
+.search-select ul li .patent{background: url(../../img/achievement_check.jpg) no-repeat center right;background-size:40% 50%;}
+.search-select ul li .demand{background: url(../../img/achievement_checkno.jpg) no-repeat center right;background-size:40% 50%;}
+#isInt{margin-left: 10px;visibility: hidden;}
+#noInt{margin-left: 10px;visibility: hidden;}       
+#selectInt li:nth-child(2){border: none;}       
+#selectInt li:nth-child(3){border: none;}       
             
    
     

+ 1 - 1
src/css/thinkTank/thinkerDetail.css

@@ -1,5 +1,5 @@
 *{padding: 0;margin: 0;box-sizing:border-box;font-family: "微软雅黑";}
-.banner{width:100%;height:463px;}
+.banner{width:100%;height:600px;}
 .banner>img{width:100%;height:100%;}
 .think_man{width:615px;height:90px;margin: 0 auto;position: relative;}
 .man_img{position:absolute;width:210px;height:210px;border-radius:50%;

+ 0 - 2
src/js/index.js

@@ -45,7 +45,6 @@ $(function(){
 	
 	//轮播图的开始
     var img_length=$(".ct-img-big").children("li").length-2;
-    console.log(img_length);
     var smallhtml="";
     for(var i=1;i<=img_length;i++){
         smallhtml+="<li></li>"
@@ -67,7 +66,6 @@ $(function(){
     $imgBig.prepend($lastImg.clone());
     $imgBig.append($firstImg.clone()); //设置imgBig clone后的宽度
     $imgBig.css("width", $imgWidth*$imgBig.children().length+"px")//这时的个数是添加完以后的个数
-    console.log($imgBig.width());
     $imgBig.css({'left':'-='+$imgWidth+'px'})//把第一张图放入可视区
     var pageIndex = 0 ; //img的下标;
     var isAnimate = false//防止重复点击 上锁

+ 34 - 4
src/js/technologyTrading/achievement.js

@@ -15,7 +15,7 @@ import {
 
 
 $(function(){
-    var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,dateSort,lowerPrice,upperPrice;
+    var theKeyword, theMode, theFieldA, theFieldB,dataCategory,category,internationalFlag,dateSort,lowerPrice,upperPrice;
     theKeyword=localStorage.getItem("keyWord");
     var typ=localStorage.getItem("pageType");
     localStorage.removeItem("keyWord");
@@ -59,7 +59,8 @@ function loadDate(pageNo) {
             category:category != 999 ? category : undefined,
             dateSort:dateSort,
             lowerPrice:lowerPrice,
-	        upperPrice:upperPrice
+	        upperPrice:upperPrice,
+	        internationalFlag:internationalFlag != 999 ? internationalFlag : undefined,
         },
         success: function (data) {
             var theArr = [];
@@ -274,7 +275,7 @@ function loadDate(pageNo) {
         $('#search_on input').val(theKeyword);
         loadDate();       
     });
-    //单选
+    //技术类型单选
 	$('#patent').prop('checked',false);
 	$('#selectAct li:first-child').click(function(){
 		$(this).addClass('active');
@@ -305,7 +306,36 @@ function loadDate(pageNo) {
 		dataCategory=null;
 		loadDate(); 
 	})
-	
+	//是否国际单选
+	$('#isInt').prop('checked',false);
+	$('#selectInt li:first-child').click(function(){
+		$(this).addClass('active');
+		$('#isInt').prop('checked',false);
+		$('#noInt').prop('checked',false);
+		$('#noInt,#isInt').parent().addClass('demand').removeClass('patent');					
+		category=null;
+		dataCategory=null;
+		internationalFlag=null;
+		loadDate();  
+	})
+	$('#isInt').click(function(){	
+		$('#selectInt li').eq(0).removeClass('active')
+		$(this).prop('checked',true);		
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#noInt').attr('checked',false);
+		$('#noInt').parent().addClass('demand').removeClass('patent');
+		internationalFlag=1;
+		loadDate(); 
+	})
+	$('#noInt').click(function(){
+		$('#selectInt li').eq(0).removeClass('active')
+		$(this).prop('checked',true);
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#isInt').attr('checked',false);
+		$('#isInt').parent().addClass('demand').removeClass('patent');
+		internationalFlag=0;
+		loadDate(); 
+	})
 	//排序下拉选择
 	$('.head-left ul li p').click(function(){
 		$(this).siblings().slideToggle(300);	

+ 32 - 3
src/js/thinkTank.js

@@ -255,7 +255,7 @@ $(function(){
         mids(1,pageNos);
     })
     //智者数据交互
-    var theKeyword, theFieldA, theFieldB, theFieldC,province;
+    var theKeyword, theFieldA, theFieldB, theFieldC,province,international;
     var thePageNo = 1,
         thePageLength = 1,
         pageSize = 12,
@@ -274,7 +274,8 @@ $(function(){
                 pageSize: pageSize,
                 type: theType,
                 name: theKeyword,
-                field: theFieldA ? ((theFieldA || '') + (theFieldB ? (',' + theFieldB) : '') + (theFieldC ? (',' + theFieldC) : '')) : undefined
+                field: theFieldA ? ((theFieldA || '') + (theFieldB ? (',' + theFieldB) : '') + (theFieldC ? (',' + theFieldC) : '')) : undefined,
+            	international:international != 999 ? international : undefined
             },
             success: function (data) {
                 var theArr = [];
@@ -484,7 +485,35 @@ $(function(){
         var theId = $(this).attr('value');       
         window.open(globalConfig.context + '/user/subscriberDetail.html?uid=' + theId + '&type=0');
        
-    })
+    });
+    //是否国际单选
+	$('#isInt').prop('checked',false);
+	$('#selectInt li:first-child').click(function(){
+		$(this).addClass('active');
+		$('#isInt').prop('checked',false);
+		$('#noInt').prop('checked',false);
+		$('#noInt,#isInt').parent().addClass('demand').removeClass('patent');					
+		international=null;
+		loadDate();  
+	})
+	$('#isInt').click(function(){	
+		$('#selectInt li').eq(0).removeClass('active')
+		$(this).prop('checked',true);		
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#noInt').attr('checked',false);
+		$('#noInt').parent().addClass('demand').removeClass('patent');
+		international=1;
+		loadDate(); 
+	})
+	$('#noInt').click(function(){
+		$('#selectInt li').eq(0).removeClass('active')
+		$(this).prop('checked',true);
+		$(this).parent().addClass('patent').removeClass('demand');
+		$('#isInt').attr('checked',false);
+		$('#isInt').parent().addClass('demand').removeClass('patent');
+		international=0;
+		loadDate(); 
+	})
 })
 
 

+ 50 - 50
src/js/thinkTank/thinkerDetail.js

@@ -96,54 +96,54 @@ $(function () {
 		}
 	});
 	//点击收藏
-	var isIntereste=$("#isInterester").attr("isInterester");
-    if(isIntereste==0){
-        $(".loves>span:nth-child(3)").removeClass("box_love").addClass("bj_love");
-    }else if(isIntereste==1){
-        $(".loves>span:nth-child(3)").removeClass("bj_love").addClass("box_love");
-    }
-    var t=0;
-    $('.box_dianji').click(function(){
-    	console.log(11);
-        var theId=$("#demand_id").attr("val");
-        var islogin=$("#isLogin").attr("islogin");
-        if(islogin=="true"){
-            $(".head_login").click();
-        }
-    	if($('.loves>span:nth-child(3)').hasClass('box_love')&&islogin=="false"){
-    		console.log(12);
-    		t=$('.dem_number').text();            		
-    	    $('.dem_number').text(parseInt(t)+1);
-    	    $('.loves>span:nth-child(3)').addClass('bj_love').removeClass('box_love');
-            $.ajax({
-                method: "post",
-                dataType: "json",
-                url: globalConfig.context + "/api/user/interest/interestUser",
-                data: {
-                    id:theId
-                },
-                success: function (data) {
-
-                }
-            });
-    	    return false;
-    	}   	    	
-    	if($('.loves>span:nth-child(3)').hasClass('bj_love')&&islogin=="false"){
-    		console.log(13);
-    		t=$('.dem_number').text();         		
-    	    $('.dem_number').text(parseInt(t)-1)
-    	    $('.loves>span:nth-child(3)').addClass('box_love').removeClass('bj_love')
-            $.ajax({
-                method: "post",
-                dataType: "json",
-                url: globalConfig.context + "/api/user/interest/cancelInterest",
-                data: {
-                    id:theId
-                },
-                success: function (data) {
-
-                }
-            });
-    	}    	   	
-    })
+//	var isIntereste=$("#isInterester").attr("isInterester");
+//  if(isIntereste==0){
+//      $(".loves>span:nth-child(3)").removeClass("box_love").addClass("bj_love");
+//  }else if(isIntereste==1){
+//      $(".loves>span:nth-child(3)").removeClass("bj_love").addClass("box_love");
+//  }
+//  var t=0;
+//  $('.box_dianji').click(function(){
+//  	console.log(11);
+//      var theId=$("#demand_id").attr("val");
+//      var islogin=$("#isLogin").attr("islogin");
+//      if(islogin=="true"){
+//          $(".head_login").click();
+//      }
+//  	if($('.loves>span:nth-child(3)').hasClass('box_love')&&islogin=="false"){
+//  		console.log(12);
+//  		t=$('.dem_number').text();            		
+//  	    $('.dem_number').text(parseInt(t)+1);
+//  	    $('.loves>span:nth-child(3)').addClass('bj_love').removeClass('box_love');
+//          $.ajax({
+//              method: "post",
+//              dataType: "json",
+//              url: globalConfig.context + "/api/user/interest/interestUser",
+//              data: {
+//                  id:theId
+//              },
+//              success: function (data) {
+//
+//              }
+//          });
+//  	    return false;
+//  	}   	    	
+//  	if($('.loves>span:nth-child(3)').hasClass('bj_love')&&islogin=="false"){
+//  		console.log(13);
+//  		t=$('.dem_number').text();         		
+//  	    $('.dem_number').text(parseInt(t)-1)
+//  	    $('.loves>span:nth-child(3)').addClass('box_love').removeClass('bj_love')
+//          $.ajax({
+//              method: "post",
+//              dataType: "json",
+//              url: globalConfig.context + "/api/user/interest/cancelInterest",
+//              data: {
+//                  id:theId
+//              },
+//              success: function (data) {
+//
+//              }
+//          });
+//  	}    	   	
+//  })
 })