Browse Source

Merge branch 'master' of http://git.jishutao.com/jishutao/portal

dengzhiguo 7 years ago
parent
commit
31dbb5ed8d

BIN
img/登陆_09.png


+ 0 - 0
src/css/Technologytrading.css


+ 6 - 0
src/css/main_banner.css

@@ -0,0 +1,6 @@
+.carouselt{ position:relative; overflow: hidden;width:100%;height:460px; }
+.ct-img-big{ position:absolute; }
+.ct-img-big li{ float: left; }
+.btn{ position: absolute; display: block;}
+.btn-pre{top:220px;left:360px;}
+.btn-next{top:220px;right:360px;}

+ 5 - 0
src/css/public.css

@@ -110,3 +110,8 @@ header .nav_right a:hover{color: #2a6597;}
 
 .login_check label:first-child{margin-right: 15px;}
 .head_login:focus{text-decoration: none;}
+
+/*弹出消息提示*/
+.smg{width: 200px;height: 30px;color: #0C79FF;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;}
+

+ 14 - 3
src/css/register.css

@@ -18,6 +18,12 @@ a:hover{color:#000;text-decoration:none;}
 input:focus{outline: none;}
 ul,ol{padding: 0;margin: 0;list-style: none;}
 
+::input-placeholder{color:#cccccc;}
+::-webkit-input-placeholder{color:#cccccc;}
+::-moz-input-placeholder{color:#cccccc;}
+::-ms-input-placeholder{color:#cccccc;} 
+
+
 /*registered页面container的css*/
 .registered{width:100%;height:973px;}
 .reg_con{width:1200px;height:973px;margin:0 auto;
@@ -46,7 +52,7 @@ margin-bottom:10px;line-height:38px;}
     line-height: 38px;display:inline-block;margin-right:10px;}
 input{border:none;padding-left:10px;}
 .cellcode>a{color:#F18101;}
-#photo{color:#ccc;display: inline-block;padding-left: 0;background: none;}
+#photo{color:#ccc;display: inline-block;padding-left: 0;background: none;text-align: center;}
 #photo_num{display: inline-block;}
 .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;}
@@ -81,6 +87,10 @@ position: absolute;top:0;left:0;}
 margin:40px auto;padding: 20px 50px;overflow-y: auto;box-shadow: 0 10px 10px 0 #777;}
 .title_{line-height: 50px;}
 .longin_foot{line-height: 50px;}
+#userpassword{width: 190px;}
+
+
+
 
 /*登陆页面*/
 .login{width: 100%;background: rgba(6,6,6,.4);position: fixed;top: 0;left: 0;z-index: 999;}
@@ -123,8 +133,9 @@ margin:40px auto;padding: 20px 50px;overflow-y: auto;box-shadow: 0 10px 10px 0 #
 .text_center{top:75px;}
 .text_bottom{top:165px;}
 
-
-
+/*弹出消息提示*/
+.smg{width: 200px;height: 30px;color: #0C79FF;background: rgba(100,100,100,.3);border-radius: 10px;position: fixed;top: 50%;margin-top: -15px;left: 50%;margin-left: -75px;color: #ffffff;}
+.smg input{width: 200px;height: 30px;border: none;background: none;text-align: center;font-size: 16px;}
 
 
 

+ 0 - 6
src/css/service.css

@@ -1,9 +1,3 @@
-.carouselt{ position:relative; overflow: hidden;width:100%;height:460px; }
-.ct-img-big{ position:absolute; }
-.ct-img-big li{ float: left; }
-.btn{ position: absolute; display: block;}
-.btn-pre{top:220px;left:360px;}
-.btn-next{top:220px;right:360px;}
 
 .service_main{width: 100%;height: 600px;}
 .serve{width:1200px;height:600px;margin:0 auto;}

+ 7 - 0
src/js/Technologytrading.js

@@ -0,0 +1,7 @@
+import '../css/bootstrap.less';
+import 'bootstrap/dist/js/bootstrap.js';
+import '../css/public.css';
+import '../css/main_banner.css';
+import './public.js';
+import './main_banner.js';
+import '../css/Technologytrading.css';

+ 2 - 3
src/js/main_public.js

@@ -1,5 +1,4 @@
-(function(){
-
+$(function(){	
     var $imgBig=$('.ct-img-big'),
         $btnNext=$('.btn-next'),
         $btnPre=$('.btn-pre'),
@@ -86,4 +85,4 @@
             playNext()
         },3000)
     });
-})();
+});

+ 19 - 10
src/js/public.js

@@ -1,6 +1,5 @@
 
-$(function(){
-	
+$(function(){	
 	//导航
 	var thead=$('header').clone(true);
 	$('body').append(thead);
@@ -91,12 +90,12 @@ $(function(){
 	$('.login_close').click(function(){
 		$('.login').fadeOut(800)
 	})
-	$('form').submit(function(){
+	$('#form_login').submit(function(e){
+		e.preventDefault();
 		var Suser=$('#Lo_user').val();
 		var Spass=$('#Lo_pass').val();	
 		var check_experts=$('#checks').prop('checked');		
-		var experts=check_experts?0:1;
-		console.log(Suser,Spass,experts)
+		var experts=check_experts?0:1;		
 		if(Suser==''||Spass==''||Suser=='用户名/邮箱/手机'||Spass=='请输入密码'){			
 			return false;
 		}else{			
@@ -112,7 +111,8 @@ $(function(){
               },
               success: function (rest) {				
 					if (rest.error && rest.error.length) {					
-						message.warning(rest.error[0].message);		       			       																
+						 $('#msg').val(rest.error[0].message);
+		                 msg();	
 					} else {						
 						var  data = rest.data;
                         if (data && data.requestURI) {
@@ -126,14 +126,23 @@ $(function(){
                             window.location.href = path;
                         } else {
                             window.location.href = globalConfig.context + "/user/account/index.html";
-                        }
-                        return true;
+                        }                       
 					}
 			   }
           })
                 
 		}			
 	})
-		
-		
+	//提示框渐隐函数
+    $('.smg').hide();
+    function msg(){
+    	var lit=$('#msg').val();
+    	if(lit!==''){
+    		$('.smg').fadeIn(500)
+    	}
+    	setTimeout(function(){
+    		$('.smg').fadeOut(500)
+    		$('#msg').val('')
+    	},2000)
+    }  		
 })

+ 168 - 229
src/js/register.js

@@ -3,7 +3,7 @@ import 'bootstrap/dist/js/bootstrap.js';
 import '../css/public.css';
 import '../css/register.css';
 import './public.js'
-(function(){
+$(function(){
     //查看技淘网协议
     var hht=$(window).height();
     $('.login_').height(hht);
@@ -29,8 +29,7 @@ import './public.js'
     //选择专家和企业时要切换
     var panduan;
     $("#qiye").click(function(){
-        panduan=$('#zhuangjia').prop("checked") ? '0' : '1';
-        console.log(panduan);
+        panduan=$('#zhuangjia').prop("checked") ? '0' : '1';        
         if(panduan==1){
             $(".businessName").css("display","block");
             $(".linkmanName").css("display","block");
@@ -39,8 +38,7 @@ import './public.js'
         }
     });
     $("#zhuangjia").click(function(){
-        panduan=$('#zhuangjia').prop("checked") ? '0' : '1';
-        console.log(panduan);
+        panduan=$('#zhuangjia').prop("checked") ? '0' : '1';      
         if(panduan==0){
             $(".businessName").css("display","none");
             $(".linkmanName").css("display","none");
@@ -49,116 +47,70 @@ import './public.js'
     });
     //点击账号后面那个×,清空账号
     $(".log_del").click(function(){
-        $("#username").val("");
-        $('#photo').attr('disabled', true);
-        $("#photo").css("color","#ccc");
-        $('.sub').attr('disabled', true)
-        $('.sub').css({background: '#CCCCCC',border: 'none'})
+        $("#username").val("");     
+        $("#photo").css("color","#ccc");            
     });
     //修改单选框的样式
     //$('.leibie input').css("display","none");
-    $(".qiye_lab").css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"});
-    $(".zhuangjia_lab").css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"});
-    $(".protocol_lab").css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"});
+    $("#qiye").prop('checked',true);
+    $(".qiye_lab").css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"});
+    $(".zhuangjia_lab").css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"});
+    $(".protocol_lab").css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"});
     $('#qiye').click(function(){
-        var Cheack=$(this).prop('checked')
+        var Cheack=$(this).prop('checked')       
         if(Cheack){
-            $(this).parent().css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $(this).parent().css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"})
             $('#zhuangjia').prop('checked',false)
-            $('#zhuangjia').parent().css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $('#zhuangjia').parent().css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"})
         }else{
             $('#zhuangjia').prop('checked',true)
-            $('#zhuangjia').parent().css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"})
-            $(this).parent().css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $('#zhuangjia').parent().css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"})
+            $(this).parent().css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"})
         }
     })
     $('#zhuangjia').click(function(){
-        var Cheack_no=$(this).prop('checked')
+        var Cheack_no=$(this).prop('checked')     
         if(Cheack_no){
-            $(this).parent().css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $(this).parent().css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"})
             $('#qiye').prop('checked',false)
-            $('#qiye').parent().css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $('#qiye').parent().css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"})
         }else{
             $('#qiye').prop('checked',true)
-            $('#qiye').parent().css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"})
-            $(this).parent().css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"})
+            $('#qiye').parent().css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"})
+            $(this).parent().css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"})
         }
-    })
+    })     
+    var xieyi=$('#protocol').prop("checked",false);
+    $('.sub').attr('disabled', true)
+    $('.sub').css({background: '#CCCCCC',border: 'none'})
     $('#protocol').click(function(){
-        var Cheack_no=$(this).prop('checked')
+        var Cheack_no=$(this).prop('checked')        
         if(Cheack_no){
-            $(this).parent().css({"background":"url(../img/checked.jpg) no-repeat center left","background-size":"13px 13px"})
-            }else{
-             $(this).parent().css({"background":"url(../img/unchecked.jpg) no-repeat center left","background-size":"13px 13px"})
-        }
-        $('.sub').attr('disabled', true)
-        $('.sub').css({background: '#CCCCCC',border: 'none'})
-        var pp = $('#username').val();//手机号码
-        var mim = $('#userpassword').val();//密码
-        var mim2=$('#userpassword2').val();//密码
-        var toname = $('#business').val();//企业名称
-        var lxr = $('#linkman').val();//企业联系人
-        var zj=$('#man').val();//联系人
-        var yzm = $('#piccode').val();//验证码
-        var sjyzm = $('#photo_num').val();//手机验证码
-        var typel = $('#zhuangjia').prop("checked") ? '0' : '1';
-        var xieyi=$('#protocol').prop("checked");
-        if(typel==1){
-            if(pp!==''&&toname!==''&&lxr!==''&&mim!==''&& pass_pattern.test(mim) && sjyzm!==''&& yzm!==''&&pattern.test(pp)&&(mim==mim2)&&(xieyi==true)){
-                $('.sub').attr('disabled', false);
-                $('.sub').css({background: '#F18101',border: 'none'})
-            }
-        }
-        if(typel==0){
-            if(pp!==''&&zj!==''&&mim!==''&& pass_pattern.test(mim) && sjyzm!==''&& yzm!==''&&pattern.test(pp)&&(mim==mim2)&&(xieyi==true)){
-                $('.sub').attr('disabled', false);
-                $('.sub').css({background: '#F18101',border: 'none'})
-            }
-        }
+            $(this).parent().css({"background":"url(../img/check_lo.png) no-repeat center left","background-size":"13px 13px"})
+            $('.sub').attr('disabled', false);
+            $('.sub').css({background: '#F18101',border: 'none'})    
+        }else{
+             $(this).prop('checked',false)	
+             $(this).parent().css({"background":"url(../img/check_lono.png) no-repeat center left","background-size":"13px 13px"})
+       		 $('.sub').attr('disabled', true)
+   	         $('.sub').css({background: '#CCCCCC',border: 'none'}) 
+        }       
     })
 
-    //表单验证
-    $('.sub').attr('disabled', true)
-    $('.sub').css({background: '#CCCCCC',border: 'none'})
-    var pattern = /^1[3|4|5|7|8][0-9]{9}$/;//手机验证正则
-    var pass_pattern=/^\w{6,12}$/;	//密码验证正则
-    $('#username,#userpassword,#userpassword2,#piccode,#photo_num,#business,#linkman,#man').keyup(function() {
-        $('.sub').attr('disabled', true)
-        $('.sub').css({background: '#CCCCCC',border: 'none'})
-        var pp = $('#username').val();//手机号码
-        var mim = $('#userpassword').val();//密码
-        var mim2=$('#userpassword2').val();//密码
-        var toname = $('#business').val();//企业名称
-        var lxr = $('#linkman').val();//企业联系人
-        var zj=$('#man').val();//联系人
-        var yzm = $('#piccode').val();//验证码
-        var sjyzm = $('#photo_num').val();//手机验证码
-        var typel = $('#zhuangjia').prop("checked") ? '0' : '1';
-        var xieyi=$('#protocol').prop("checked");
-        if(typel==1){
-            if(pp!==''&&toname!==''&&lxr!==''&&mim!==''&& pass_pattern.test(mim) && sjyzm!==''&& yzm!==''&&pattern.test(pp)&&(mim==mim2)&&(xieyi==true)){
-                $('.sub').attr('disabled', false);
-                $('.sub').css({background: '#F18101',border: 'none'})
-            }
-        }
-        if(typel==0){
-            if(pp!==''&&zj!==''&&mim!==''&& pass_pattern.test(mim) && sjyzm!==''&& yzm!==''&&pattern.test(pp)&&(mim==mim2)&&(xieyi==true)){
-                $('.sub').attr('disabled', false);
-                $('.sub').css({background: '#F18101',border: 'none'})
-            }
-        }
-    })
     //密码
     function pass1(){
         $('#userpassword').blur(function () {
+        	var pass_pattern=/^\w{6,12}$/;
             var pass1 = $(this).val();
-            if (pass1=='') {
+            var tt=$('#userpassword2').val();
+            if (pass1==''||!pass_pattern.test(pass1)) {
                 $(this).val('');
                 $(this).attr('placeholder', '请输入6-12位数密码');
-            } else if (!pass_pattern.test(pass1)) {
-                //$(this).val('');
-                $(this).attr('placeholder', '格式:字母、数字、下划线');
-            }
+            } ; 
+            if ($(this).val() == ''||tt!==pass1) {
+            	$('#userpassword2').val('')
+                $('#userpassword2').attr('placeholder', '确认密码')
+            } ;
         });
     }
     pass1();
@@ -169,32 +121,17 @@ import './public.js'
         $('#userpassword2').blur(function () {
             var orepeat = $(this).val();
             var passw = $('#userpassword').val();
-            if (passw !== orepeat) {
-                //$(this).val('');
-                $(this).attr('placeholder', '两次密码不相同')
-            } else if (passw == '') {
-                //$(this).val('');
-                $(this).attr('placeholder', '请再次输入密码')
-            }
-        });
-
-        $('#userpassword').blur(function () {
-            var tt=$(userpassword2).val();
-            var kk=$(this).val();
-            if ($(this).val() == '') {
-                $('#userpassword2').attr('placeholder', '请再次输入密码')
-            }else if(tt!==kk){
-               // $('#userpassword2').val('');
-                $('#userpassword2').attr('placeholder', '两次密码不相同')
-            }
-        })
+            if (passw !== orepeat||passw == '') {
+                $(this).val('');
+                $(this).attr('placeholder', '确认密码')
+            } 
+        });      
     }
     //手机号码
     function photo1(){
         var pho_pattern=/^1[3|4|5|7|8][0-9]{9}$/;
-        $("#username").keyup(function(){
-            var phol= $(this).val();
-            console.log(pho_pattern.test(phol));
+        $("#username").keyup(function(){       	
+            var phol= $(this).val();            
             if(pho_pattern.test(phol)){
                 $('#photo').attr('disabled', false);
                 $("#photo").css("color","#F18101");
@@ -205,15 +142,10 @@ import './public.js'
         });
         $('#username').blur(function () {
             var pho= $(this).val();
-            if (pho=='') {
+            if (pho==''||!pho_pattern.test(pho)) {
                 $(this).val('');
-                $(this).attr('placeholder', '请输入您的手机号码');
-
-            } else if (!pho_pattern.test(pho)) {
-               // $(this).val('');
-                $(this).attr('placeholder', '请输入正确的手机号码');
-
-            }else if(pho_pattern.test(pho)){
+                $(this).attr('placeholder', '请输入正确的号码')               
+            } else{
                 $('#photo').attr('disabled', false);
                 $("#photo").css("color","#F18101");
             }
@@ -221,7 +153,7 @@ import './public.js'
     }
     photo1();
 
-    //手机号码验证
+    //手机验证
     function photo_num(){
         $('#photo_num').blur(function () {
             var phoa = $(this).val();
@@ -238,7 +170,7 @@ import './public.js'
             var name = $(this).val();
             if (name=='') {
                 $(this).val('');
-                $(this).attr('placeholder', '请填写工商局注册的全称');
+                $(this).attr('placeholder', '单位名称');
             }
         })
     }
@@ -249,7 +181,7 @@ import './public.js'
             var name = $(this).val();
             if (name=='') {
                 $(this).val('');
-                $(this).attr('placeholder', '请填写单位联系人姓名');
+                $(this).attr('placeholder', '单位联系人姓名');
             }
         })
     }
@@ -264,110 +196,104 @@ import './public.js'
             }
         })
     }
-    zj_name();
-    //手机号码验证
-    //$('#username').blur(function() {
-    //    var kk = $(this).val();
-    //    if (pattern.test(kk) && kk !=='') {
-    //        $('.sub').attr('disabled', false);
-    //        $('.sub').css({
-    //            background: '#428bca',
-    //            border: '1px solid #428bca'
-    //        })
-    //    } else {
-    //        $('.sub').attr('disabled', true)
-    //        $('.sub').css({
-    //            background: '#CCCCCC',
-    //            border: 'none'
-    //        })
-    //    };
-    //
-    //});
+    zj_name();   
     //表单提交
-    $("form").submit(function(e) {
+    $("#form_register").submit(function(e) {    	
         var user = $("#username").val();
-        var password = $("#userpassword").val();
+        var password1 = $("#userpassword").val();
+        var password2 = $("#userpassword2").val();
         var types = $('#zhuangjia').prop("checked") ? '0' : '1';//团体/个人
         var oname = $('#business').val();//企业名称
         var opeople = $('#linkman').val();//企业联系人
         var people=$('#man').val();//企业联系人
         var Code = $("#piccode").val();
         var mobileCode = $('#photo_num').val();//手机验证码
-        e.preventDefault();
-        console.log(user, password, types, oname, opeople, Code, mobileCode);
-        if(types==0){
-            $.ajax({
-                type: "POST",
-                dataType: "json",
-                url: globalConfig.context + "/register",
-                data: {
-                    "mobile": user,
-                    "password": password,
-                    "type": types,
-                    "contacts": people,
-                    "verficationCode":Code,
-                    "mobileCode": mobileCode
-                },
-                success: function (rest) {
-                    if (rest.error && rest.error.length) {
-                        message.warning(rest.error[0].message);
-                    } else {
-                        var  data = rest.data;
-                        if (data && data.requestURI) {
-                            var path = globalConfig.context + data.requestURI
-                            if (data.queryString) {
-                                path += '?' + data.queryString;
-                            }
-                            if (window.location.hash) {
-                                path += window.location.hash;
-                            }
-                            window.location.href = path;
-                        } else {
-                            window.location.href = globalConfig.context + "/user/account/index.html";
-                        }
-                        return true;
-                    }
-                }
-            })
-        }
-        else if(types==1){
-            $.ajax({
-                type: "POST",
-                dataType: "json",
-                url: globalConfig.context + "/register",
-                data: {
-                    "mobile": user,
-                    "password": password,
-                    "type": types,
-                    "companyName": oname,
-                    "contacts": opeople,
-                    "verficationCode":Code,
-                    "mobileCode": mobileCode
-                },
-                success: function (rest) {
-                    if (rest.error && rest.error.length) {
-                        message.warning(rest.error[0].message);
-                    } else {
-                        var  data = rest.data;
-                        if (data && data.requestURI) {
-                            var path = globalConfig.context + data.requestURI
-                            if (data.queryString) {
-                                path += '?' + data.queryString;
-                            }
-                            if (window.location.hash) {
-                                path += window.location.hash;
-                            }
-                            window.location.href = path;
-                        } else {
-                            window.location.href = globalConfig.context + "/user/account/index.html";
-                        }
-                        return true;
-                    }
-                }
-            })
-        }
-
-    })
+        e.preventDefault();  
+        if(user==''||password1==''||password2==''||Code==''||mobileCode==''){       	
+        	return false;
+        }else if(types==0){
+        	if(people==''){        		
+        		return false;
+        	}else{       		        	        		
+	            $.ajax({
+	                type: "POST",
+	                dataType: "json",
+	                url: globalConfig.context + "/register",	                
+	                data: {
+	                    "mobile": user,
+	                    "password": password1,
+	                    "type": types,
+	                    "contacts": people,
+	                    "verficationCode":Code,
+	                    "mobileCode": mobileCode
+	                },
+	                success: function (rest) {
+	                    if (rest.error && rest.error.length) {
+	                         $('#msg').val(rest.error[0].message);
+	                         msg();
+	                    } else {
+	                        var  data = rest.data;
+	                        if (data && data.requestURI) {
+	                            var path = globalConfig.context + data.requestURI
+	                            if (data.queryString) {
+	                                path += '?' + data.queryString;
+	                            }
+	                            if (window.location.hash) {
+	                                path += window.location.hash;
+	                            }
+	                            window.location.href = path;
+	                        } else {
+	                            window.location.href = globalConfig.context + "/user/account/index.html";
+	                        }
+	                        return true;
+	                    }
+	                }
+	            })
+	           
+        	}
+        }	
+	     else if(types==1){
+	        	if(opeople==''||oname==''){	        		
+	        		return false;
+        		}else{
+		            $.ajax({
+		                type: "POST",
+		                dataType: "json",
+		                url: globalConfig.context + "/register",
+		                data: {
+		                    "mobile": user,
+		                    "password": password1,
+		                    "type": types,
+		                    "companyName": oname,
+		                    "contacts": opeople,
+		                    "verficationCode":Code,
+		                    "mobileCode": mobileCode
+		                },
+		                success: function (rest) {
+		                    if (rest.error && rest.error.length) {
+		                        $('#msg').val(rest.error[0].message);
+		                        msg();
+		                    } else {
+		                        var  data = rest.data;
+		                        if (data && data.requestURI) {
+		                            var path = globalConfig.context + data.requestURI
+		                            if (data.queryString) {
+		                                path += '?' + data.queryString;
+		                            }
+		                            if (window.location.hash) {
+		                                path += window.location.hash;
+		                            }
+		                            window.location.href = path;
+		                        } else {
+		                            window.location.href = globalConfig.context + "/user/account/index.html";
+		                        }
+		                        return true;
+		                    }
+		                }
+		            })
+	       		}       
+  		}
+	})
     //点击刷新图片验证码
     $('.yanzhengma_cont').click(function () {
         $('.yanzhengma_cont img').attr('src', (globalConfig.context + "/open/getVCode?t=" + Math.random()))
@@ -376,8 +302,7 @@ import './public.js'
     $('#photo').click(function () {
         //手机验证功能
         var ophoto = $('#username').val();
-        var types = $('#zhuangjia').prop("checked") ? '0' : '1';
-        console.log(types);
+        var types = $('#zhuangjia').prop("checked") ? '0' : '1';        
         var phott = $('#piccode').val();
         //验证码倒计时
         $('#photo').attr('disabled', true);
@@ -385,12 +310,14 @@ import './public.js'
         var timer = setInterval(function () {
             tt -= 1;
             $('#photo').attr('disabled', true);
-            $(this).val(tt + ' s');
+            $(this).val("发送"+'('+tt+'s'+')');
+            $(this).css({color:'#cccccc'})
             if (tt == 0) {
                 clearInterval(timer);
                 $('#photo').attr('disabled', false);
                 $(this).attr('disabled', false);
                 tt=30;
+                $(this).css({color:'rgb(241, 129, 1)'})
                 $(this).val('重新发送');
             }
         }.bind(this), 1000);
@@ -406,17 +333,29 @@ import './public.js'
             },
             success: function (data) {
                 if (data.error && data.error.length) {
-                    $('.msg span').html(data.error[0].message);
-                    console.log(data.error[0].message);
-                } else {
-                    console.log(data);
-                    $('#photo').html("发送成功!")
+                    $('#msg').val(data.error[0].message); 
+                    msg();
+                } else { 
+                	$('#msg').val('发送成功');
+                    msg();
                 }
-                return true
+                return true;
             }
         });
-    })
-})();
+    });
+    //提示框渐隐函数
+    $('.smg').hide();
+    function msg(){
+    	var lit=$('#msg').val();
+    	if(lit!==''){
+    		$('.smg').fadeIn(500);
+    	}
+    	setTimeout(function(){
+    		$('.smg').fadeOut(500);
+    		$('#msg').val('');
+    	},2000)
+    }  
+});
 
 
 

+ 3 - 3
src/js/service.js

@@ -2,10 +2,10 @@ import '../css/bootstrap.less';
 import 'bootstrap/dist/js/bootstrap.js';
 import '../css/public.css';
 import '../css/service.css';
+import '../css/main_banner.css';
 import './public.js';
-import './main_public.js'
-(function(){
-        //分公司和大客户进行tab切换
+import './main_banner.js'
+(function(){     
     $("#office").click(function(){
         $(this).removeClass("that").addClass("that");
         $("#custom").removeClass("that");

+ 185 - 0
template/Technologytrading.html

@@ -0,0 +1,185 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="../img/ico_logo.ico">
+    <meta name="Keywords" content=""/>
+    <meta name="Description" content=""/>
+	<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
+	<meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>科技服务</title>
+    <!--<link rel="stylesheet" href="../src/css/bootstrap.css" />
+    <link rel="stylesheet" href="../src/css/public.css" />
+    <link rel="stylesheet" type="text/css" href="../src/css/service.css"/>-->
+</head>
+<body>  	
+  	<header>
+  		<div class="container">
+  			<div class="logo"><a href="../template/index.html"><img src="../img/Logo111.png" alt="" title="技淘"/></a></div>
+  			<div  class="nav">
+  				<ul>
+  					<li class="active"><a href="#">技术交易</a></li>
+  					<li><a href="#">科技服务</a><img src="../img/hot.png"/></li> 					
+  					<li><a href="#">智库咨询</a></li>
+  					<li><a href="#">科技金融</a></li>
+  					<li><a href="#">科技活动</a></li>
+  					<li><a href="#">平台共建</a></li> 					
+  				</ul>
+  			</div>
+  			<div class="nav_right">
+  				<a href="">注册</a>
+  				<a href="javascript:;" class="head_login">登陆</a>
+  				<a href="">关于我们</a>
+  			</div>
+  		</div>
+  	</header>
+  	<!--banner-->
+  	<div class="carouselt">
+		<ul class="ct-img-big clear">
+			<li data-index=0 ><a href=""><img src="../img/highTech_slide_1.jpg" alt=""/></a></li>
+			<li data-index=1 ><a href=""><img src="../img/highTech_slide_2.jpg" alt=""/></a></li>
+			<li data-index=2 ><a href=""><img src="../img/highTech_slide_3.jpg" alt=""/></a></li>
+			<li data-index=3 ><a href=""><img src="../img/highTech_slide_4.jpg" alt=""/></a></li>
+			<li data-index=4 ><a href=""><img src="../img/highTech_slide_5.jpg" alt=""/></a></li>
+		</ul>
+		<a class="btn btn-next" href="">
+			<img src="../img/index_next.png" alt=""/>
+		</a>
+		<a class="btn btn-pre" href="">
+			<img src="../img/index_pre.png" alt=""/>
+		</a>
+	</div>
+  	<!--主体内容区域开始-->
+ 
+  	<!--主体内容区域结束-->
+	<div id="bottom">
+		<div class="bottom">
+			<img src="../img/bottom1_02.png" alt=""/>
+			<div class="bottom_text">
+				<div class="text_top">
+					<a href="#">关于公司/</a>
+					<a href="#">联系我们</a>
+					<p> Copyright &copy 2016-2017 科德 版权所有 湘ICP备15019731号
+					-2 技术支持:湖南阿凡提科技有限公司</p>
+				</div>
+				<div class="text_center">
+					<div class="cont_left">
+						<img src="../img/dizhi.jpg" alt=""/>
+						<p>湖南省长沙市营盘东路19号金山大厦</p>
+					</div>
+					<div class="cont_center">
+						<img src="../img/dianhua.jpg" alt=""/>
+						<p>合作电话:0731-89907207</p>
+						<p>400-8800-962八楼</p>
+					</div>
+					<div class="cont_right">
+						<img src="../img/erweima.jpg" alt=""/>
+						<p>科德公众号</p>
+					</div>
+				</div>
+				<div class="text_bottom">
+					<p>友情链接</p>
+					<a href="http://www.hnst.gov.cn/">湖南省科技厅/</a>
+					<a href="http://www.cssti.cn/">长沙市科技局/</a>
+					<a href="http://www.cast.org.cn/">中国科学技术协会/</a>
+					<a href="http://www.chinatorch.gov.cn/">科技部火炬中心/</a>
+					<a href="http://www.nosta.gov.cn/web/index.aspx">国家科技成果奖励办/</a>
+					<a href="http://www.nast.org.cn/">国家科技成果网/</a>
+					<a href="http://www.hnast.org.cn/portal/comm/index.action">湖南省科学技术协会/</a>
+					<a href="http://www.hncgw.gov.cn/">湖南省科技成果转化公共服务平台/</a>
+					<a href="http://www.hnjxw.gov.cn/">湖南省经济信息化委员会/</a>
+					<a href="http://kyy.hnu.cn/">湖南大学科学技术研究院/</a>
+					<a href="http://www.gxst.gov.cn/gxkjt/">广西省科技厅/</a>
+					<a href="http://www.nmkjt.gov.cn/">内蒙古自治区科技厅/</a>
+					<a href="http://www.cshtz.gov.cn/">长沙市高新区管委会/</a>
+					<a href="http://www.jxas.ac.cn/">江西省科学院/</a>
+					<a href="http://www.cnic.cn/front/index.html#/cnicSite/home">中科院计算机网络信息中心/</a>
+					<a href="http://kxyjb.csu.edu.cn/">中南大学科学研究部/</a>
+					<a href="http://www.cast.org.cn/">中国科协创新创业服务中心/</a>
+					<a href="http://www.hbstd.gov.cn/">湖北省科技厅/</a>
+					<a href="http://www.gdstc.gov.cn/">广东省科技厅/</a>
+					<a href="http://www.hnkjt.gov.cn/">河南省科技厅/</a>
+					<a href="http://www.cbtm.gov.cn/">技术合同登记官网</a>
+				</div>
+			</div>
+		</div>
+		
+	</div>
+	<div class="pub_fix">		
+			<span class="index_blur"></span>
+			<ul class="ret_top">
+				<li>
+					<a href="">
+						<img src="../img/index_fix1.png" alt="" />
+						<p>发布需求</p>
+					</a>
+				</li>
+				<li>
+					<a href="">
+						<img src="../img/index_fix2.png" alt="" />
+						<p>发布技术</p>
+					</a>
+				</li>
+				<li>
+					<a href="tencent://Message/?Uin=2035994611&websiteName=q-zone.qq.com&Menu=yes">
+						<img src="../img/index_fix3.png" alt="" />
+						<p>联系客服</p>
+					</a>
+				</li>
+				<li>
+					<a href="" class="pendent_box">
+						<img src="../img/index_fix4.png" alt="" />
+						<p>返回顶部</p>
+					</a>
+				</li>
+			</ul>
+			<span class="index_orange"></span>		
+	</div>
+	<!--登陆页面-->
+	
+	<div class="login">
+		<div class="login_mian">
+			<div class="login_left">
+				<div class="login_ewm">
+					<img src="../img/login_ewm.png" alt="二维码" />
+				</div>
+				<p>扫描二维码下载官方</p>
+				<p>技淘APP</p>
+			</div>
+			<div class="login_right">
+				<h5>用户登陆<a href="">免费注册有好礼呦!!</a></h5>
+				<form action="" method="post">
+					<div class="login_uesr">
+						<label for="uesname"><img src="../img/login_use.png"/></label>
+						<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
+						<img src="../img/login_del.png" class="log_del"/>
+					</div>
+					<div class="login_pass">
+						<label for="pass"><img src="../img/login_password.png"/></label>
+						<input type="text" name="pass" id="Lo_pass" value="请输入密码" />
+					</div>
+					<div class="login_check">
+						<label for="checks" class="lab_check">
+							<input type="checkbox" name="type" id="checks" />专家
+						</label>
+						<label for="checkst" class="lab_checkno">
+							<input type="checkbox" name="type" id="checkst" />企业
+						</label>
+						<u><a href="">忘记密码?</a></u>
+					</div>
+					<input type="submit" value="登 陆" class="login_submit"/>
+				</form>
+				<img src="../img/login_hua.png" alt="" class="login_hua"/>
+				<img src="../img/login_shadow.png" alt="阴影效果" class="login_shadow"/>
+			</div>			
+		</div>
+		<img src="../img/login_close.png" alt="" class="login_close"/>
+	</div>
+	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
+</body>
+<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="../src/js/service.js"></script>
+<script type="text/javascript" src="../src/js/public.js"></script>-->
+
+</html>

+ 4 - 3
template/index.html

@@ -9,7 +9,7 @@
 	<meta name="viewport" content="width=device-width,initial-scale=1, minimum-scale=1, maximum-scale=1,user-scalable=no">
 	<meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>首页</title>
-
+   
 </head>
 <body>  	
   	<header>
@@ -400,7 +400,7 @@
 			</div>
 			<div class="login_right">
 				<h5>用户登陆<a href="">免费注册有好礼呦!!</a></h5>
-				<form action="" method="post">
+				<form  id="form_login">
 					<div class="login_uesr">
 						<label for="uesname"><img src="../img/login_use.png"/></label>
 						<input type="text" name="uesname" id="Lo_user" value="用户名/邮箱/手机" />
@@ -427,6 +427,7 @@
 		</div>
 		<img src="../img/login_close.png" alt="" class="login_close"/>
 	</div>
-
+	<div class="smg"><input type="text" name="msg" value="111" id="msg"/></div>
 </body>
+
 </html>

+ 7 - 7
template/register.html

@@ -18,9 +18,9 @@
   		<div class="container">
   			<div class="logo"><a href="../template/index.html"><img src="../img/Logo111.png" alt="" title="技淘"/></a></div>
   			<div  class="nav">
-  				<ul>
-  					<li class="active"><a href="#">科技服务</a><img src="../img/hot.png"/></li>
+  				<ul>  					
   					<li><a href="#">技术交易</a></li>
+  					<li><a href="#">科技服务</a><img src="../img/hot.png"/></li>
   					<li><a href="#">智库咨询</a></li>
   					<li><a href="#">科技金融</a></li>
   					<li><a href="#">科技活动</a></li>
@@ -37,7 +37,7 @@
   	<!--主体内容区域开始-->
   	<div class="registered">
   		<div class="reg_con">
-			<form action="">
+			<form action="" method="post" id="form_register">
 				<div class="clear_first"></div>
 				<div class="zhuce">
 					<div class="title">用户注册</div>
@@ -111,6 +111,7 @@
 			</form>
 		</div>
   	</div>
+  	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
   	<!--主体内容区域结束-->
 	<div id="bottom">
 		<div class="bottombg_top"></div>
@@ -259,9 +260,8 @@
 		<img src="../img/login_close.png" alt="" class="login_close"/>
 	</div>
 </body>
-<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>-->
-<!--&lt;!&ndash;<script type="text/javascript" src="../src/js/index.js"></script>&ndash;&gt;-->
-<!--<script type="text/javascript" src="../src/js/public.js"></script>-->
-<!--<script type="text/javascript" src="../src/js/registered.js"></script>-->
+<!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
+<script type="text/javascript" src="../src/js/public.js"></script>
+<script type="text/javascript" src="../src/js/register.js"></script>-->
 
 </html>

+ 1 - 0
template/service.html

@@ -466,6 +466,7 @@
 		</div>
 		<img src="../img/login_close.png" alt="" class="login_close"/>
 	</div>
+	<div class="smg"><input type="text" name="msg" value="" id="msg"/></div>
 </body>
 <!--<script type="text/javascript" src="../src/js/jquery-2.1.0.js"></script>
 <script type="text/javascript" src="../src/js/service.js"></script>

+ 7 - 1
webpack.config.js

@@ -45,7 +45,7 @@ module.exports = (function () {
             chunks: ['index', 'vendors']
         }), 
          new HtmlWebpackPlugin({
-            title: '新闻页',
+            title: '科技服务',
             filename: 'html/service.html',
             template: './template/service.html',
             chunks: ['service', 'vendors']
@@ -56,6 +56,12 @@ module.exports = (function () {
             template: './template/register.html',
             chunks: ['register', 'vendors']
         }),
+          new HtmlWebpackPlugin({
+            title: '科技交易',
+            filename: 'html/Technologytrading.html',
+            template: './template/Technologytrading.html',
+            chunks: ['Technologytrading', 'vendors']
+        }),
     ];
     if (!isDev) {
         //这个使用uglifyJs压缩你的js代码

+ 6 - 0
webpack/entry.config.js

@@ -4,6 +4,8 @@ module.exports = {
     'index': './src/js/index.js',  
     'service': './src/js/service.js',
     'register': './src/js/register.js',
+    'Technologytrading': './src/js/Technologytrading.js',
+    
   },
   watch: {
     'index': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
@@ -18,5 +20,9 @@ module.exports = {
       'webpack/hot/only-dev-server',
       './src/js/register.js'
     ],
+     'Technologytrading': ['webpack-dev-server/client?http://127.0.0.1:80', // WebpackDevServer host and port
+      'webpack/hot/only-dev-server',
+      './src/js/Technologytrading.js'
+    ],
   }
 }