Преглед изворни кода

根据要求调整部分页面

chenwen пре 3 година
родитељ
комит
6b168454b5

+ 59 - 27
assets/js/company-register.js

@@ -67,13 +67,16 @@ $(function() {
 	//页面初始化
 	contact_number_list.forEach(item => {
 		var li = $("<option>" + item + "</option>")
-		$(".showqulist").append(li)
+		$(".showqulist").append(li)  //联系电话-区号
 	})
+	let selHtml=[];
 	location.forEach(item => {
-		var li = $("<option>" + item.icon + ' ' + item.name + "</li>")
-		$(".showlistLocation1").append(li)
+		selHtml.push("<option>" + item.icon + ' ' + item.name + "</li>");
 	})
-	province.forEach(item => {
+	$(".region-select").append(selHtml.join(""));
+	
+	//省,市已改为文本框不需要下拉初始化了
+	/* province.forEach(item => {
 		//var li=$("<li class='contact_location2_li' txt="+item+"><a >"+item+"</a></li>")
 		var li = $("<option>" + item + "</option>")
 		$(".showlistLocation2").append(li)
@@ -82,40 +85,31 @@ $(function() {
 		//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-list > .contact-box").prop("outerHTML")).insertBefore(".contact-tool");
 
-		$("#contact_number_remove").show()
+		$("#contact_number_remove").show()
+		
 		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-list > .contact-box").eq(-1).remove();
 		
-		$("#contact_email").append(html_contact_email)
-
-		$("#contact_email_remove").show()
-		inithtml()
-	})
-	$("#contact_email_remove").click(function() {
-		$("#contact_email input").eq(-1).remove();
-		if ($("#contact_email input").length == 1) {
-			$("#contact_email_remove").hide()
+		if ($(".contact-list > .contact-box").length <= 1) {
+			$("#contact_number_remove").hide()
 		}
 	})
 
+	
 
+	//公司地址增加
 	$("#contact_location_add").click(function() {
 		
 		$("#contact_location").append(html_contact_location)
@@ -123,6 +117,7 @@ $(function() {
 		$("#contact_location_remove").show()
 		inithtml()
 	})
+	//公司地址移除
 	$("#contact_location_remove").click(function() {
 		$("#contact_location .row-fluid").eq(-1).remove();
 		if ($("#contact_location .row-fluid").length == 1) {
@@ -209,6 +204,10 @@ $(function() {
 			var key = $(this).attr("name")
 			obj[key] = $(this).val()
 		})
+		
+		obj['Disciplines']=$("#Discipline").val();  //Discipline 改为下拉框后单独取值
+		
+		
 		var i = 0;
 		var sz1 = [];
 		$(".showlistLocation1").each(function() {
@@ -222,7 +221,7 @@ $(function() {
 		})
 		obj.locationList = sz1;
 
-
+		/*
 		i = 0;
 		var sz2 = [];
 		$(".showqulist").each(function() {
@@ -243,6 +242,16 @@ $(function() {
 			i++;
 		})
 		obj.contactEmailList = sz3;
+		*/
+	    var contacters=[],contacter=null;
+	    $(".contact-box").each(function(idx,itm) {
+			contacter={};
+			$(itm).find("input[name],select[name]").each(function(el){
+				contacter[el.name]=$(el).val();
+			});
+		});
+		
+		obj.contacters=contacters;
 
 		window.localStorage.setItem("loginCompany", JSON.stringify(obj));
 	}
@@ -252,10 +261,11 @@ $(function() {
 		submitCompany()
 	})
 
+	initDisciplinesSelect();
 	//页面初始化end
 })
-var html_contact_number = $("#contact_number").html();
-var		html_contact_email = $("#contact_email").html();
+//var html_contact_number = $("#contact_number").html();
+//var		html_contact_email = $("#contact_email").html();
 var		html_contact_location = $("#contact_location").html();
 
 function getItemloginCompany() {
@@ -341,4 +351,26 @@ function inithtml() {
 	}catch(e){
 		console.log(e)
 	}
+}
+
+function initDisciplinesSelect(){
+	
+	var opts = [" Masterplanning"," Architecture"," Interiors", "Lighting"," Landscape"," AV & Acoustics"," MEP"," Art work & Accessories"," Graphics & Signage"," Branding"," Furniture, Lighting"];
+	$("#selectDisciplines").empty();
+	let html=[];
+	opts.forEach(function(item) {
+		html.push(`<option>${item}</option>`);
+	})
+	$("#selectDisciplines").append(html.join(""));
+	
+	$('#selectDisciplines').selectpicker({
+		template: {
+			caret: '<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
+		}
+	});
+	$('#selectDisciplines').on('changed.bs.select', function (e, clickedIndex, isSelected, prestate,currentVal) {
+	   console.log(currentVal);
+	   $("#Discipline").val(currentVal);
+	});
+
 }

+ 13 - 0
assets/js/landingpage.js

@@ -2,6 +2,14 @@ var selectLocation = ["Canada", "China", "France", "Germany"];
 var selectLocation2 = ["China"];
 
 $(function() {
+	
+	$(".dropdown").mouseover(function () {
+	    $(this).addClass("open");
+	});
+	
+	$(".dropdown").mouseleave(function(){
+	    $(this).removeClass("open");
+	})
 
 	var selectDisciplines = [" Masterplanning"," Architecture"," Interiors", "Lighting"," Landscape"," AV & Acoustics"," MEP"," Art work & Accessories"," Graphics & Signage"," Branding"," Furniture, Lighting"];
 	
@@ -132,6 +140,11 @@ $(function() {
 			caret: '<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
 		}
 	});
+	
+	$('#filter-select').on('changed.bs.select', function (e, clickedIndex, isSelected, prestate,currentVal) {
+	   
+	   alert(currentVal);
+	});
 
 	$.getJSON("../../assets/js/landingpage_photos.json", function(data) {
 		const tmphtml = template("flow-photos", {

+ 4 - 4
html/company/company_main.html

@@ -172,11 +172,11 @@
 			.imgoption {
 				height:  0px;
 				background-color: #e5e8ec;
-				    top: -95px;
-				    left: 60%;
-				    width: 80px;
+				top: -95px;
+				left: 50%;
+				width: 80px;
 				position: relative;
-				
+				margin-left:-40px;
 				display: none;
 			}
 			.imgoption span {

+ 82 - 56
html/company/register.html

@@ -13,8 +13,9 @@
 		<link rel="stylesheet" href="../../css/head.css">
 		<script src="../../assets/js/company-register.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/zeroModal.css">
 		<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
+		<link rel="stylesheet" type="text/css" href="../../assets/plugin/bootstrap-select/css/bootstrap-select.css"/>
 
 	</head>
 	<body>
@@ -84,6 +85,16 @@
 						width: 20%;
 						height: 48px;
 					}
+					.bootstrap-select > .dropdown-toggle {
+						padding-top:13px;
+						padding-bottom: 13px;
+						padding-right: 32px;
+					}
+					
+					.contact-list .contact-box{
+						margin:0px 0px 15px 0px;
+						background-color: #f8f8f8;
+					}
 				</style>
 				<div class="row-fluid">
 					<div class="span12">
@@ -131,7 +142,7 @@
 
 					</div>
 				</div>
-				<div class="row-fluid">
+				<!-- <div class="row-fluid">
 					<div class="span6">
 						<dt class="jph3  i18n-text" i18n="company_register_Contact person name">
 							Contact person name
@@ -148,9 +159,35 @@
 							<input required name="region" type="text" class="i18n-placeholder" i18n="company_register_title region" placeholder="title region" />
 						</dd>
 					</div>
-				</div>
-				<div class="row-fluid">
-					<div class="span12">
+				</div> -->
+				<div class="row-fluid contact-list">
+					<div class="span12 contact-box">
+						<div class="row-fluid">
+							<div class="span4">
+								<dt class="jph3  i18n-text" i18n="company_register_Contact person name">
+									Contact person name
+								</dt>
+								<dd>
+									<input required type="text" name="personName" class="i18n-placeholder" i18n="company_register_your name" placeholder="your name" />
+								</dd>
+							</div>
+							<div class="span4">
+								<dt class="jph3 i18n-text" i18n="company_register_Title">
+									Title
+								</dt>
+								<dd>
+									<input required name="region" type="text" class="i18n-placeholder" i18n="company_register_Title" placeholder="title" />
+								</dd>
+							</div>
+							<div class="span4">
+								<dt class="jph3 i18n-text" i18n="company_register_Region">
+									Region
+								</dt>
+								<dd>
+									<select class="region-select form-control"></select>
+								</dd>
+							</div>
+						</div>
 						<div class="row-fluid">
 							<div class="span6">
 								<dt class="jph3 i18n-text" i18n="company_register_Contact number">
@@ -171,30 +208,7 @@
 										
 									</div>
 								</dd>
-								<dd>
-									
-									
-									<button  type="button"
-									id="contact_number_add"
-									style="
-										width: 50px;
-									    height: 50px;
-									    border: 0px;
-									background: url(../../assets/img/company_add_icon.png);"></button>
-									
-									<button  type="button"
-									id="contact_number_remove"
-									style="
-										display: none;
-										width: 50px;
-										background: url(../../assets/img/company_remove_icon.png);
-										
-									    height: 50px;
-									    border: 0px;"
-										
-									></button>
-
-								</dd>
+								
 							</div>
 							<div class="span6">
 								<dt class="jph3 i18n-text" i18n="company_register_Contact Email">
@@ -203,28 +217,36 @@
 								<dd id="contact_email">
 									<input required	  name="contactEmail"	type="email" class="i18n-placeholder" i18n="company_register_enter email" placeholder="enter email" style="    margin-bottom: 4px;" />
 								</dd>
-								<dd>
-									<button   type="button"
-										id="contact_email_add"
-									style="
-										width: 50px;
-									    height: 50px;
-									    border: 0px;
-									background: url(../../assets/img/company_add_icon.png);"></button>
-									
-									<button  type="button"
-									id="contact_email_remove"
-									style="
-									background: url(../../assets/img/company_remove_icon.png);
-									
-										display: none;
-										width: 50px;
-									    height: 50px;
-									    border: 0px;"
-									></button>
-								</dd>
+								
 							</div>
 						</div>
+						
+					</div>
+					<div class="contact-tool">
+						<dd>
+							
+							
+							<button  type="button"
+							id="contact_number_add"
+							style="
+								width: 50px;
+							    height: 50px;
+							    border: 0px;
+							background: url(../../assets/img/company_add_icon.png);"></button>
+							
+							<button  type="button"
+							id="contact_number_remove"
+							style="
+								display: none;
+								width: 50px;
+								background: url(../../assets/img/company_remove_icon.png);
+								
+							    height: 50px;
+							    border: 0px;"
+								
+							></button>
+						
+						</dd>
 					</div>
 				</div>
 				<div class="row-fluid">
@@ -237,15 +259,15 @@
 						<div class="span7">
 							<div class="span4">
 								 
-								<input type="text"  name="Country" class="i18n-placeholder" i18n="company_postproject_Country" placeholder="Country …" />
+								<input type="text"  name="Country" class="i18n-placeholder showlistLocation1" i18n="company_postproject_Country" placeholder="Co/div>untry …" />
 							</div>
 							<div class="span4">
 								
-								<input type="text"  name="Province" class="i18n-placeholder" i18n="company_postproject_Province" placeholder="Province …" />
+								<input type="text"  name="Province" class="i18n-placeholder showlistLocation2" i18n="company_postproject_Province" placeholder="Province …" />
 							</div>
 							<div class="span4">
 							 
-								<input type="text"  name="City" class="i18n-placeholder" i18n="company_postproject_City" placeholder="City..." />
+								<input type="text"  name="City" class="i18n-placeholder showlistLocation3" i18n="company_postproject_City" placeholder="City..." />
 							</div>
 						</div>
 						<div class="span5"> <input type="text"  name="Avenue"  class="i18n-placeholder" i18n="company_register_Avenue …" placeholder="Avenue …" />
@@ -302,7 +324,11 @@
 							Disciplines
 						</dt>
 						<dd>
-								<input required type="text"  name="Disciplines"  placeholder="" />
+								<!-- <input required type="text"  name="Disciplines"  placeholder="" /> -->
+								<input type="hidden" name="Disciplines" id="Discipline">
+								<select id="selectDisciplines" class="selectpicker" multiple data-width="100%">
+								 
+								</select>
 						</dd>
 					</div>
 				</div>
@@ -318,8 +344,7 @@
 
 				</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>
@@ -327,7 +352,8 @@
 		</main>
 		<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
 		<script src="../../js/ie10-viewport-bug-workaround.js"></script>
-	
+		<script src="../../js/bootstrap.min.js"></script>
 		<script src="../../assets/plugin/zeroModal/js/zeroModal.js"></script>
+		<script src="../../assets/plugin/bootstrap-select/js/bootstrap-select.js"></script>
 	</body>
 </html>

+ 17 - 4
html/landingpage/landingpage.html

@@ -86,13 +86,21 @@
 			    padding-bottom: 10px;
 				padding-right: 32px;
 			}
-			.search-list .search-item .sel-icon{
+			.search-list .search-item .sel-icon,.newest-list .sel-icon{
 				position: absolute;
 				top: 50%;
 				right: 10px;
 				margin-top: -7px;
 				vertical-align: middle;
 			}
+			.filter-menu .dropdown-toggle{
+				border:0px !important;
+				outline: 0px !important;
+				background-color: #ffffff !important;
+			}
+			.filter-menu .dropdown-toggle:focus{
+				outline: 0px !important;
+			}
 			.my-select{width:280px !important;}
 			
 			.project-box .thumbnail{
@@ -263,9 +271,14 @@
 				</style>
 				
 				<div class="newest-list" style="margin-top:30px;">
-					<div class="newest-item i18n-text" i18n="landingpage_Newest"
-					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<!-- <div class="newest-item query">All</div> -->
+					<div style="margin-right:15px;">
+						<select class="selectpicker filter-menu" data-width="100px" id="filter-select">
+						  <option class="i18n-text" i18n="landingpage_filter_newest">Newest</option>
+						  <option class="i18n-text" i18n="landingpage_filter_popular">Popular</option>
+						  <option class="i18n-text" i18n="landingpage_filter_clicked">Clicked</option>
+						</select>
+					</div>
+					
 					
 					<div class="newest-list-pro ">
 					

+ 5 - 1
i18n/strings.properties

@@ -62,6 +62,9 @@ landingpage_Disciplines=Disciplines
 landingpage_By project=By project
 landingpage_By company=By company
 landingpage_SearchBy=Search By
+landingpage_filter_newest=Newest
+landingpage_filter_popular=Popular
+landingpage_filter_clicked=Clicked
 
 
 
@@ -173,7 +176,8 @@ company_register_Company logo=Company logo
 company_register_enter Company logo=enter Company logo
 company_register_Company name=Company name
 company_register_Contact person name=Contact person name
-company_register_Title region=Title region
+company_register_Title=Title
+company_register_Region=Region
 company_register_Contact number=Contact number
 company_register_Contact Email=Contact Email
 company_register_Company location=Company location

+ 5 - 1
i18n/strings_zh.properties

@@ -64,6 +64,9 @@ landingpage_Disciplines=规划
 landingpage_By project=通过项目
 landingpage_By company=通过公司
 landingpage_SearchBy=通过以下搜索
+landingpage_filter_newest=最新
+landingpage_filter_popular=流行
+landingpage_filter_clicked=访问过
 
 company_register_success=公司信息已经更新成功
 company_register_warning=上传公司logo
@@ -166,7 +169,8 @@ company_register_Company logo=公司标志
 company_register_enter Company logo=输入公司标识
 company_register_Company name=公司名称
 company_register_Contact person name=联系人姓名
-company_register_Title region=产权地区
+company_register_Title=产权
+company_register_Region=地区
 company_register_Contact number=联系电话
 company_register_Contact Email=联系电子邮件
 company_register_Company location=公司所在地