Browse Source

图片上传国际化, 多个相同name校验问题

zhengkaixin 3 years ago
parent
commit
228f04f28f

+ 61 - 12
assets/js/company-postproject.js

@@ -3,9 +3,6 @@ $(function(){
  	  $(document).ready(function () {
 		
 		
-		
-		
-	
 		  $(".btnUpload").height($(".btnUpload").width()) 
 		  	var getspan=$(".imguploadspan").html();
 			$(".imguploadspan").append(getspan)
@@ -72,15 +69,18 @@ $(function(){
 				$("#imagePic").val("")
 	          }
 	        } else {
-	          alert('仅支持不超过10M的图片');
- 	       
+				jpalert($(".head_10M").val(),null,"alert");
+	     
+ 	       	$("#imagePic").val("")
 	          // btnUploadText = '上传'
 	          // $("#uploadButton").text(btnUploadText)
 	          return false;
 	        }
 	      } else {
-	        alert('仅限bmp,jpg,png,jpeg图片格式');
-	      
+	       
+			jpalert($(".head_jpgpng").val(),null,"alert");
+			
+			 	$("#imagePic").val("")
 	        // btnUploadText = '上传'
 	        // $("#uploadButton").text(btnUploadText)
 	        return false;
@@ -124,9 +124,6 @@ $(function(){
 		$(".showlistLocation3").append(li)
 	})
 	
- 
-	
-		
 		$.validator.setDefaults({
 		    submitHandler: function() {
 				var bl=true;
@@ -136,9 +133,61 @@ $(function(){
 						return
 					}
 				});
+				
+				var success = $(".head_success").val();
+				var warning = $(".head_warning").val();
+				var success1 = $(".signin_success").val();
+				var warning1 = $(".signin_warning").val()
+				
+				
 		       if(bl){
-		            alert("请上传一张照片")
-		       }
+					zeroModal.alert({
+						unique: '1',
+						opacity: 0.8,
+						content: warning,
+						contentDetail: warning1,
+						width: '300px',
+						height: '260px',
+						cancel:true,
+						ok: false,
+						onClosed: function() {
+							; //location.href='../signin/signin.html'
+						},
+						onComplete: function(evn) {
+							console.log('onComplete')
+							setTimeout(function() {
+					
+								zeroModal.close('1');
+							}, 3000);
+						}
+					})
+		       }else{
+				  zeroModal.success({
+				  	unique: '1',
+				  	opacity: 0.8,
+				  	content: success,
+				  	contentDetail: success1,
+				  	width: '300px',
+				  	height: '280px',
+				  	//okTitle: headcommon2,
+				    ok:false,
+				  	okFn: function() {
+				  
+				  		window.location.href = '../lanhu/index.html'
+				  	},
+				  	onClosed: function() {
+				  		; //location.href='../signin/signin.html'
+				  	},
+				  	onComplete: function(evn) {
+				  		//submitCompany()
+				  		console.log('onComplete')
+				  		setTimeout(function(){
+				  		window.location.href = '../lanhu/index.html'
+				  			zeroModal.close('1');
+				  		},3000);
+				  	}
+				  })
+			   }
 		    }
 		});
 		$("#form").validate()

+ 339 - 195
assets/js/company-register.js

@@ -1,200 +1,344 @@
-$(function(){
-	
- 	  $(document).ready(function () {
-	     
-		 
-	    $('#uploadButton').click(function () {
-	      $('#imagePic').click();
-	    });
-	    $("#imagePic").on("change", function (e) {
-	      var file = e.target.files[0]; //获取图片资源
-	      var fileTypes = ["bmp", "jpg", "png", "jpeg"];
-	      var bTypeMatch = false
-	      for (var i = 0; i < fileTypes.length; i++) {
-	        var start = file.name.lastIndexOf(".");
-	        var fileType = file.name.substring(start + 1);
-	        if (fileType.toLowerCase() == fileTypes[i]) {
-	          bTypeMatch = true;
-	          break;
-	        }
-	      }
-	      if (bTypeMatch) {
-	        if (file.size <= 1024 * 1024 * 10) {
-	          var reader = new FileReader();
-	          reader.readAsDataURL(file); // 读取文件
-	          // 渲染文件
-	          reader.onload = function (arg) {
-				$("#uploadButtonInput").val(arg.target.result);
-	            $("#uploadButton").css("background", "url("+arg.target.result+") no-repeat center")
-				$("#uploadButton").css("border", '1px solid #b8b9ba')
-				$("#uploadButton").css("border-radius",'10px')
-			 $("#uploadButton").css("background-size",'100% 100%')
-			 
-	          }
-	        } else {
-	          alert('仅支持不超过10M的图片');
- 	       
-	          // btnUploadText = '上传'
-	          // $("#uploadButton").text(btnUploadText)
-	          return false;
-	        }
-	      } else {
-	        alert('仅限bmp,jpg,png,jpeg图片格式');
-	      
-	        // btnUploadText = '上传'
-	        // $("#uploadButton").text(btnUploadText)
-	        return false;
-	      }
-	    });
-	  })
-	//---------初始化数据部分-----------
-	var  contact_number_list=["+86","+87","+88"]
-	var  location=[{
-		icon:"🇨🇳",
-		name:"China"
-	},{
-		icon:"🇺🇸",
-		name:"USA"
-	},{
-		icon:"🇪🇸",
-		name:"Spain"
-	}
-	]
-	
-	var province=["aaa","bbb","ccc"]
-	var city=["aaa1","bbb2","ccc3"]
-	//---------初始化数据部分end-----------
-	//页面初始化
-	contact_number_list.forEach(item=>{
-		var li=$("<option>"+item+"</option>")
-		$(".showqulist").append(li)
-	})
-	location.forEach(item=>{
-		var li=$("<option>"+item.icon+' '+item.name+"</li>")
-		$(".showlistLocation1").append(li)
-	})
-	province.forEach(item=>{
-		//var li=$("<li class='contact_location2_li' txt="+item+"><a >"+item+"</a></li>")
-		var li=$("<option>"+item+"</option>")
-		$(".showlistLocation2").append(li)
-	})
-	city.forEach(item=>{
-		//var li=$("<li class='contact_location3_li' txt="+item+"><a >"+item+"</a></li>")
-		var li=$("<option>"+item+"</option>")
-		$(".showlistLocation3").append(li)
-	})
-	
-	
-	var html_contact_number=$("#contact_number").html();
-	var html_contact_email=$("#contact_email").html();
-	var html_contact_location=$("#contact_location").html();
-	
-	
-	$("#contact_number_add").click(function(){
-		$("#contact_number").append(html_contact_number)
-		
+$(function() {
+
+	$(document).ready(function() {
+
+
+		$('#uploadButton').click(function() {
+			$('#imagePic').click();
+		});
+		$("#imagePic").on("change", function(e) {
+			var file = e.target.files[0]; //获取图片资源
+			var fileTypes = ["bmp", "jpg", "png", "jpeg"];
+			var bTypeMatch = false
+			for (var i = 0; i < fileTypes.length; i++) {
+				var start = file.name.lastIndexOf(".");
+				var fileType = file.name.substring(start + 1);
+				if (fileType.toLowerCase() == fileTypes[i]) {
+					bTypeMatch = true;
+					break;
+				}
+			}
+			if (bTypeMatch) {
+				if (file.size <= 1024 * 1024 * 10) {
+					var reader = new FileReader();
+					reader.readAsDataURL(file); // 读取文件
+					// 渲染文件
+					reader.onload = function(arg) {
+						onloadresult(arg.target.result)
+
+
+					}
+				} else {
+					jpalert($(".head_10M").val(),null,"alert");
+				$("#imagePic").val("")
+					// btnUploadText = '上传'
+					// $("#uploadButton").text(btnUploadText)
+					return false;
+				}
+			} else {
+			
+					jpalert($(".head_jpgpng").val(),null,"alert");
+				$("#imagePic").val("")
+				// btnUploadText = '上传'
+				// $("#uploadButton").text(btnUploadText)
+				return false;
+			}
+		});
+	})
+
+
+
+	//---------初始化数据部分-----------
+	var contact_number_list = ["+86", "+87", "+88"]
+	var location = [{
+		icon: "🇨🇳",
+		name: "China"
+	}, {
+		icon: "🇺🇸",
+		name: "USA"
+	}, {
+		icon: "🇪🇸",
+		name: "Spain"
+	}]
+
+	var province = ["aaa", "bbb", "ccc"]
+	var city = ["aaa1", "bbb2", "ccc3"]
+	//---------初始化数据部分end-----------
+	//页面初始化
+	contact_number_list.forEach(item => {
+		var li = $("<option>" + item + "</option>")
+		$(".showqulist").append(li)
+	})
+	location.forEach(item => {
+		var li = $("<option>" + item.icon + ' ' + item.name + "</li>")
+		$(".showlistLocation1").append(li)
+	})
+	province.forEach(item => {
+		//var li=$("<li class='contact_location2_li' txt="+item+"><a >"+item+"</a></li>")
+		var li = $("<option>" + item + "</option>")
+		$(".showlistLocation2").append(li)
+	})
+	city.forEach(item => {
+		//var li=$("<li class='contact_location3_li' txt="+item+"><a >"+item+"</a></li>")
+		var li = $("<option>" + item + "</option>")
+		$(".showlistLocation3").append(li)
+	})
+
+
+
+
+	$("#contact_number_add").click(function() {
+		
+		$("#contact_number").append(html_contact_number)
+
 		$("#contact_number_remove").show()
-	})
-	$("#contact_number_remove").click(function(){
-		 $("#contact_number .row-fluid").eq(-1).remove();
-		 if($("#contact_number .row-fluid").length==1){
-			 $("#contact_number_remove").hide()
-		 }
-	})
-	
-	$("#contact_email_add").click(function(){
-		$("#contact_email").append(html_contact_email)
-		
+		inithtml()
+	})
+	$("#contact_number_remove").click(function() {
+		$("#contact_number .row-fluid").eq(-1).remove();
+		if ($("#contact_number .row-fluid").length == 1) {
+			$("#contact_number_remove").hide()
+		}
+	})
+
+	$("#contact_email_add").click(function() {
+		
+		$("#contact_email").append(html_contact_email)
+
 		$("#contact_email_remove").show()
-	})
-	$("#contact_email_remove").click(function(){
-		 $("#contact_email input").eq(-1).remove();
-		 if($("#contact_email input").length==1){
-			 $("#contact_email_remove").hide()
-		 }
-	})
-	
-	
-	$("#contact_location_add").click(function(){
-		$("#contact_location").append(html_contact_location)
-		
+		inithtml()
+	})
+	$("#contact_email_remove").click(function() {
+		$("#contact_email input").eq(-1).remove();
+		if ($("#contact_email input").length == 1) {
+			$("#contact_email_remove").hide()
+		}
+	})
+
+
+	$("#contact_location_add").click(function() {
+		
+		$("#contact_location").append(html_contact_location)
+
 		$("#contact_location_remove").show()
-	})
-	$("#contact_location_remove").click(function(){
-		 $("#contact_location .row-fluid").eq(-1).remove();
-		 if($("#contact_location .row-fluid").length==1){
-			 $("#contact_location_remove").hide()
-		 }
-	})
-	
- 
-	
+		inithtml()
+	})
+	$("#contact_location_remove").click(function() {
+		$("#contact_location .row-fluid").eq(-1).remove();
+		if ($("#contact_location .row-fluid").length == 1) {
+			$("#contact_location_remove").hide()
+		}
+	})
+
+
+
+
+	$.validator.setDefaults({
+		submitHandler: function() {
+			var submitlogo = $("#uploadButtonInput").val();
+			var success = $(".head_success").val();
+			var warning = $(".head_warning").val();
+			var success1 = $(".signin_success").val();
+			var warning1 = $(".signin_warning").val()
+			var headcommon2 = $(".signin_headcommon2").val()
+
+
+
+			if (!submitlogo) {
+				zeroModal.alert({
+					unique: '1',
+					opacity: 0.8,
+					content: warning,
+					contentDetail: warning1,
+					width: '300px',
+					height: '260px',
+					cancel:true,
+					ok: false,
+					onClosed: function() {
+						; //location.href='../signin/signin.html'
+					},
+					onComplete: function(evn) {
+						console.log('onComplete')
+						setTimeout(function() {
+
+							zeroModal.close('1');
+						}, 3000);
+					}
+				})
+			} else {
+
+				zeroModal.success({
+					unique: '1',
+					opacity: 0.8,
+					content: success,
+					contentDetail: success1,
+					width: '300px',
+					height: '280px',
+					okTitle: headcommon2,
+					//ok:false,
+					okFn: function() {
+
+						window.location.href = './postproject.html'
+					},
+					onClosed: function() {
+						; //location.href='../signin/signin.html'
+					},
+					onComplete: function(evn) {
+						submitCompany()
+						console.log('onComplete')
+						// setTimeout(function(){
+						// 	location.href='../lanhu/index.html'
+						// 	zeroModal.close('1');
+						// },3000);
+					}
+				})
+			}
+		}
+	});
+	$("#form").validate()
+
+	function submitCompany() {
+
+		var obj = {
+
+		}
+		obj.logo = $("#uploadButtonInput").val();
+		obj.introduction = $(".introduction").val()
+
+		$("#form input[type='text']").each(function() {
+			var key = $(this).attr("name")
+			obj[key] = $(this).val()
+		})
+		var i = 0;
+		var sz1 = [];
+		$(".showlistLocation1").each(function() {
+			var ob = {}
+			ob.location1 = $(this).val()
+			ob.location2 = $(".showlistLocation2").eq(i).val()
+			ob.location3 = $(".showlistLocation3").eq(i).val()
+			ob.avenue = $("input[name=Avenue]").eq(i).val()
+			sz1.push(ob)
+			i++;
+		})
+		obj.locationList = sz1;
+
+
+		i = 0;
+		var sz2 = [];
+		$(".showqulist").each(function() {
+			var ob = {}
+			ob.qu = $(this).val()
+			ob.contactNumber = $("input[name=contactNumber]").eq(i).val()
+			sz2.push(ob)
+			i++;
+		})
+		obj.showqulist = sz2;
+
+		i = 0;
+		var sz3 = [];
+		$("input[name=contactEmail]").each(function() {
+			var ob = {}
+			ob.contactEmail = $(this).val()
+			sz3.push(ob)
+			i++;
+		})
+		obj.contactEmailList = sz3;
+
+		window.localStorage.setItem("loginCompany", JSON.stringify(obj));
+	}
+
+
+	$("#registerupload2").click(function(){
+		submitCompany()
+	})
+
+	//页面初始化end
+})
+var html_contact_number = $("#contact_number").html();
+var		html_contact_email = $("#contact_email").html();
+var		html_contact_location = $("#contact_location").html();
+
+function getItemloginCompany() {
+	 html_contact_number = $("#contact_number").html();
+			html_contact_email = $("#contact_email").html();
+			html_contact_location = $("#contact_location").html();
+	
+	var loginCompany = window.localStorage.getItem("loginCompany");
+	if (loginCompany) {
+		loginCompany = JSON.parse(loginCompany);
+		
+		onloadresult(loginCompany.logo)
+		
+		$("#form input[type='text']").each(function() {
+			var key = $(this).attr("name")
+			console.log(key)
+			if(key&&loginCompany[key]){
+				$(this).val(loginCompany[key])
+			}
+		})
+		var i = 0;
+		loginCompany.locationList.forEach(function(){
+			
+			if(i==1){
+				$("#contact_location_remove").show()
+			}
+			var ob=loginCompany.locationList[i]
+			 $(".showlistLocation1").eq(i).val(ob.location1 )
+			 $(".showlistLocation2").eq(i).val(ob.location2 )
+			 $(".showlistLocation3").eq(i).val(ob.location3 )
+			$("input[name=Avenue]").eq(i).val(ob.avenue )
+			i++;
+			$("#contact_location").append(html_contact_location)
+			
+		})
+		i = 0;
+		loginCompany.showqulist.forEach(function(){
+			if(i==1){
+				$("#contact_number_remove").show()
+			}
+			var ob=loginCompany.showqulist[i]
+			 $(".showqulist").eq(i).val(ob.qu )
+			 $("input[name=contactNumber]").eq(i).val(ob.contactNumber )
 		
-		$.validator.setDefaults({
-		    submitHandler: function() {
-				var submitlogo=$("#uploadButtonInput").val();
-				var success=$(".head_success").val();
-				 var warning=$(".head_warning").val();
-				  var success1=$(".signin_success").val();
-				   var warning1=$(".signin_warning").val()
-				   var headcommon2=$(".signin_headcommon2").val()
-				   
-									
-									
-		       if(!submitlogo){
-		            				zeroModal.alert({
-		            					unique:'1',
-		            					opacity:0.8,
-		            					content:warning,
-		            					contentDetail:warning1,
-		            					width:'300px',
-		            					height:'260px',
-									
-		            					ok:false,
-		            					onClosed:function(){
-		            						;//location.href='../signin/signin.html'
-		            					},
-		            					onComplete:function(evn){
-		            						console.log('onComplete')
-		            						setTimeout(function(){
-		            							
-		            							zeroModal.close('1');
-		            						},3000);
-		            					}
-		            				}) 
-		            }else{
-						
-						zeroModal.success({
-							unique:'1',
-							opacity:0.8,
-							content:success,
-							contentDetail:success1,
-							width:'300px',
-							height:'280px',
-								okTitle:headcommon2,
-							//ok:false,
-							okFn:function(){
-								
-								window.location.href='./postproject.html'
-							},
-							onClosed:function(){
-								;//location.href='../signin/signin.html'
-							},
-							onComplete:function(evn){
-								
-								window.localStorage.setItem("loginCompany","1");
-								console.log('onComplete')
-								// setTimeout(function(){
-								// 	location.href='../lanhu/index.html'
-								// 	zeroModal.close('1');
-								// },3000);
-							}
-						}) 
-					}
-		    }
-		});
-		$("#form").validate()
-	
+			i++;
+			$("#contact_number").append(html_contact_number)
+			
+		})
+		i = 0;
+		loginCompany.contactEmailList.forEach(function(){
+			
+			if(i==1){
+				$("#contact_email_remove").show()
+			}
+			var ob=loginCompany.contactEmailList[i]
+			 $("input[name=contactEmail]").eq(i).val(ob.contactEmail )
+			
+			i++;
+			$("#contact_email").append(html_contact_email)
+			
+		})
+		$("#contact_location .row-fluid").eq(-1).remove();
+		$("#contact_number .row-fluid").eq(-1).remove();
+		$("#contact_email input").eq(-1).remove();
 		
-	//页面初始化end
-})
+		 $(".introduction").val(loginCompany.introduction)
+		
+	}
+	
+}
+
+function onloadresult(result) {
+	$("#uploadButtonInput").val(result);
+	$("#uploadButton").css("background", "url(" + result + ") no-repeat center")
+	$("#uploadButton").css("border", '1px solid #b8b9ba')
+	$("#uploadButton").css("border-radius", '10px')
+	$("#uploadButton").css("background-size", '100% 100%')
+}
+
+function inithtml() {
+	try{
+			relanguage()
+	}catch(e){
+		console.log(e)
+	}
+}

+ 35 - 1
assets/js/head.js

@@ -24,4 +24,38 @@ $(function () {
 			 }
 		   
 	  }
-    })
+    })
+	
+function jpalert(text,url,type){
+	var success = $(".head_success").val();
+	
+	if(type==null){
+		type="success"
+	}
+	if(type=="alert"){
+		success= $(".head_warning").val();
+	}
+	zeroModal[type]({
+		unique: '1',
+		opacity: 0.8,
+		content: success,
+		contentDetail: text,
+		width: '300px',
+		height: '280px',
+		ok:false,
+		cancel:true,
+		onClosed: function() {
+			; //location.href='../signin/signin.html'
+		},
+		onComplete: function(evn) {
+			
+			console.log('onComplete')
+			setTimeout(function(){
+				if(url){
+						window.location.href=url
+				}
+				zeroModal.close('1');
+			},3000);
+		}
+	})
+}

+ 13 - 10
assets/js/language.js

@@ -4,14 +4,19 @@ $(function() {
 		loadProperties($(this).val());
 	})
 	var value = window.localStorage.getItem("i18n_default_value");
-	var sz = ["en", "zh", "ot"]
-	var szname = ["English", "Chinese", "Other"]
+	
 	if (value) {
 		default_value = value;
 	}
 	loadProperties(default_value);
 
-	function loadProperties(val) {
+	
+
+ 
+})
+var sz = ["en", "zh", "ot"]
+	var szname = ["English", "Chinese", "Other"]
+function loadProperties(val) {
 		$("#languagelist").empty()
 		window.localStorage.setItem("i18n_default_value", val);
 		for (var i in sz) {
@@ -54,10 +59,8 @@ $(function() {
 
 			}
 		});
-	}
-
-
-
-
-
-})
+	}
+function relanguage(){
+	var value = window.localStorage.getItem("i18n_default_value");
+		loadProperties(value);
+}

+ 10 - 5
assets/plugin/zeroModal/js/zeroModal.js

@@ -19,8 +19,7 @@
 }((function($, undefined) {
 
     var zeroModal = {};
-	var head_cancelTitle=$(".head_cancelTitle").val();
-	var head_okTitle=$(".head_okTitle").val();
+
     /**
      * 默认的参数
      * @type {Object}
@@ -41,10 +40,10 @@
         resize: false, // 是否允许调整大小
         resizeAfterFn: undefined, // 调整大小后触发的事件
         ok: false, //是否启用“ok”按钮,默认false
-        okTitle: head_okTitle, //“ok”按钮的显示值,默认为“确定”
+        okTitle: "", //“ok”按钮的显示值,默认为“确定”
         okFn: false, //点击“ok”按钮触发的事件
         cancel: false, //是否启用“cancel”按钮,默认false
-        cancelTitle: head_cancelTitle, //“cancel”按钮的显示值,默认为“取消”
+        cancelTitle: "", //“cancel”按钮的显示值,默认为“取消”
         cancelFn: true, //点击“cancel”按钮触发的事件
         buttonTopLine: true,
         buttons: [], //自定义的按钮,使用了自定义按钮ok与cancel按钮将不会生效;格式:[{ className: 'zeromodal-btn zeromodal-btn-primary', name: '开始导出' }]
@@ -600,6 +599,10 @@
             } else {
                 // 显示默认提供的按钮
                 if (opt.ok) {
+					if(opt.okTitle==""){
+							opt.okTitle=$(".head_okTitle").val();
+					}
+									
                     var _ok = $('<button zeromodal-btn-ok="' + opt.unique + '" class="zeromodal-btn zeromodal-btn-primary">' + opt.okTitle + '</button>');
                     $('[zeromodal-btn-container="' + opt.unique + '"]').append(_ok);
                     _ok.click(function() {
@@ -615,6 +618,7 @@
                     });
                 }
                 if (opt.cancel) {
+					 
                     var _cancel = $('<button zeromodal-btn-cancel="' + opt.unique + '" class="zeromodal-btn zeromodal-btn-default">' + opt.cancelTitle + '</button>');
                     $('[zeromodal-btn-container="' + opt.unique + '"]').append(_cancel);
                     _cancel.click(function() {
@@ -638,7 +642,8 @@
     function _buildAlertInfo(opt) {
         // 初始化
         if (typeof opt === 'undefined' || typeof opt.cancelTitle === 'undefined') {
-            opt.cancelTitle = '取消';
+            //opt.cancelTitle = '取消';
+			opt.cancelTitle=$(".head_cancelTitle").val();
         }
 
         var params = _initParams(opt);

+ 15 - 2
html/company/postproject.html

@@ -11,6 +11,8 @@
 
 		<link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
 		<script src="/lanhu-bootstrap/assets/js/company-postproject.js"></script>
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
 
 	</head>
 	<body>
@@ -23,7 +25,13 @@
 				});
 			})
 		</script>
-		<main class="jpmain">
+		<main class="jpmain">
+			<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+			<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+			<input type="hidden" class="signin_success i18n-input"  i18n="company_postproject_success" />
+			<input type="hidden" class="signin_warning i18n-input"  i18n="company_postproject_warning" />
+ 			
+			
 			<form id="form">
 
 				<div class=" jpcontainer" >
@@ -288,6 +296,11 @@
 								</div>
 						</div>
 			</form>
-		</main>
+		</main>
+		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+			<script src="../../js/ie10-viewport-bug-workaround.js"></script>
+			
+			<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
+		
 	</body>
 </html>

+ 21 - 37
html/company/register.html

@@ -5,6 +5,7 @@
 		<title></title>
 		<script src="/lanhu-bootstrap/js/jquery-1.9.1.min.js"></script>
 		<script src="/lanhu-bootstrap/js/jquery.validate.min.js"></script>
+		
  		<script src="/lanhu-bootstrap/assets/js/language_validator.js"></script>
  		
 		<script src="/lanhu-bootstrap/js/jquery.i18n.properties.js"></script>
@@ -28,7 +29,10 @@
 		<div id="head"></div>
 		<script>
 			$(function() {
-				$("#head").load("../head.html");
+				$("#head").load("../head.html",function(){
+					getItemloginCompany()
+				});
+				
 			})
 		</script>
 		<main class="jpmain">
@@ -95,7 +99,7 @@
 								Company logo
 							</dt>
 							<dd>
-								<input id="uploadButtonInput" class="i18n-placeholder" i18n="company_register_enter Company logo" placeholder="enter Company logo" type="hidden" />
+								<input id="uploadButtonInput"   type="hidden" />
 								<button id="uploadButton" type="button" class="btnUpload" style="
 									width: 85px;
 								    height: 85px;
@@ -156,13 +160,7 @@
 									<div class="row-fluid" style="    margin-top: 4px;" >
 
 										<div class="span4">
-											<!-- <div class="btn-group">
-												<button class="btn "><span class="showqu"></span></button> <button data-toggle="dropdown"
-													class="btn dropdown-toggle"><span class="caret"></span></button>
-												<ul class="dropdown-menu showqulist" >
-													
-												</ul>
-											</div> -->
+											 
 											<select class="showqulist form-control" >
 												
 											</select>
@@ -176,7 +174,7 @@
 								<dd>
 									
 									
-									<button 
+									<button  type="button"
 									id="contact_number_add"
 									style="
 										width: 50px;
@@ -184,7 +182,7 @@
 									    border: 0px;
 									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 									
-									<button
+									<button  type="button"
 									id="contact_number_remove"
 									style="
 										display: none;
@@ -206,7 +204,7 @@
 									<input required	  name="contactEmail"	type="email" class="i18n-placeholder" i18n="company_register_enter email" placeholder="enter email" style="    margin-bottom: 4px;" />
 								</dd>
 								<dd>
-									<button 
+									<button   type="button"
 										id="contact_email_add"
 									style="
 										width: 50px;
@@ -214,7 +212,7 @@
 									    border: 0px;
 									background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 									
-									<button
+									<button  type="button"
 									id="contact_email_remove"
 									style="
 									background: url(/lanhu-bootstrap/assets/img/company_remove_icon.png);
@@ -238,14 +236,7 @@
 						
 						<div class="span7">
 							<div class="span4">
-								<!-- <div class="btn-group">
-									<button class="btn"><span class="showqu1">🇨🇳  China</span></button> <button data-toggle="dropdown"
-										class="btn dropdown-toggle"><span class="caret"></span></button>
-									<ul class="dropdown-menu showlistLocation1" >
-										 
-										 
-									</ul>
-								</div> -->
+								 
 								<select class="showlistLocation1 form-control" >
 									
 								</select>
@@ -257,16 +248,7 @@
 								</select>
 							</div>
 							<div class="span4">
-							<!-- 	<div class="btn-group">
-
-									<button class="btn" style="width: 80%;"><span class="showqu3">city</span></button> <button style="width: 20%;"
-										data-toggle="dropdown" class="btn dropdown-toggle"><span
-											class="caret"></span></button>
-									<ul class="dropdown-menu showlistLocation3">
-									 
-										
-									</ul>
-								</div> -->
+							 
 								<select class="showlistLocation3 form-control"  >
 									
 								</select>
@@ -277,7 +259,7 @@
 						</div>
 					</dd>
 					<dd>
-						<button 
+						<button   type="button"
 						id="contact_location_add"
 						style="
 						  
@@ -287,7 +269,7 @@
 						background: url(/lanhu-bootstrap/assets/img/company_add_icon.png);"></button>
 						
 						
-						<button
+						<button  type="button"
 						id="contact_location_remove"
 						style="
 							display: none;
@@ -313,7 +295,7 @@
 						</dt>
 						<dd>
 							<div class="input-group" style="  width: 100%;">
-								<input type="text" class="form-control"  placeholder="" />
+								<input type="text" class="form-control" name="people"  placeholder="" />
 								<span  i18n="company_register_people" class="i18n-text input-group-addon" style="width: 80px;"> people</span>
 							</div>
 							
@@ -326,7 +308,7 @@
 							Disciplines
 						</dt>
 						<dd>
-								<input required type="text"  placeholder="" />
+								<input required type="text"  name="Disciplines"  placeholder="" />
 						</dd>
 					</div>
 				</div>
@@ -336,12 +318,14 @@
 							Company  introduction
 						</dt>
 						<dd>
-							<textarea  required  maxlength="500" style="height: 90px;" rows="3" class="i18n-placeholder" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
+							<textarea  required  maxlength="500" style="height: 90px;" rows="3" class="i18n-placeholder introduction" i18n="company_register_introduction" placeholder="A  short company introduction…"></textarea>
 						</dd>
 					</div>
 
 				</div>
 				<div class="row-fluid">
+<!-- 					<button   type="button" id="registerupload2" style="  float: right; ">aaa</button>
+ -->					
 					<button   type="submit" id="registerupload" class="hbutton i18n-text" i18n="company_register_upload" style="  float: right; ">upload</button>
 				</div>
 			</div>
@@ -349,7 +333,7 @@
 		</main>
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 		<script src="../../js/ie10-viewport-bug-workaround.js"></script>
-		<script src="../../assets/js/signin.js"></script>
+	
 		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
 	</body>
 </html>

+ 19 - 1
html/head.html

@@ -8,7 +8,12 @@
 
 <link rel="stylesheet" href="/lanhu-bootstrap/css/head.css">
 <link rel="stylesheet" href="/lanhu-bootstrap/css/bootstrap.min.css"
-	integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+	integrity="sha384-HSMxcRTRxnN+Bdg0JdbxYKrThecOKuH5zCYotlSAcp1+c8xmyTe9GYg1l9a69psu" crossorigin="anonymous">
+	
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/zeroModal.css">
+<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
+
+	
 <style>
 #common-navbar-head .dropdown-menu{
 	top:80%;
@@ -18,8 +23,16 @@
 }
 
 </style>
+	<input type="hidden" class="head_success i18n-input"  i18n="head_success" />
+			<input type="hidden" class="head_warning i18n-input"  i18n="head_warning" />
+		
+		
 <input type="hidden" class="head_okTitle i18n-input"  i18n="head_okTitle" />
 		<input type="hidden" class="head_cancelTitle i18n-input"  i18n="head_cancelTitle" />
+<input type="hidden" class="head_10M i18n-input"  i18n="head_10M" />
+		<input type="hidden" class="head_jpgpng i18n-input"  i18n="head_jpgpng" />
+		
+		
 		
 <div class="container-fluid" id="common-navbar-head" style="
     padding: 0px;
@@ -127,3 +140,8 @@
 		</div>
 	</div>
 </div>
+	<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
+			<script src="../../js/ie10-viewport-bug-workaround.js"></script>
+			
+			<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
+		

+ 5 - 1
i18n/strings.properties

@@ -5,7 +5,8 @@ head_warning=warning
 head_okTitle=OK
 head_cancelTitle=cancel
 
-
+head_10M=only pictures up to 10m are supported
+head_jpgpng=BMP, JPG, PNG, JPEG picture format only
 
 
 headcommon1=Sign up /Sign in
@@ -20,6 +21,9 @@ headcommon8=Sign out
 company_register_success=The company information has been uploaded successfully
 company_register_warning=Please upload the company logo
 
+company_postproject_success=Share success
+company_postproject_warning=At least one picture last time
+
 
 signOut=Login Out
 

+ 5 - 0
i18n/strings_zh.properties

@@ -6,6 +6,8 @@ head_warning=警告
 
 head_okTitle=确定
 head_cancelTitle=关闭
+head_10M=仅支持不超过10M的图片
+head_jpgpng=仅限bmp,jpg,png,jpeg图片格式
 
 headcommon1=注册/登录
 headcommon2=发布项目
@@ -19,6 +21,9 @@ headcommon8=注销
 company_register_success=公司信息已经更新成功
 company_register_warning=上传公司logo
 
+company_postproject_success=分享成功
+company_postproject_warning=至少选择一张图片上传
+
 
 signin_success=登陆成功
 signup_success=您的帐户已成功注册

File diff suppressed because it is too large
+ 0 - 3
js/jquery.validate.min.js


Some files were not shown because too many files changed in this diff