liting2017 6 years ago
parent
commit
a46f072d51

BIN
img/initPic/achievementInit.jpg


BIN
img/initPic/achievementInit.png


BIN
img/initPic/demandInit.jpg


BIN
img/initPic/policyInit.jpg


BIN
img/initPic/serviceInit.jpg


BIN
img/initPic/serviceInit.png


+ 10 - 4
src/css/indexNew.css

@@ -75,11 +75,16 @@ line-height: 20px;transition: all .2s ease-in-out;background: #fff}
 .indexServe_title>p{font-size:18px;color:#7A7878;text-align: center;}
 .indexServe_cont{width:1200px;margin-top: 40px;position:relative;}
 .indexServe_cont>div{width:390px;margin-right:10px;float: left;
-background:#FBFBFB url(../../img/indexNew7.png) no-repeat;padding:45px 0 0 15px;text-align: center;}
+background:#FBFBFB url(../../img/indexNew7.png) no-repeat;padding:45px 15px 0 15px;text-align: center;}
 .indexServe_cont>div:nth-child(3){margin-right: 0;}
+.indexServe_cont>div h2{
+    text-align: center;
+    font-size: 16px;
+    font-weight: normal
+}
 .indexServe_bots .wrapper{
     float: left;
-    width: 230px;
+    width: 220px;
     height: 180px;
     
 }
@@ -91,11 +96,12 @@ background:#FBFBFB url(../../img/indexNew7.png) no-repeat;padding:45px 0 0 15px;
     margin: 10px 0;
 }
 .indexServe_bots .wrapper p{
+    padding: 0 15px;
     overflow: hidden;
     display: -webkit-box;              
     text-overflow: ellipsis;            
     -webkit-box-orient: vertical;       
-    -webkit-line-clamp:7;
+    -webkit-line-clamp:5;
 }
 .indexServe_bots>img{
     float: left;
@@ -166,7 +172,7 @@ text-align: justify;text-overflow: ellipsis;overflow: hidden;display: -webkit-bo
 }
 .indexServe_cont>div.indexServe_long{width:795px;height:188px;margin-right:0px;display: inline-block;margin-top: 25px;
 background:#FBFBFB;padding: 0 0 0 215px;text-align: left;position:relative;}
-.indexServe_long>img{display: inline-block;position: absolute;top:0;left:0;width: 200px;height: 190px;}
+.indexServe_long>img{display: inline-block;position: absolute;top:5px;left:5px;width: 190px;height: 180px;}
 .indexServe_long>div.indexServe_bots{display: inline-block;width:235px;height:188px;padding-top: 10px;}
 .indexServe_long>div.indexServe_bot{width:340px;height:140px;position: absolute;top:22px;right:10px;border-left:1px dashed #DEDEDE;padding-left:10px;}
 .indexServe_long>div.indexServe_bots>p{width:220px;height:120px;display: inline-block;text-align: left;letter-spacing: 1px;

+ 1 - 1
src/css/newMenu/achievementList.css

@@ -398,6 +398,6 @@
     background-size:100% 100%; 
 }
 .achievemrntImg {
-    background: url(../../../img/initPic/achievementInit.png) no-repeat;
+    background: url(../../../img/initPic/achievementInit.jpg) no-repeat;
     background-size:100% 100%; 
 }

+ 1 - 1
src/css/newMenu/header.css

@@ -38,7 +38,7 @@
     width: 1200px;
     left: 50%;
     margin-left: -600px;
-    z-index: 99999;
+    z-index: 999;
 }
 .navHeader .nav ul li img {
 	width: 30px;

+ 2 - 2
src/css/newMenu/public.css

@@ -552,7 +552,7 @@ header .colorRed{
 	text-align: center;
 	width: 100%;
 	display: none;
-	z-index: 9999
+	z-index: 99999999
 }
 
 .message span {
@@ -860,7 +860,7 @@ input:-webkit-autofill {
 	transition: all 1s ease-in-out;
 }
 .loading p span.active{
-	margin-left: -4px;
+	margin-left: -10px;
 	transition: all 1s ease-in;
 }
 /* banner */

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

@@ -372,7 +372,7 @@
 /* 默认图片 */
 
 .serviceImg{
-    background: url(../../../img/initPic/serviceInit.png) no-repeat;
+    background: url(../../../img/initPic/serviceInit.jpg) no-repeat;
     background-size:100% 100%; 
 }
 

+ 3 - 4
src/css/register.css

@@ -55,10 +55,10 @@ margin-bottom:10px;line-height:38px;}
 .cellcode{width:255px;height:40px;position: relative;}
 .cellcode>div{width:165px;height:40px;border:1px solid #E5E5E5;
     line-height: 38px;display:inline-block;margin-right:10px;}
-input{border:none;padding-left:10px;}
+input{padding-left:10px;}
 .cellcode>a{color:#F18101;}
-#photo{color:#ccc;display: inline-block;padding-left: 0;background: none;text-align: center;}
-#photo_num{display: inline-block;color:#ccc;}
+#photo{color:#ccc;display: inline-block;padding-left: 0;background: none;text-align: center;border:none}
+#photo_num{display: inline-block;color:#ccc;height: 38px;line-height: 38px;border: none}
 .leibie{width:120px;height:30px;display:inline-block;color:#F18101;font-size: 1.4rem;
     line-height: 28px;font-weight: bold;padding-left: 20px;position: relative;}
 .leibie input{display:inline-block;width:15px;height:15px;margin-right: 5px;position: absolute;
@@ -112,7 +112,6 @@ padding: 20px 50px;overflow-y: auto;box-shadow: 0 10px 10px 0 #777;}
 .login_right h5 a{font-size: 14px;color: #f81009;margin-left: 62px;}
 .login_right form .login_uesr,.login_pass{width: 256px;height: 40px;position: relative;border: 1px solid #cccccc;}
 .login_uesr label img,.login_pass label img{width: 20px;height: 22px;position: absolute;top: 8px;left:10px;border: none;}
-#Lo_user,#Lo_pass{width: 170px;height: 24px;line-height: 24px;border: none;border-left: 1px solid #CCCCCC;padding-left: 12px;left:40px;top: 8px;font-size: 16px;position: absolute;color:#cdcdcd;}
 .login_uesr .log_del{width: 16px ;height: 16px;position: absolute; top: 10px;right: 10px;}
 .log_del:hover{cursor: pointer;}
 .login_uesr{margin-bottom: 20px;}

+ 47 - 87
src/js/public.js

@@ -51,7 +51,6 @@ $(function(){
 		var Suser=$('#Lo_user').val();
 		var Spass=$('#Lo_pass').val();	
 		var check_experts=$('#checks').prop('checked');		
-		var experts=check_experts?0:1;		
 		if(Suser==''||Spass==''){	
 			msg('请填写用户名/密码.');
 			return false;
@@ -63,7 +62,6 @@ $(function(){
               data: {
                       "username": Suser,
                       "password": Spass,
-                      "type": 0
               },
               success: function (rest) {				
 					if (rest.error && rest.error.length) {					
@@ -94,7 +92,7 @@ $(function(){
 			return ;
 		}
         $('.smg').addClass('active');
-        var lit = $('#msg').val(mess);
+        $('#msg').val(mess);
         setTimeout(function () {
             $('.smg').removeClass('active')
             $('#msg').val('');
@@ -143,11 +141,12 @@ $(function(){
 	$("#new_password .fastener_right").click(function(){
 		$('#new_password .login_close').click();
 	});
+	let use_forget,phone_forget;
 	//点击忘记密码里面的确认,则发送一个请求,并跳转到重置密码界面
 	$('#forget_form').submit(function(e){
 		e.preventDefault();
-		var use_forget = $('#forget_user').val();
-		var phone_forget=$("#forget_phone").val();
+		use_forget = $('#forget_user').val();
+		phone_forget=$("#forget_phone").val();
 		var phone_n_forget=$("#photo_n").val();
 		if(!(use_forget).trim()){
 			msg('亲,请填写用户名')
@@ -161,18 +160,14 @@ $(function(){
 			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",
+			url: globalConfig.context + "/open/checkMNCode",
 			data: {
-				user: use_forget,
-				photo:phone_forget,
-				"mobileCode": phone_n_forget
+				'userName': use_forget,
+				'mobile':phone_forget,
+				'mobileCode': phone_n_forget
 			},
 			success: function (rest) {
 				if (rest.error && rest.error.length) {
@@ -186,69 +181,47 @@ $(function(){
 			}
 		})
 	});
-	function pass_new(){
-		$('#new_pass').blur(function () {
-			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)) {
-				$(this).val('');
-				$(this).attr('placeholder', '请输入6-12位数密码');
-			}
-			if (new_pass!==new_pass_again) {
-				$('#new_pass_again').val('')
-				$('#new_pass_again').attr('placeholder', '确认密码')
-			}
-		});
-	}
-	pass_new();
-	function pass_new_again(){
-		//密码相同验证
-		$('#new_pass_again').blur(function () {
-			var new_pass=$("#new_pass").val();
-			var new_pass_again=$("#new_pass_again").val();
-			if (new_pass !== new_pass_again||new_pass_again == '') {
-				$(this).val('');
-				$(this).attr('placeholder', '确认密码')
-			}
-		});
-	}
-	pass_new_again()
 	//点击重置密码里面的确认,则发送一个请求,并关闭重置密码界面
 	$('#new_password_form').submit(function(e){
 		e.preventDefault();
-		var pass_pattern=/^\w{6,12}$/;
-		var phone_forget=$("#forget_phone").val();
+		var pass_pattern=/^[a-zA-Z0-9]{6,12}$/;
 		var new_pass=$("#new_pass").val();
 		var new_pass_again=$("#new_pass_again").val();
-		var types = $('#forget_checks').prop("checked") ? '0' : '1';//团体/个人
 		var reset_code=$(".password_top>h4").attr("val");
-		if(new_pass==''||!pass_pattern.test(new_pass)||new_pass!==new_pass_again){
-			return false;
-		}else {
-			$.ajax({
-				type: "post",
-				dataType: "json",
-				url: globalConfig.context + "/open/resetPwd",
-				data: {
-					"mobile": phone_forget,
-					"type": types,
-					"resetCode":reset_code,
-					"newPwd": new_pass
-				},
-				success: function (rest) {
-					if (rest.error && rest.error.length) {
-						$('#msg').val(rest.error[0].message);
-						msg();
-					} else {
-						$('.login').fadeIn(800);
-						$('#form_register').fadeOut(800);
-						$("#new_password").fadeOut(800);
-					}
-				}
-			})
+		console.log(new_pass,new_pass_again)
+		if(!new_pass||!new_pass_again){
+			msg('亲,新旧密码必填!')
+			return;
 		}
-
+		if(new_pass!==new_pass_again){
+			msg('亲,两次密码不一致')
+			return;
+		}
+		if(!pass_pattern.test(new_pass)){
+			msg('亲,密码格式不正确')
+			return ;
+		}
+		$.ajax({
+			type: "post",
+			dataType: "json",
+			url: globalConfig.context + "/open/resetPassword",
+			data: {
+				'userName':use_forget,
+				"newPwd": new_pass,
+				'mobile':phone_forget,
+				'resetCode':reset_code
+			},
+			success: function (rest) {
+				if (rest.error && rest.error.length) {
+					msg(rest.error[0].message);
+				} else {
+					$('.login').fadeIn(800);
+					$('#form_register').fadeOut(800);
+					$("#new_password").fadeOut(800);
+					msg('修改成功!');
+				}
+			}
+		})
 	});
 	//手机号码的验证
 	function photoyanzheng(){
@@ -275,17 +248,6 @@ $(function(){
 		})
 	}
 	photoyanzheng();
-	//手机验证码
-	function photo_n(){
-		$('#photo_n').blur(function () {
-			var phoa = $(this).val();
-			if (phoa=='') {
-				$(this).val('');
-				$(this).attr('placeholder', '请输入验证码');
-			}
-		})
-	}
-	photo_n();
 	//点击刷新图片验证码
 	$('.yanzhengma_cont_').click(function () {
 		$('.yanzhengma_cont_ img').attr('src', (globalConfig.context + "/open/getVCode?t=" + Math.random()))
@@ -324,11 +286,9 @@ $(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('发送成功');
-					msg();
+					msg('发送成功');
 				}
 				return true;
 			}
@@ -337,8 +297,8 @@ $(function(){
 	//loading
 	loading();
 	function loading(){
-		clearInterval(setTime);
-		let txt = "loading...",htmls=[],i=0,
+		clearInterval(setTime)
+		let txt = "努力加载中...",htmls=[],i=0,
 			txtArr = txt.split('');
 			let ps = document.createElement('p');
 			txtArr.map(item=>{
@@ -355,7 +315,7 @@ $(function(){
 			}
 			$('.loading p span').eq(i).addClass('active').siblings().removeClass('active');
 		}
-	    let setTime =setInterval(()=>{active()},100);
+	    var setTime =setInterval(()=>{active()},100);
 	}
 });
 

+ 30 - 23
src/js/register.js

@@ -11,24 +11,9 @@ $(function () {
     //查看技淘网协议
     var hht = $(window).height();
     $('.login_').height(hht);
-    $('.head_login_').click(function (e) {
-        e.preventDefault();
-        $('.login_').fadeIn(800)
-    })
-    $('.login_close_').click(function () {
-        $('.login_').fadeOut(800)
-    })
     //登陆
     var hht = $(window).height();
-    $('.login').height(hht);
-    $('.login').hide()
-    $('.head_login').click(function (e) {
-        e.preventDefault();
-        $('.login').fadeIn(800)
-    })
-    $('.login_close').click(function () {
-        $('.login').fadeOut(800)
-    })
+    $('.login').hide();
     //点击账号后面那个×,清空账号
     $(".log_del").click(function () {
         $("#username").focus().val("").css('color','#666');
@@ -102,7 +87,6 @@ $(function () {
     })
     $('#userpassword,#userpassword2').focus(function(){
         let passVal =$(this).val();
-        console.log(passVal)
         if(passVal.indexOf('密码')>-1){
             $(this).attr('type','password').val('').css({color:'#333'})
         }
@@ -154,19 +138,38 @@ $(function () {
             }
         });
     }
+    function initVal(){
+        $('#userpassword2').val('确认密码');
+        $('#userpassword1').val('请输入密码');
+        $('#username').val('请输入用户名');
+        $('#customerName').val('请输入客户名称');
+        $('#usePhoto').val('请输入手机号码');
+        $('#photo_num').val('手机验证码');
+        $('#protocol').prop("checked", false)
+        $(this).prop('checked', false)
+        $(this).parent().addClass('cheackeds_no').removeClass('cheackeds');
+        $('.sub').attr('disabled', true)
+        $('.sub').css({
+            background: '#CCCCCC',
+            border: 'none'
+        })
+    }
     //表单提交
     $("#form_register").submit(function (e) {
+        e.preventDefault();
+        console.log()
+        return;
         var user = $("#username").val(),
             usePhoto = $('#usePhoto').val(),
             password1 = $("#userpassword").val(),
             password2 = $("#userpassword2").val(),
             customerName = $('#customerName').val(),
             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('请填写必填项');
             return;
         } else {
+            $('.loading').show().css({'opacity':'0'}).find('p').html('');
             $.ajax({
                 type: "POST",
                 dataType: "json",
@@ -182,17 +185,21 @@ $(function () {
                     if (rest.error && rest.error.length) {
                         msg(rest.error[0].message);
                     } else {
-                        var data = rest.data;
-                        console.log(data)
-                        msg("注册成功!");
                         setTimeout(()=>{
-                            window.location.href = globalConfig.context + "/user/signIn.html";
-                        },2000)
+                            msg("注册成功,请登录个人中心操作");
+                            initVal();
+                            if($('.header ul li a').hasClass('head_login')){
+                                $('.login').fadeIn(800);
+                                $('#form_register').fadeOut(800)
+                            }
+                        },1000)
                     }
+                    $('.loading').hide()
                 }
             })
         }
     })
+    
     var tt = 30;
     $('#photo').click(function () {
         var ophoto = $('#usePhoto').val().trim();

+ 21 - 7
src/js/thinkTank.js

@@ -183,6 +183,7 @@ $(function() {
     //智者数据交互
     function loadDate(pageNo) {
 		$('.loading').show();
+		$('.pagination_box').show()	
         $.ajax({
             method: "get",
             dataType: "json",
@@ -200,12 +201,12 @@ $(function() {
 				console.log(data)
 				if(data&&data.error.length){
 					msg(data.error[0].message)
+					$('.pagination_box').hide();
 				}
-                if (data.data && data.data.list) {
+                if (data&&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='佚名'
                         }
@@ -256,9 +257,14 @@ $(function() {
                             '<li class="pageNumber"><a href="#" value=' + i + ' >' + i + '</a></li>'
                         );
                     }
-                };
-                $('.pageNumber').remove();
-                $('.pagePre').after(pageArr.join(''));
+				};
+				if(!data.data.totalCount){
+					$('.pagination_box').hide()	
+				}else{
+					$('.pageNumber').remove();
+                	$('.pagePre').after(pageArr.join(''));
+				}
+                
             }
         });
     }
@@ -393,8 +399,16 @@ $(function() {
 		dataObj.theFieldA ='';
 		dataObj.province = province;
 		dataObj.theKeyword=theKeyword;
-		loadDate();
-		$('#industryList li').removeClass('active');
+		if(theKeyword){
+			loadDate();
+			$('#industryList li').removeClass('active');
+			$('#selectInt li').eq(0).addClass('active');
+			$('#isInt').prop('checked', false);
+		$('#noInt').prop('checked', false);
+		$('#noInt,#isInt').parent().addClass('demand').removeClass('patent');
+		}
+		
+
 	});
 
 	$('.pagination').on('click', 'li', function(e) {

+ 1 - 1
template/indexNew.html

@@ -1044,7 +1044,7 @@
 					<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="cellcode_">