liting2017 6 years ago
parent
commit
0a386bb806

BIN
img/initPic/policyInit.jpg


+ 1 - 1
src/css/indexNew.css

@@ -207,7 +207,7 @@ text-align: center;background:#2F83CE;margin-top: 15px;position: relative;paddin
 .policy_p_cont>p{color:#7f7f7f;font-size:14px;margin-top:5px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
 
 
-#indexGroom{width:1200px;padding-bottom: 110px;margin:0 auto;position: relative;}
+#indexGroom{width:1200px;padding-bottom: 110px;margin:0 auto;position: relative;padding-top: 100px;}
 .indexGroom_table{width:270px;height:35px;margin:15px auto;}
 .indexGroom_table>div{width:120px;height:35px;border-radius:15px;color:#1F1F1F;font-size:18px;text-align: center;line-height:35px;
 display: inline-block;border:1px solid #DEDEDE;cursor: pointer;}

+ 12 - 8
src/css/newMenu/public.css

@@ -146,17 +146,17 @@ header .colorRed{
 
 #Lo_user,
 #Lo_pass {
-	width: 210px;
-	height: 24px;
-	line-height: 24px;
+	width: 214px;
+	height: 37px;
+	line-height: 40px;
 	border: none;
 	border-left: 1px solid #CCCCCC;
 	padding-left: 12px;
 	left: 40px;
-	top: 8px;
 	font-size: 16px;
 	position: absolute;
-	color: #cdcdcd;
+	color: #333333;
+	
 }
 
 .login_uesr .log_del {
@@ -320,12 +320,12 @@ header .colorRed{
 	margin-left: 5px;
 }
 
-.phone>label {
+.phone>label,.user>label {
 	font-weight: normal;
 	font-size: 18px;
 }
 
-.phone input {
+.phone input,.user input {
 	width: 250px;
 	font-size: 16px;
 	border: 1px solid #E5E5E5;
@@ -803,7 +803,11 @@ header .colorRed{
 	background: #ffc443;
 	display: inline-block;
 }
-
+input:-webkit-autofill {
+    background-color: #ffffff!important;
+    background-image: none!important;
+    color: #000;
+}
 .pub_fix ul li:hover a img {
 	background: #fc9501
 }

+ 4 - 3
src/css/public.css

@@ -672,6 +672,7 @@ header .nav_right .head_login {
 .login_check,
 .login_submit {
 	width: 260px!important;
+	margin-top: 20px;
 }
 
 .login_right h5 {
@@ -706,9 +707,9 @@ header .nav_right .head_login {
 
 #Lo_user,
 #Lo_pass {
-	width: 210px;
-	height: 24px;
-	line-height: 24px;
+	width: 214px;
+	height: 37px;
+	line-height: 40px;
 	border: none;
 	border-left: 1px solid #CCCCCC;
 	padding-left: 12px;

+ 9 - 1
src/css/thinkTank.css

@@ -156,5 +156,13 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
 #selectInt li:nth-child(3){border: none;}       
 #selectInt li:nth-child(2) label{color:#616161;font-size:14px;font-weight:normal;line-height:30px;}          
 #selectInt li:nth-child(3) label{color:#616161;font-size:14px;font-weight:normal;line-height:30px;}   
-    
+.detail_interest_sub li .noImg  {
+    width: 270px;height: 280px;
+    background: url(../../img/initPic/policyInit.jpg) no-repeat;
+    background-size:100% 100%; 
+}  
+.detail_interest_sub li .noImg img{
+    width: 100%;
+    height: 100%;
+}
 

+ 88 - 0
src/js/dataDic.js

@@ -0,0 +1,88 @@
+module.exports={
+     //行业
+     industry:[
+        {
+            value: "1",
+            key: "采掘"
+        },
+        {
+            value: "2",
+            key: "化工"
+        },
+        {
+            value: "3",
+            key: "钢铁"
+        }, {
+            value: "4",
+            key: "建筑材料"
+        },
+        {
+            value: "5",
+            key: "建筑装饰"
+        },
+         {
+            value: "6",
+            key: "电气设备"
+        },{
+            value: "7",
+            key: "机械设备"
+        },
+         {
+            value: "8",
+            key: "国防军工"
+        },{
+            value: "9",
+            key: "汽车"
+        },
+         {
+            value: "10",
+            key: "家用电器"
+        },{
+            value: "11",
+            key: "纺织服装"
+        },
+        {
+            value: "12",
+            key: "轻工制造"
+        }, {
+            value: "13",
+            key: "商业贸易"
+        },
+        {
+            value: "14",
+            key: "农林牧渔"
+        },
+        {
+            value: "15",
+            key: "食品饮料"
+        }, {
+            value: "16",
+            key: "休闲服务"
+        },
+        {
+            value: "17",
+            key: "医药生物"
+        },
+         {
+            value: "18",
+            key: "公用事业"
+        },{
+            value: "19",
+            key: "交通运输"
+        },
+         {
+            value: "20",
+            key: "房地产"
+        },{
+            value: "21",
+            key: "电子"
+        },
+         {
+            value: "22",
+            key: "计算机"
+        },{
+            value: "23",
+            key: "传媒"
+        }
+    ],  
+}

+ 7 - 4
src/js/newMenu/achievementList.js

@@ -168,8 +168,8 @@ $(function () {
             },
             success: function (data) {
                 var theArrs = [];
-                if(data.data&&data.data.error){
-                    msg(data.data.error[0])
+                if(data&&data.error.length){
+                    msg(data.error[0].message)
                 };
                 let times = new Date().getTime();
                 if (data.data && data.data.list.length) {
@@ -180,11 +180,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/achievementDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img" style="display:${thisdata.firstPicture||thisdata.firstPicture!=null?'block':'none'}">
+                                <div class="img" style="display:${thisdata.firstPicture&&thisdata.firstPicture!=null?'block':'none'}">
                                     <img src="${globalConfig.avatarHost + '/upload'+thisdata.firstPicture}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img achievemrntImg" style="display:${thisdata.firstPicture||thisdata.firstPicture!=null?'none':'block'}">
+                                <div class="img achievemrntImg" style="display:${thisdata.firstPicture&&thisdata.firstPicture!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">
@@ -348,6 +348,9 @@ $(function () {
    /* 提示 */
     //提示框渐隐函数    
     function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
         $('.smg').addClass('active');
         var lit = $('#msg').val(txt);
         setTimeout(function () {

+ 7 - 4
src/js/newMenu/demandList.js

@@ -168,8 +168,8 @@ $(function () {
             },
             success: function (data) {
                 var theArrs = [];
-                if(data.data&&data.data.error){
-                    msg(data.data.error[0])
+                if(data&&data.error.length){
+                    msg(data.error[0].message)
                 };
                 
                 let times = new Date().getTime();
@@ -181,11 +181,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/technologyTrading/demandDetail?id=${thisdata.id}&type=${thisdata.dataCategory}">
-                                <div class="img" style="display:${thisdata.firstPic||thisdata.firstPic!=null?'block':'none'}">
+                                <div class="img" style="display:${thisdata.firstPic&&thisdata.firstPic!=null?'block':'none'}">
                                     <img src="${globalConfig.avatarHost + '/upload'+thisdata.firstPic}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img noImg" style="display:${thisdata.firstPic||thisdata.firstPic!=null?'none':'block'}">
+                                <div class="img noImg" style="display:${thisdata.firstPic&&thisdata.firstPic!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">
@@ -350,6 +350,9 @@ $(function () {
     /* 提示 */
     //提示框渐隐函数    
     function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
         $('.smg').addClass('active');
         var lit = $('#msg').val(txt);
         setTimeout(function () {

+ 3 - 0
src/js/newMenu/serviceDetails.js

@@ -61,6 +61,9 @@ $(function () {
     }
     //提示框渐隐函数    
 	function msg() {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
         $('.smg').addClass('active')
         var lit = $('#msg').val();
         setTimeout(function () {

+ 7 - 4
src/js/newMenu/serviceList.js

@@ -133,8 +133,8 @@ $(function () {
             },
             success: function (data) {
                 var theArrs = [];
-                if(data.data&&data.data.error){
-                    msg(data.data.error[0])
+                if(data&&data.error.length){
+                    msg(data.error[0].message)
                 };
                 let times = new Date().getTime();
                 if (data.data && data.data.list.length) {
@@ -145,11 +145,11 @@ $(function () {
                         theArrs.push(`
                         <li>
                             <a href="${globalConfig.context}/portal/service/serviceDetail?id=${thisdata.id?thisdata.id:''}">
-                                <div class="img" style="display:${thisdata.maxImgUrl||thisdata.maxImgUrl!=null?'block':'none'}">
+                                <div class="img" style="display:${thisdata.maxImgUrl&&thisdata.maxImgUrl!=null?'block':'none'}">
                                     <img src="${globalConfig.avatarHost + '/upload'+thisdata.maxImgUrl}" alt="">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
-                                <div class="img serviceImg" style="display:${thisdata.maxImgUrl||thisdata.maxImgUrl!=null?'none':'block'}">
+                                <div class="img serviceImg" style="display:${thisdata.maxImgUrl&&thisdata.maxImgUrl!=null?'none':'block'}">
                                     <span style="display:${news>7?'none':'block'}"></span>
                                 </div>
                                 <div class="txtIntroduce">
@@ -320,6 +320,9 @@ $(function () {
      /* 提示 */
     //提示框渐隐函数    
     function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
         $('.smg').addClass('active');
         var lit = $('#msg').val(txt);
         setTimeout(function () {

+ 47 - 77
src/js/public.js

@@ -30,30 +30,6 @@ $(function(){
 	//登陆页面
 	var hht=$(window).height();	
 	$('.login').height(hht);
-	$('#Lo_user').focus(function(){		
-		$(this).css({color:'#333333'})						
-	})
-	$('#Lo_pass').focus(function(){			
-			$(this).val('').css({color:'#333333'});					
-	});	
-	$('#checks').attr('checked',true)
-	$('#checks').click(function(){			
-		var Cheack=$(this).prop('checked')		
-		if(Cheack){
-			$('#checks').attr('checked',true)
-			$(this).parent().removeClass("lab_checkno").addClass("lab_check");
-			$('#checkst').prop('checked',false);
-			$('#checkst').parent().removeClass("lab_check").addClass("lab_checkno");
-		}
-	})
-	$('#checkst').click(function(){			
-		var Cheack_no=$(this).prop('checked')			
-		if(Cheack_no){			
-			$(this).parent().removeClass("lab_checkno").addClass("lab_check");
-			$('#checks').prop('checked',false);
-			$('#checks').parent().removeClass("lab_check").addClass("lab_checkno");
-		}
-	})
 	//点击x
 	$('.log_del').click(function(){		
 		$('#Lo_user').val('');
@@ -76,7 +52,8 @@ $(function(){
 		var Spass=$('#Lo_pass').val();	
 		var check_experts=$('#checks').prop('checked');		
 		var experts=check_experts?0:1;		
-		if(Suser==''||Spass==''){			
+		if(Suser==''||Spass==''){	
+			msg('请填写用户名/密码.');
 			return false;
 		}else{			
 			$.ajax({
@@ -90,8 +67,7 @@ $(function(){
               },
               success: function (rest) {				
 					if (rest.error && rest.error.length) {					
-						 $('#msg').val(rest.error[0].message);
-		                 msg();	
+		                 msg(rest.error[0].message);	
 					} else {						
 						var  data = rest.data;
                         if (data && data.requestURI) {
@@ -113,9 +89,12 @@ $(function(){
 		}			
 	})
 	//提示框渐隐函数    
-	function msg() {
-        $('.smg').addClass('active')
-        var lit = $('#msg').val();
+	function msg(mess) {
+		if($('.smg').hasClass('active')){
+			return ;
+		}
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(mess);
         setTimeout(function () {
             $('.smg').removeClass('active')
             $('#msg').val('');
@@ -135,27 +114,7 @@ $(function(){
 		        s.parentNode.insertBefore(j, s);
 		    })(window, document, 'script', '_MEIQIA');
 		    _MEIQIA('entId', 77931);		   		   
-			_MEIQIA('withoutBtn');
-
-	//企业和个人的选择,图形改变
-	$('#forget_checks').attr('checked',true);
-	$('#forget_checks').click(function(){
-		var Cheack=$(this).prop('checked');
-		if(Cheack){
-			$('#checks').attr('checked',true);
-			$(this).parent().removeClass("lab_checkno").addClass("lab_check");
-			$('#forget_checkst').prop('checked',false);
-			$('#forget_checkst').parent().removeClass("lab_check").addClass("lab_checkno");
-		}
-	});
-	$('#forget_checkst').click(function(){
-		var Cheack_no=$(this).prop('checked');
-		if(Cheack_no){
-			$(this).parent().removeClass("lab_checkno").addClass("lab_check");
-			$('#forget_checks').prop('checked',false);
-			$('#forget_checks').parent().removeClass("lab_check").addClass("lab_checkno");
-		}
-	});
+			_MEIQIA('withoutBtn');	
 	//点击登录界面的忘记密码 ,将会弹出忘记密码界面
 	$('.login_check a').click(function(e){
 		e.preventDefault();
@@ -187,38 +146,49 @@ $(function(){
 	//点击忘记密码里面的确认,则发送一个请求,并跳转到重置密码界面
 	$('#forget_form').submit(function(e){
 		e.preventDefault();
+		var use_forget = $('#forget_user').val();
 		var phone_forget=$("#forget_phone").val();
-		var yanzheng_forget=$("#forget_yanzheng").val();
 		var phone_n_forget=$("#photo_n").val();
-		var types = $('#forget_checks').prop("checked") ? '0' : '1';//团体/个人
-		if(phone_forget==''||yanzheng_forget==''||phone_n_forget==''){
-			return false;
-		}else {
-			$.ajax({
-				type: "POST",
-				dataType: "json",
-				url: globalConfig.context + "/open/checkMCode",
-				data: {
-					//"mobile": phone_forget,
-					"mobileCode": phone_n_forget
-				},
-				success: function (rest) {
-					if (rest.error && rest.error.length) {
-						$('#msg').val(rest.error[0].message);
-						msg();
-					} else {
-						$('#forget').fadeOut(800);
-						$('#form_register').fadeOut(800);
-						$("#new_password").fadeIn(800);
-						$(".password_top>h4").attr("val",rest.data);
-					}
+		if(!(use_forget).trim()){
+			msg('亲,请填写用户名')
+			return;
+		};
+		if(!(phone_forget).trim()){
+			msg('亲,请填写正确的手机号码')
+			return;
+		};
+		if(!(phone_n_forget).trim()){
+			msg('亲,请填写手机验证码')
+			return;
+		};
+		// $('#forget').fadeOut(800);
+		// $('#form_register').fadeOut(800);
+		// $("#new_password").fadeIn(800);
+		// $(".password_top>h4").attr("val",rest.data);
+		$.ajax({
+			type: "POST",
+			dataType: "json",
+			url: globalConfig.context + "/open/checkMCode",
+			data: {
+				user: use_forget,
+				photo:phone_forget,
+				"mobileCode": phone_n_forget
+			},
+			success: function (rest) {
+				if (rest.error && rest.error.length) {
+					msg(rest.error[0].message);
+				} else {
+					$('#forget').fadeOut(800);
+					$('#form_register').fadeOut(800);
+					$("#new_password").fadeIn(800);
+					$(".password_top>h4").attr("val",rest.data);
 				}
-			})
-		}
+			}
+		})
 	});
 	function pass_new(){
 		$('#new_pass').blur(function () {
-			var pass_pattern=/^\w{6,12}$/;
+			var pass_pattern=/^[a-zA-Z\d_]{6,12}$/;
 			var new_pass=$("#new_pass").val();
 			var new_pass_again=$("#new_pass_again").val();
 			if (new_pass==''||!pass_pattern.test(new_pass)) {

+ 13 - 15
src/js/register.js

@@ -1,6 +1,7 @@
 import '../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
-import '../css/public.css';
+import 'css/newMenu/public.css';
+import 'css/newMenu/header.css'
 import '../css/register.css';
 import './public.js';
 import { DH_NOT_SUITABLE_GENERATOR } from 'constants';
@@ -163,8 +164,7 @@ $(function () {
             mobileCode = $('#photo_num').val(); //手机验证码
         e.preventDefault();
         if(user.indexOf('用户名')>-1||customerName.indexOf('客户')>-1||password1.indexOf('密码')>-1||password2.indexOf('密码')>-1||usePhoto.indexOf('手机')>-1||mobileCode.indexOf('验证码')>-1){
-            $('#msg').val('请填写必填项');
-            msg();
+            msg('请填写必填项');
             return;
         } else {
             $.ajax({
@@ -180,13 +180,11 @@ $(function () {
                 },
                 success: function (rest) {
                     if (rest.error && rest.error.length) {
-                        $('#msg').val(rest.error[0].message);
-                        msg();
+                        msg(rest.error[0].message);
                     } else {
                         var data = rest.data;
                         console.log(data)
-                        $('#msg').val("注册成功!");
-                        msg();
+                        msg("注册成功!");
                         setTimeout(()=>{
                             window.location.href = globalConfig.context + "/user/signIn.html";
                         },2000)
@@ -208,10 +206,8 @@ $(function () {
                 },
                 success: function (data) {
                     if (data.error && data.error.length) {
-                        $('#msg').val(data.error[0].message);
-                        msg();
+                        msg(data.error[0].message);
                     } else {
-                        $('#msg').val('发送成功');
                         //验证码倒计时
                         $('#photo').attr('disabled', true);
                         var timer = setInterval(function () {
@@ -230,20 +226,22 @@ $(function () {
                                 $('#photo').val('重新发送');
                             }
                         }.bind(this), 1000);
-                        msg();
+                        msg('发送成功');
                     }
                     return true;
                 }
             });
         } else {
-            $('#msg').val('请填写手机号码!');
-            msg();
+            msg('请填写手机号码!');
         }
     });
     //提示框渐隐函数
-    function msg() {
+    function msg(mess) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
         $('.smg').addClass('active')
-        var lit = $('#msg').val();
+        $('#msg').val(mess);
         setTimeout(function () {
             $('.smg').removeClass('active')
             $('#msg').val('');

+ 12 - 11
src/js/technologyTrading/achievementOrder.js

@@ -19,8 +19,7 @@ import '../../css/technologyTrading/achievementOrder.css';
                 },
                 success: function (data) {
                     if (data.error && data.error.length) {
-                        $('#msg').val(data.error[0].message);
-                        msg();
+                        msg(data.error[0].message);
                     }else if(data.error==""){
                          window.open(globalConfig.context+ '/user/account/index.html#techList');
                     }else{
@@ -30,15 +29,17 @@ import '../../css/technologyTrading/achievementOrder.css';
          });
         })
     //��ʾ��������
-    function msg(){
-        var lit=$('#msg').val();
-        if(lit!==''){
-            $('.smg').fadeIn(500)
-        }
-        setTimeout(function(){
-            $('.smg').fadeOut(500)
-            $('#msg').val('')
-        },2000)
+    //提示框渐隐函数    
+    function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active')
+            $('#msg').val('');
+        }, 2000)
     }
     $(".main_introduce ul").on("click","li",function(){
         var theId = $(this).children("div").children("p.likeId").html();

+ 12 - 12
src/js/technologyTrading/demandOrder.js

@@ -19,8 +19,7 @@ import '../../css/technologyTrading/demandOrder.css';
             },
             success: function (data) {
                 if (data.error && data.error.length) {
-                    $('#msg').val(data.error[0].message);
-                    msg();
+                    msg(data.error[0].message);
                 }else if(data.error==""){
                     window.open(globalConfig.context+ '/user/account/index.html#techList');
                 }else{
@@ -29,17 +28,18 @@ import '../../css/technologyTrading/demandOrder.css';
             }
         });
     })
-    //��ʾ��������
-    function msg(){
-        var lit=$('#msg').val();
-        if(lit!==''){
-            $('.smg').fadeIn(500)
-        }
-        setTimeout(function(){
-            $('.smg').fadeOut(500)
-            $('#msg').val('')
-        },2000)
+   //提示框渐隐函数    
+   function msg(txt) {
+    if($('.smg').hasClass('active')){
+        return ;
     }
+    $('.smg').addClass('active');
+    var lit = $('#msg').val(txt);
+    setTimeout(function () {
+        $('.smg').removeClass('active')
+        $('#msg').val('');
+    }, 2000)
+}
     $(".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();

+ 75 - 277
src/js/thinkTank.js

@@ -10,12 +10,15 @@ import {
 	provinceList
 } from './NewDicProvinceList';
 import {
-	techFieldList,
-	getTechField
-} from './DicTechFieldList';
+	industry
+} from './dataDic';
 
 $(function() {
 	//初始智者智政切换描点
+	var theKeyword, province, dataObj={};
+	var thePageNo = 1,
+		thePageLength = 1,
+		pageSize = 12;
 	let hash=window.location.hash
 	if(hash=="#zizone"){
 		$('.zone_right').addClass('actives').siblings().removeClass('actives')
@@ -39,7 +42,10 @@ $(function() {
 		$('.searchs').show();
 		$(".sanjiao").animate({ left: "895px" });
 	})
-	//地方政策城市切换
+	//刷新判断搜索框是否存在
+	if($('.zone_right').hasClass('actives')){
+		$('.searchs').show();
+	}
 	//初始北京第一页新闻
 	$('.place_city ul li').eq(0).addClass('thon').siblings().removeClass('thon');
 	var thePageNos = 1;
@@ -163,51 +169,8 @@ $(function() {
 		var theId = $(this).attr('value');
 		window.open(globalConfig.context + '/portal/news/newsDetail.html?id=' + theId);
 	})
-	//地方政策跳转    
+	
     //中央政策点击刷新
-    //初始化内容
-    function mids(provinces,pageNos){
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            url: globalConfig.context + "/portal/news/list",
-            data: {
-                provinceId:null,
-                hot: 1,
-                pageNo:pageNos||1,
-                type:4,
-                pageSize:pageSizes
-            },
-            success: function (result) {
-                thePageLengths = result.data.totalCount ? Math.ceil(result.data.totalCount / pageSizes) : 1;
-                var policy_img ='';
-                var totle=Math.ceil(result.data.totalCount/4);    
-                for(var i=0;i<result.data.list.length;i++){
-                    var id=result.data.list[i].id;
-                    var title = result.data.list[i].title; //标题
-                    var titleImg = result.data.list[i].titleImg; //图片
-                    if(titleImg==null){
-                    	titleImg=''
-                    }
-                    var summary = result.data.list[i].summary;//简介
-                    if(summary==null){
-                    	summary=''
-                    };
-                    var  imgUrls=titleImg!=''?globalConfig.avatarHost + '/upload' +titleImg:globalConfig.avatarHost+ '/upload/default/news.jpg';                  
-                    policy_img+=
-                    "<li value='"+id+"'>"
-                    +"<img src='"+imgUrls+"' alt=''/>"
-                    +"<div class='zizone_text'><h4><a href='#'>"
-                    +title+"</a></h3><p>"
-                    +summary+"</p><a href='#'>MORE+</a>"
-                    +"<input type='hidden' value='"+totle+"'/></div></li>"
-                }
-                $('.main_zizone ul').html(policy_img)
-            }.bind(this)
-        })
-    }
-    mids(1,1)
-    //点击时left
     var t=1; 
     $('.zizone_left').click(function(){    	  		
         t--;
@@ -217,41 +180,27 @@ $(function() {
         pageNos=t;
         mids(1,pageNos);
     })   
-    //点击时right  
-    $('.zizone_right').click(function(){
-    	var tot=$('.main_zizone ul').find('input').val()
-        t++; 
-        if(t>tot){
-        	t=tot
-        }
-        pageNos=t;
-        mids(1,pageNos);
-    })
     //智者数据交互
-    var theKeyword, theFieldA, theFieldB, theFieldC,province,international;
-    var thePageNo = 1,
-        thePageLength = 1,
-        pageSize = 12,
-        theType = 0;
     function loadDate(pageNo) {
-        theFieldA = theFieldA != 999 ? theFieldA : undefined;
-        theFieldB = theFieldB != 999 ? theFieldB : undefined;
-        theFieldC = theFieldC != 999 ? theFieldC : undefined;
+		$('.loading').show();
         $.ajax({
             method: "get",
             dataType: "json",
             url: globalConfig.context + "/portal/search/subscriberList",
             data: {
-            	province:province,
                 pageNo: pageNo || 1,
                 pageSize: pageSize,
-                type: theType,
-                name: theKeyword,
-                field: theFieldA ? ((theFieldA || '') + (theFieldB ? (',' + theFieldB) : '') + (theFieldC ? (',' + theFieldC) : '')) : undefined,
-            	international:international != 999 ? international : undefined
+                field: dataObj.theFieldA?dataObj.theFieldA:'',
+				international:dataObj.international,
+				name:dataObj.theKeyword,
+				province:dataObj.province
             },
             success: function (data) {
-                var theArr = [];
+				var theArr = [];
+				console.log(data)
+				if(data&&data.error.length){
+					msg(data.error[0].message)
+				}
                 if (data.data && data.data.list) {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
@@ -260,27 +209,27 @@ $(function() {
                         if(thisdata.username==null||thisdata.username==''){
                         	thisdata.username='佚名'
                         }
-                        var  imgUrl=thisdata.personPortraitUrl!=null?globalConfig.avatarHost + '/upload' +thisdata.personPortraitUrl:globalConfig.avatarHost+ '/upload/default/person.jpg';                       
-                        theArr.push([
-                            '<li value="'+thisdata.uid+'">',
-                            '<img src="'+ imgUrl+'"  />',
-                            '<div class="list_text">',
-                            '<p class="bulr">'+ thisdata.username + '</p>',
-                            '<p class="orange">' + (thisdata.position || '未知职位') + '</p>',
-                            '<p class="text_on">' + achievementNumText + '</p>',
-                            '</div>',
-                            '<div class="shadow_text">',
-                            '<p class="bulr">'+ thisdata.username + '</p>',
-                            '<p class="orange">' + (thisdata.position || '未知职位') + '</p>',
-                            '<p class="text_on">' + achievementNumText+ '</p>',
-                            '<img src="' + globalConfig.portalHost + '/img/search_txt.png "/>',
-                            '</div>',                                                     
-                            '</li>' ,
-                        ].join(''));
+						theArr.push(`
+							<li value="${thisdata.uid}">
+								<div class="noImg">
+									${thisdata.personPortraitUrl&&thisdata.personPortraitUrl!=null?'<img src="'+globalConfig.avatarHost+thisdata.personPortraitUrl+'"/>':''}
+								</div>
+								<div class="list_text">
+									<p class="bulr">${thisdata.username}</p>
+									<p class="orange">${thisdata.position?thisdata.position:'未知职位'}</p>
+									<p class="text_on">${achievementNumText}</p>
+								</div>
+								<div class="shadow_text">
+									<p class="bulr">${thisdata.username }</p>
+									<p class="orange">${thisdata.position?thisdata.position:'未知职位'}</p>
+									<p class="text_on">${achievementNumText}</p>
+									<span> <img src="${globalConfig.portalHost}/img/search_txt.png "/></span>
+								</div>                                                   
+                            </li>
+							`);
                     };
-                } else {
-                    return;
-                };
+                } 
+				$('.loading').hide();
                 $('#subscriberList').empty();
                 $('#subscriberList').append(theArr.join(''));
                 if(data.data.list.length===0){                    
@@ -347,8 +296,6 @@ $(function() {
 		provinces = p_val;
 		datt(provinces, 1);
 	});
-
-	//中央政策点击刷新
 	//初始化内容
 	function mids(provinces, pageNos) {
 		$.ajax({
@@ -393,14 +340,6 @@ $(function() {
 	mids(1, 1)
 	//点击时left
 	var t = 1;
-	$('.zizone_left').click(function() {
-		t--;
-		if(t <= 1) {
-			t = 1
-		}
-		pageNos = t;
-		mids(1, pageNos);
-	})
 	//点击时right  
 	$('.zizone_right').click(function() {
 		var tot = $('.main_zizone ul').find('input').val()
@@ -412,93 +351,7 @@ $(function() {
 		mids(1, pageNos);
 	})
 	//智者数据交互
-	var theKeyword, theFieldA, theFieldB, theFieldC, province, international;
-	var thePageNo = 1,
-		thePageLength = 1,
-		pageSize = 12,
-		theType = 0;
-
-	function loadDate(pageNo) {
-		theFieldA = theFieldA != 999 ? theFieldA : undefined;
-		theFieldB = theFieldB != 999 ? theFieldB : undefined;
-		theFieldC = theFieldC != 999 ? theFieldC : undefined;
-		$.ajax({
-			method: "get",
-			dataType: "json",
-			url: globalConfig.context + "/portal/search/subscriberList",
-			data: {
-				province: province,
-				pageNo: pageNo || 1,
-				pageSize: pageSize,
-				type: theType,
-				name: theKeyword,
-				field: theFieldA ? ((theFieldA || '') + (theFieldB ? (',' + theFieldB) : '') + (theFieldC ? (',' + theFieldC) : '')) : undefined,
-				international: international != 999 ? international : undefined
-			},
-			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];
-						let achievementNumText=(thisdata.achievementNum==null)?"":thisdata.achievementNum;
-						let engagedField = thisdata.engagedField ? thisdata.engagedField.split(',') : [];
-						if(thisdata.username == null || thisdata.username == '') {
-							thisdata.username = '佚名'
-						}
-						var imgUrl = thisdata.personPortraitUrl != null ? globalConfig.avatarHost + '/upload' + thisdata.personPortraitUrl : globalConfig.avatarHost + '/upload/default/person.jpg';
-						theArr.push([
-							'<li value="' + thisdata.uid + '">',
-							'<img src="' + imgUrl + '"  />',
-							'<div class="list_text">',
-							'<p class="bulr">' + thisdata.username + '</p>',
-							'<p class="orange">' + (thisdata.position || '未知职位') + '</p>',
-							'<p class="text_on">' + achievementNumText + '</p>',
-							'</div>',
-							'<div class="shadow_text">',
-							'<p class="bulr">' + thisdata.username + '</p>',
-							'<p class="orange">' + (thisdata.position || '未知职位') + '</p>',
-							'<p class="text_on">' + achievementNumText + '</p>',
-							'<img src="' + globalConfig.portalHost + '/img/search_txt.png "/>',
-							'</div>',
-							'</li>',
-						].join(''));
-					};
-				} else {
-					return;
-				};
-				$('#subscriberList').empty();
-				$('#subscriberList').append(theArr.join(''));
-				if(data.data.list.length === 0) {
-					$('#subscriberList').html('<div class="imgbg"></div>');
-				}
-				$('.totalCount').html("共" + data.data.totalCount + "条数据");
-				thePageLength = data.data.totalCount ? Math.ceil(data.data.totalCount / pageSize) : 1;
-				var pageArr = [],
-					firstNo = 1,
-					endNo = 5;
-				if(thePageNo > 3) {
-					firstNo = thePageNo - 2;
-					endNo = Math.min((Number(thePageNo) + 2), thePageLength);
-				} else {
-					endNo = Math.min(thePageLength, 5);
-				};
-				for(let i = firstNo; i <= endNo; i++) {
-					if(i == thePageNo) {
-						pageArr.push(
-							'<li class="pageNumber active"><a href="#" value=' + i + ' >' + i + '</a></li>'
-						);
-					} else {
-						pageArr.push(
-							'<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
-						);
-					}
-				};
-				$('.pageNumber').remove();
-				$('.pagePre').after(pageArr.join(''));
-			}
-		});
-	}
-
+	
 	if(window.location.search) {
 		let theUrl = window.location.search
 		theKeyword = theUrl.substring(1, theUrl.length);
@@ -506,19 +359,17 @@ $(function() {
 		$('#searchInput').val(theKeyword);
 	};
 	loadDate();
-	var industryListArr = [],
-		industrySecondList = [],
-		industryThirdList = [];
-	industryListArr.push(['<li value="999" class="active">',
+	var industryListArr = [];
+	industryListArr.push(['<li value="" class="active">',
 		'<span>',
 		'不限',
 		'</span>',
 		'</li>',
 	].join(''));
-	techFieldList.map(function(item) {
+	industry.map(function(item) {
 		industryListArr.push(['<li value="' + item.value + '">',
 			'<span>',
-			item.label,
+			item.key,
 			'</span>',
 			'</li>',
 		].join(''));
@@ -530,93 +381,22 @@ $(function() {
 		var theValue = this.value;
 		$(this).siblings("li").removeClass("active");
 		$(this).addClass("active");
-		industrySecondList = [];
-		industrySecondList.push(['<li value="999" class="active">',
-			'<span>',
-			'不限',
-			'</span>',
-			'</li>',
-		].join(''));
-		if(theValue !== 999) {
-			$('#industrySecondBox').css("display", "block");
-			techFieldList.map(function(item) {
-				if(item.value == theValue) {
-					item.children.map(function(child) {
-						industrySecondList.push(['<li value="' + child.value + '">',
-							'<span>',
-							child.label,
-							'</span>',
-							'</li>',
-						].join(''));
-					});
-				};
-			});
-		} else {
-			$('#industrySecondBox').css("display", "none");
-		};
-		if(industrySecondList && industrySecondList.length) {
-			$('#industrySecondList').empty();
-			$('#industrySecondList').append(industrySecondList.join(''));
-		};
-		$('#industryThirdBox').css("display", "none");
-		theFieldA = this.value;
-		theFieldB = 999;
-		theFieldC = 999;
-		loadDate();
-	});
-	$('#industrySecondList').on('click', 'li', function() {
-		var theValue = this.value;
-		$(this).siblings("li").removeClass("active");
-		$(this).addClass("active");
-		industryThirdList = [];
-		industryThirdList.push(['<li value="999" class="active">',
-			'<span>',
-			'不限',
-			'</span>',
-			'</li>',
-		].join(''));
-		if(theValue !== 999) {
-			$('#industryThirdBox').css("display", "block");
-			techFieldList.map(function(itemA) {
-				if(itemA.value == theFieldA) {
-					itemA.children.map(function(itemB) {
-						if(itemB.value == theValue) {
-							itemB.children.map(function(itemC) {
-								industryThirdList.push(['<li value="' + itemC.value + '">',
-									'<span>',
-									itemC.label,
-									'</span>',
-									'</li>',
-								].join(''));
-							})
-						}
-					});
-				};
-			});
-		} else {
-			$('#industryThirdBox').css("display", "none");
-		};
-		if(industryThirdList && industryThirdList.length) {
-			$('#industryThirdList').empty();
-			$('#industryThirdList').append(industryThirdList.join(''));
-		};
-		theFieldB = this.value;
-		theFieldC = 999;
-		loadDate();
-	});
-	$('#industryThirdList').on('click', 'li', function() {
-		$(this).siblings("li").removeClass("active");
-		$(this).addClass("active");
-		theFieldC = this.value;
+		dataObj.province ='';
+		dataObj.theKeyword='';
+		dataObj.theFieldA=theValue;
 		loadDate();
 	});
 	$('.searchs button').click(function(e) {
 		e.preventDefault();
 		theKeyword = $('#search_on input').val();
 		province = $('#selt option:checked').attr('value');
-		province = province
+		dataObj.theFieldA ='';
+		dataObj.province = province;
+		dataObj.theKeyword=theKeyword;
 		loadDate();
+		$('#industryList li').removeClass('active');
 	});
+
 	$('.pagination').on('click', 'li', function(e) {
 		e.preventDefault();
 		if(this.className === 'pagePre') {
@@ -651,7 +431,9 @@ $(function() {
 		$('#isInt').prop('checked', false);
 		$('#noInt').prop('checked', false);
 		$('#noInt,#isInt').parent().addClass('demand').removeClass('patent');
-		international = null;
+		dataObj.international = null;
+		dataObj.province = '';
+		dataObj.theKeyword='';
 		loadDate();
 	})
 	$('#isInt').click(function() {
@@ -660,7 +442,9 @@ $(function() {
 		$(this).parent().addClass('patent').removeClass('demand');
 		$('#noInt').attr('checked', false);
 		$('#noInt').parent().addClass('demand').removeClass('patent');
-		international = 1;
+		dataObj.international = 1;
+		dataObj.province = '';
+		dataObj.theKeyword='';
 		loadDate();
 	})
 	$('#noInt').click(function() {
@@ -669,7 +453,21 @@ $(function() {
 		$(this).parent().addClass('patent').removeClass('demand');
 		$('#isInt').attr('checked', false);
 		$('#isInt').parent().addClass('demand').removeClass('patent');
-		international = 0;
+		dataObj.international = 0;
+		dataObj.province = '';
+		dataObj.theKeyword='';
 		loadDate();
 	})
+	 //提示框渐隐函数    
+	 function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active');
+            $('#msg').val('');
+        }, 2000)
+    }
 })

+ 13 - 2
src/js/thinkTank/thinkerDetail.js

@@ -75,8 +75,7 @@ $(function () {
                 },
                 success: function (data) {
                     if (data.error && data.error.length) {
-                        $('#msg').val(data.error[0].message);
-                        msg();
+                        msg(data.error[0].message);
                     }else if(data.error==""){
                         window.open(globalConfig.context+ '/user/account/index.html#consultList');
                     }else{
@@ -147,4 +146,16 @@ $(function () {
 //          });
 //  	}    	   	
 //  })
+     //提示框渐隐函数    
+     function msg(txt) {
+        if($('.smg').hasClass('active')){
+			return ;
+		}
+        $('.smg').addClass('active');
+        var lit = $('#msg').val(txt);
+        setTimeout(function () {
+            $('.smg').removeClass('active')
+            $('#msg').val('');
+        }, 2000)
+    }
 })

+ 9 - 3
template/index.html

@@ -918,19 +918,25 @@
 					</div>
 				</div>
 				<div class="forget_center">
+					<div class="user">
+						<label for="forget_user">
+							用户名:<input type="text" name="type" id="forget_user" placeholder="请输入您的用户名"/>
+						</label>
+					</div>
 					<div class="phone">
 						<label for="forget_phone">
-							手机号码:<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..."/>
+							手机号码:<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码"/>
 						</label>
 					</div>
-					<div  class="yanzheng">
+					
+					<!-- <div  class="yanzheng">
 						<label for="forget_yanzheng">
 							图形验证码:<input type="text" name="type" id="forget_yanzheng" />
 						</label>
 						<div class="yanzhengma_cont_">
 							<img th:src="${basePath+'/open/getVCode'}"/>
 						</div>
-					</div>
+					</div> -->
 					<div class="cellcode_">
 						<div>
 							验证码:<input type="text" name="cellCode" placeholder="手机验证码" id="photo_n"/>

+ 5 - 9
template/indexNew.html

@@ -1036,21 +1036,17 @@
 					</div>
 				</div>
 				<div class="forget_center">
+					<div class="user">
+						<label for="forget_user">
+							用户名:<input type="text" name="type" id="forget_user" placeholder="请输入您的用户名"/>
+						</label>
+					</div>
 					<div class="phone">
 						<label for="forget_phone">
 							手机号码:
 							<input type="text" name="type" id="forget_phone" placeholder="请输入您的手机号码..." />
 						</label>
 					</div>
-					<div class="yanzheng">
-						<label for="forget_yanzheng">
-							图形验证码:
-							<input type="text" name="type" id="forget_yanzheng" />
-						</label>
-						<div class="yanzhengma_cont_">
-							<img th:src="${basePath+'/open/getVCode'}" />
-						</div>
-					</div>
 					<div class="cellcode_">
 						<div>
 							验证码: