liting2017 7 years ago
parent
commit
3df31cce9a

+ 2 - 2
src/css/public.css

@@ -185,8 +185,8 @@ font-size: 18px;cursor: pointer;}
 .fastener .new_password_sub{background: #F18101;width:150px;height:40px;border:1px solid #E5E5E5;margin-right: 20px;
     color:#fff;letter-spacing: 8px;font-size: 18px;}
 /*弹出消息提示*/
-.smg{display: none;width: 200px;height: 30px;background: rgba(255,255,255,.7);border-radius: 10px;position: fixed;top:10%;left: 50%;margin-left: -75px;color: blue;z-index: 999999;}
-.smg input{width: 200px;height: 30px;border: none;background: none;text-align: center;font-size: 16px;}
+.smg{display: none;width: 200px;height: 50px;background: rgba(200,200,200,.7);position: fixed;top:10%;left: 50%;margin-left: -75px;color: #00A2AE;z-index: 999999;border: 1px double #ccc;}
+.smg input{width: 200px;height: 50px;border: none;background: none;text-align: center;font-size: 16px;line-height: 50px;}
 
 /* msg tools*/
 .message{position:fixed;top: 80px;text-align: center; width: 100%; display: none;z-index: 9999}

+ 3 - 3
src/css/technologyTrading/achievementDetail.css

@@ -9,7 +9,7 @@
 .detail_topimg{float: right;}
 .detail_topimg>a{width:30px;height:30px;cursor: pointer;margin-left:10px;}
 .detail_center{width:1200px;height:900px;margin: 0 auto;border: 1px solid #EFEFEF;}
-.detail_centerimg{width:1200px;height:660px;padding-top:45px;padding-left: 60px;
+.detail_centerimg{width:1200px;height:690px;padding-top:45px;padding-left: 60px;
     border-bottom: 1px solid #EFEFEF;position: relative;}
 .detail_centerimg>div:nth-child(1){width:1200px;height:490px;position: relative;}
 .detail_centerimg>div>div.big_img>img{width:430px;height:440px;}
@@ -30,10 +30,10 @@ top:0;left:230px;text-align: center; line-height: 490px;overflow: hidden;}
 .basic>div.basic_right{position: absolute;left:600px;bottom:50px;width:160px;}
 .basic>div.detail_btn{width:152px;height:45px;background: #FFB200;color:#fff;
 font-size: 16px;line-height: 45px;text-align: center;letter-spacing: 2px;
-position: absolute;left:0;bottom:10px;cursor: pointer;}
+position: absolute;left:0;bottom:0px;cursor: pointer;}
 .basic>div.detail_btn_{width:152px;height:45px;background: #FFB200;color:#fff;
     font-size: 16px;line-height: 45px;text-align: center;letter-spacing: 2px;
-    position: absolute;left:190px;bottom:10px;cursor: pointer;}
+    position: absolute;left:190px;bottom:0px;cursor: pointer;}
 .fine{width:240px;height:545px;position: absolute;top:45px;right:80px;}
 .fine>img{width:240px;height:160px;}
 .fine>div.fine_title{width:90px;height:35px;background: #3185D0;text-align: center;

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

@@ -45,6 +45,7 @@
     margin-right: 10px;font-size: 18px;}
 .right_btn>div.btn_right{border: none;background:#FFB200;
     color:#fff;font-weight: bold;}
+.right_btn>div:hover{cursor: pointer;}
 .right_text>div.summary{height:110px;}
 .right_bottom{width:445px;height:100px;position: relative;}
 .right_bottom>div{width:445px;height:100px;padding-top: 10px;

+ 21 - 21
src/js/financialIndex.js

@@ -9,7 +9,6 @@ import {
     industryObject,
     getIndustryCategory
     } from './DicIndustryList';
-
 (function(){
     $("#demandList_patent").on('click', 'li', function () {
         var theId = $(this).attr('val');
@@ -19,16 +18,14 @@ import {
     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 );
-    });
+        pageSize = 6;    
     //用JS导入行业下拉列表的数据
     var list_html="";
     for(var i=0;i<industryObject.length;i++){
         list_html+="<p value='"+industryObject[i].value+"'>"+industryObject[i].label+"</li>";
     }
+    
+    
     $(".list_city").html(list_html);
     //行业下拉选择
     $('.list_city').hide();
@@ -40,9 +37,6 @@ import {
         $('.list_city').hide();
     });
 
-
-
-
     //点击下拉框中的p
     $('.list_city p').click(function() {
         $(".allproduct_top form input").val("");
@@ -70,11 +64,12 @@ import {
                 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,ptxt);
+                    manage(data.data,ptxt);
                     page_ol(data.data.totalCount);
                     $(".pageNext").attr("all_length",Math.ceil(data.data.totalCount/8));
                 }
@@ -120,8 +115,8 @@ import {
 
     function manage(data,ptxt){
         var demand_html="";
-        for(var i=0;i<data.list.length;i++){
-            var hangye=$(".place_city .thon").html();
+        for(var i=0;i<data.list.length;i++){                      	
+            var hangye=data.list[i].fieldAs;                       
             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):"暂无简介";
@@ -157,8 +152,8 @@ import {
     }
     function manage_search(data,ptxt){
         var demand_html="";
-        for(var i=0;i<data.list.length;i++){
-            var hangye=$(".place_city .thon").html();
+        for(var i=0;i<data.list.length;i++){            
+            var hangye=data.list[i].fieldAs;  
             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):"暂无简介";
@@ -257,8 +252,8 @@ import {
                     loadDate_search(thePageNo);
                 }
             } else if (this.className === 'pageNext') {
-                thePageLength=$(".pageNext").attr("all_length");
-                if (thePageNo < thePageLength) {
+                thePageLength=$(".pageNext").attr("all_length");                
+                if (parseInt(thePageNo) <parseInt(thePageLength)) {
                     thePageNo = thePageLength;
                     loadDate_search(thePageNo);
                 }
@@ -271,17 +266,19 @@ import {
                     loadDate_search(thePageNo);
                 }
             }
-        }else{
+        }else{           	
             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;
+            } else if (this.className === 'pageNext') {           	
+                thePageLength=$(".pageNext").attr("all_length");                
+                if (parseInt(thePageNo) <parseInt(thePageLength)) {                	             	
+                    thePageNo = thePageLength;                   
                     loadDate(thePageNo);
+                }else{
+                	
                 }
             } else {
                 var nextPageNo = $(this).children()[0].text;
@@ -297,6 +294,9 @@ import {
     //右侧内容的分页功能,点击一次发送一个ajax的请求,只请求6组数据
     function loadDate(pageNo) {
         var left_val=$(".place_city .thon").attr("value");
+      	 if(left_val=='null'){
+       		left_val=''
+      	 };
         $.ajax({
             method: "get",
             dataType: "json",

+ 1 - 7
src/js/public.js

@@ -151,12 +151,6 @@ $(function(){
 		    _MEIQIA('entId', 77931);		   		   
 			_MEIQIA('withoutBtn');
 
-	//忘记密码事件
-	//首先设定确认按钮为不能点击,并且颜色为灰色
-	//$('.forget_sub').attr('disabled', true);
-	//$('.forget_sub').css({background: '#CCCCCC',border: 'none'});
-	//$('.new_password_sub').attr('disabled', true);
-	//$('.new_password_sub').css({background: '#CCCCCC',border: 'none'});
 	//企业和个人的选择,图形改变
 	$('#forget_checks').attr('checked',true);
 	$('#forget_checks').click(function(){
@@ -368,7 +362,7 @@ $(function(){
 			url: globalConfig.context + "/open/getMCode",
 			data: {
 				"mobile": ophoto,
-				"sign": true,
+				"sign": false,
 				"type": types,
 				"verificationCode": phott
 			},

+ 9 - 7
src/js/technologyTrading/achievement.js

@@ -39,18 +39,20 @@ $(function(){
             },
             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.technicalPictureUrl!==null?thisdata.technicalPictureUrl:"/img/timg.gif";
+                        let thisdata = data.data.list[i]; 
+                        if(thisdata.technicalPictureUrl==null){
+	                    	thisdata.technicalPictureUrl=''
+	                    };
+                        var imgUrl=thisdata.technicalPictureUrl!=''?globalConfig.avatarHost + '/upload' +thisdata.technicalPictureUrl:globalConfig.avatarHost+ "/upload/default/zhuanliimg_null.png";              
                         var star='';
                         for(var n=0;n<thisdata.maturity;n++){
                             star+='<li></li>';
                         }
                         theArr.push([
                             '<li val="'+thisdata.id+'" typ="'+thisdata.ownerType+'">',		//图片地址
-                            '<img src="' + globalConfig.avatarHost + '/upload' + imgUrl + '"/>',
+                            '<img src="'+ imgUrl + '"/>',
                             '<div class="list_text">',
                             '<p>行业<span>' + (thisdata.fieldA?getIndustryCategory(thisdata.fieldA, thisdata.fieldB):"未知行业") + '</span></p>',
                             '<p>名称<span title=' + thisdata.name + '>' + (thisdata.name?thisdata.name:"未知名称") + '</span></p>',
@@ -319,9 +321,9 @@ function loadDate(pageNo) {
 		$('.achievement_header ul li').eq(0).find('p').text(text_ind);
 	})
      //点击搜索下面的字段快捷搜索
-    $('.head_right ol li').click(function () {        	
-        //theKeyword = $(this).text();
-        theFieldA=$(this).attr("val");
+    $('.head_right ol li').click(function () {        	        
+        theKeyword=$(this).text();
+        console.log(theFieldA)
         $('#technologyModeList li').eq(0).addClass('active').siblings().removeClass('active');
         $('#transferModeList li').eq(0).addClass('active').siblings().removeClass('active');
         $('.text_replace').show();

+ 1 - 2
src/js/technologyTrading/demand.js

@@ -352,8 +352,7 @@ $(function(){
 	})
 	 //点击搜索下面的字段快捷搜索
     $('.head_right ol li').click(function () {    	
-        //theKeyword = $(this).text();
-		theFieldA=$(this).attr("val");
+        theKeyword = $(this).text();		
         $('#technologyModeList li').eq(0).addClass('active').siblings().removeClass('active');
         $('#transferModeList li').eq(0).addClass('active').siblings().removeClass('active');       
         $('.text_replace').show();

+ 3 - 0
src/js/thinkTank/policyList.js

@@ -37,6 +37,9 @@ $(function(){
 	                	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([                                       	                   

+ 1 - 3
template/thinkTank/policyList.html

@@ -77,9 +77,7 @@
 	            	<li>></li> 
 	                <li><a href="#">智库咨询</a></li>
 	                <li>></li>               
-	                <li><a href="#">智政</a></li>
-	                <li>></li>
-	                <li class="that"><a href="#" >智政资讯 </a></li>
+	                <li class="that"><a href="#">智政</a></li>	               	                
 	            </ul>
 	            <div class="portal-content">
 					<div class="search-criteria row">