调整

assets/js/company_main.js

@@ -7,6 +7,19 @@ $(function(){
 		$("#project-photo-row").append(tmphtml);
 	});
 	
+	$(".query").click(function(){
+		$("#project-photo-row").empty();
+		
+		$.getJSON("../../assets/js/landingpage_photos.json", function (data) {
+			data=data.sort(()=>{
+				return Math.random()>0.5?-1:1
+			})
+			const tmphtml=template("flow-photos",{photos:data});
+			
+			$("#project-photo-row").append(tmphtml);
+		});
+	})
+	
 	$(".contact-btn").on("click",function(){
 		window.open("../company/company_contact.html");
 	});

assets/js/landingpage.js

@@ -1,5 +1,81 @@
 $(function(){
 	
+	var selectLocation=["Canada","China","France","Germany"];
+	var selectDisciplines=["Architecture","Landscape","AV","Mustard","Landscape"];
+	
+	var resentlist=window.localStorage.getItem("resentlist")
+	var trendinglist=[
+		"Interior","Architecture","Masterplanning","Lighting"
+		,"Landscape","Acoustics","MEP","Art work & Accessories",
+	]
+	addlistBtn(".trendinglist",trendinglist)
+	if(resentlist){
+		resentlist=JSON.parse(resentlist)
+		addlistBtn(".resentlist",resentlist)
+	}else{
+		resentlist=[]
+	}
+	$(".search-item").on("click",'.querybtnli',function(){
+		
+		var value=$(this).text()
+		$(".landingpage_search").val(value);
+		$(".querybtn").click()
+	})
+	$(".querybtn").click(function(){
+		resentlistAdd($(".landingpage_search").val())
+	})
+	
+	
+	function resentlistAdd(name){
+		if(!name){
+			var i=resentlist.unshift(name)
+			var num=4
+			if(i>num){
+				resentlist=resentlist.slice(0,num)
+			}
+			window.localStorage.setItem("resentlist",JSON.stringify(resentlist))
+			
+			return
+		}
+		
+		addlistBtn(".resentlist",resentlist)
+		$("#project-photo-row").empty();
+		
+		$.getJSON("../../assets/js/landingpage_photos.json", function (data) {
+			data=data.sort(()=>{
+				return Math.random()>0.5?-1:1
+			})
+			const tmphtml=template("flow-photos",{photos:data});
+			
+			$("#project-photo-row").append(tmphtml);
+		});
+	}
+	addlistSelect(".selectDisciplines",selectDisciplines)
+	addlistSelect(".selectLocation",selectLocation)
+	
+	function addlistSelect(name,list){
+		$(name).empty()
+		list.forEach(function(item){
+			var btn=$('<option>'+item+'</option>')
+			
+			$(name).append(btn)
+		})
+	}
+	function addlistBtn(name,list){
+		$(name).empty()
+		list.forEach(function(item){
+			var btn=$('<button class="btn btn-lg  querybtnli">'+item+'</button>')
+			
+			$(name).append(btn)
+		})
+	}
+	$(".query").click(function(){
+		resentlistAdd($(this).text())
+	
+	})
+	
+	
+	
 	$('.selectpicker').selectpicker({
 		template:{
 			caret:'<span class="sel-icon glyphicon glyphicon-menu-down"></span>'
@@ -11,8 +87,7 @@ $(function(){
 		
 		$("#project-photo-row").append(tmphtml);
 	});
-	
-	
+
 	$("#project-photo-row").on("click",".thumbnail img",function(){
 		
 		var loginUser= window.localStorage.getItem("loginUser");

assets/js/moments.js

@@ -1,5 +1,78 @@
 $(function() {
-
+
+var selectLocation=["Canada","China","France","Germany"];
+	var selectDisciplines=["Architecture","Landscape","AV","Mustard","Landscape"];
+	
+	var resentlist=window.localStorage.getItem("resentlist")
+	var trendinglist=[
+		"Interior","Architecture","Masterplanning","Lighting"
+		,"Landscape","Acoustics","MEP","Art work & Accessories",
+	]
+	addlistBtn(".trendinglist",trendinglist)
+	if(resentlist){
+		resentlist=JSON.parse(resentlist)
+		addlistBtn(".resentlist",resentlist)
+	}else{
+		resentlist=[]
+	}
+	$(".search-item").on("click",'.querybtnli',function(){
+		
+		var value=$(this).text()
+		$(".landingpage_search").val(value);
+		$(".querybtn").click()
+	})
+	$(".querybtn").click(function(){
+		resentlistAdd($(".landingpage_search").val())
+	})
+	
+	
+	function resentlistAdd(name){
+		if(!name){
+			var i=resentlist.unshift(name)
+			var num=4
+			if(i>num){
+				resentlist=resentlist.slice(0,num)
+			}
+			window.localStorage.setItem("resentlist",JSON.stringify(resentlist))
+			
+		}
+	
+		addlistBtn(".resentlist",resentlist)
+		
+		$(".imguploadlist").empty();
+		data=data.sort(()=>{
+			return Math.random()>0.5?-1:1
+		})
+		const tmphtml = template("flow-photos", {
+			objs: data
+		});
+		$(".imguploadlist").append(tmphtml);
+		
+	}
+	addlistSelect(".selectDisciplines",selectDisciplines)
+	addlistSelect(".selectLocation",selectLocation)
+	
+	function addlistSelect(name,list){
+		$(name).empty()
+		list.forEach(function(item){
+			var btn=$('<option>'+item+'</option>')
+			
+			$(name).append(btn)
+		})
+	}
+	function addlistBtn(name,list){
+		$(name).empty()
+		list.forEach(function(item){
+			var btn=$('<button class="btn btn-lg  querybtnli">'+item+'</button>')
+			
+			$(name).append(btn)
+		})
+	}
+	$(".query").click(function(){
+		resentlistAdd($(this).text())
+	
+	})
+	
 	var data = [
 		{
 		logo: "/lanhu-bootstrap/assets/img/SketchPngff4baa52e24274f171eff0ccc6e01f1890b55b11bafffb477ce1f23bc465c249.png",

html/company/company_main.html

@@ -134,16 +134,16 @@
 			<div class="tool-box">
 				<div class="newest-list">
 					<div class="newest-item  i18n-text" i18n="landingpage_Newest" style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<div class="newest-item">All</div>
-					<div class="newest-item">x &nbsp;Masterplanning</div>
-					<div class="newest-item">Architecture</div>
-					<div class="newest-item">Interiors</div>
-					<div class="newest-item">Lighting</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">AV&nbsp;&amp;&nbsp;Acoustics</div>
-					<div class="newest-item">MEP</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">Landscape</div>
+					<div class="newest-item query">All</div>
+					<div class="newest-item query">x &nbsp;Masterplanning</div>
+					<div class="newest-item query">Architecture</div>
+					<div class="newest-item query">Interiors</div>
+					<div class="newest-item query">Lighting</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">AV&nbsp;&amp;&nbsp;Acoustics</div>
+					<div class="newest-item query">MEP</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">Landscape</div>
 					<div style="flex:1;"></div>
 					<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
 				</div>

html/landingpage/landingpage.html

@@ -125,23 +125,23 @@
 				<div class="newest-list">
 					<div class="newest-item i18n-text" i18n="landingpage_Newest"
 					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<div class="newest-item">All</div>
-					<div class="newest-item">x &nbsp;Masterplanning</div>
-					<div class="newest-item">Architecture</div>
-					<div class="newest-item">Interiors</div>
-					<div class="newest-item">Lighting</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">AV&nbsp;&amp;&nbsp;Acoustics</div>
-					<div class="newest-item">MEP</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">Landscape</div>
+					<div class="newest-item query">All</div>
+					<div class="newest-item query">x &nbsp;Masterplanning</div>
+					<div class="newest-item query">Architecture</div>
+					<div class="newest-item query">Interiors</div>
+					<div class="newest-item query">Lighting</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">AV&nbsp;&amp;&nbsp;Acoustics</div>
+					<div class="newest-item query">MEP</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">Landscape</div>
 					<div style="flex:1;"></div>
 					<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
 				</div>
 				
 				<div class="search-list" style="margin-top:30px;">
 					<div class="search-item">
-						<label class="i18n-text"  i18n="landingpage_Newest">Location</label>
+						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
 						<select class="selectpicker">
 						  <option class="i18n-text"  i18n="landingpage_By project" >By project</option>
 						  <option class="i18n-text"  i18n="landingpage_By company">By company</option>
@@ -151,11 +151,8 @@
 					
 					<div class="search-item">
 						<label>&nbsp;</label>
-						<select class="selectpicker" multiple>
-						  <option>Canada</option>
-						  <option>China</option>
-						  <option>France</option>
-						  <option>Germany</option>
+						<select class="selectpicker selectLocation" multiple>
+						  
 						</select>
 						
 					</div>
@@ -164,36 +161,72 @@
 					
 					<div class="search-item">
 						<label class="i18n-text"  i18n="landingpage_Disciplines"  >Disciplines</label>
-						<select class="selectpicker my-select" multiple>
-						  <option>Architecture</option>
-						  <option>Landscape</option>
-						  <option>AV</option>
-						  <option>Mustard</option>
-						  <option>Landscape</option>
+						<select class="selectpicker my-select selectDisciplines" multiple>
+						 
 						</select>
 					</div>
 					
 					
 					<div class="search-item">
 						 <label style="display: block;">&nbsp;</label>
-						 <button type="button" class="btn btn-default i18n-text" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
+						 <button type="button" class="btn btn-default i18n-text querybtn" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
 					</div>
 					
 					<div style="flex:1;"></div>
 					
 					<div class="search-item">
 						<label style="display: block;">&nbsp;</label>
+						
+					
 						<div class="input-group">
-						  <input type="text" class="form-control i18n-placeholder" i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;">
+						  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
+						  i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;    width: 300px;">
 						  <span class="input-group-addon" style="
 									padding: 0px;
 								" id="basic-addon2">
-							  <button type="button" style="    width: 50px;
+							  <button type="button" class="querybtn" style="    width: 50px;
 									height: 40px; border: 0;">
-								    <i class="glyphicon glyphicon-search"></i>
+								    <i class="glyphicon glyphicon-search query"></i>
 							  </button>
 							
 							  </span>
+							  <style>
+							  .filterstyle{
+								    padding: 20px;
+								      width: 460px;
+									
+							  }
+							  .filterstyle span{
+								    padding: 10px;
+							  		    display: block;
+							  		    overflow-wrap: break-word;
+							  		    color: rgba(24, 24, 24, 1);
+							  		    font-size: 14px;
+							  		    font-family: Avenir-Roman;
+							  		    white-space: nowrap;
+							  		    line-height: 19px;
+							  		    text-align: left;
+							  }
+							  .filterstyle button{
+								    margin: 5px;
+							  		         padding: 5px 16px;
+										       font-size: 14px;
+											       color: rgba(130, 130, 130, 1);
+							  }
+							  </style>
+							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
+							       <li>
+									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
+										<div class="resentlist">
+ 										</div>
+										
+							  		 </li>
+							      <li>
+							      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
+							      			<div class="trendinglist">
+ 							      			</div>
+							      	</li>
+							  </ul>
 						</div>
 					</div>
 					

html/moments/index.html

@@ -135,28 +135,27 @@
 		</script>
 		<main class="jpmain">
 			<div class="container-fluid" style="padding:0;">
-
 <div class="tool-box">
 				<div class="newest-list">
 					<div class="newest-item i18n-text" i18n="landingpage_Newest"
 					 style="color:#000000;font-weight: bold;cursor: default;">Newest</div>
-					<div class="newest-item">All</div>
-					<div class="newest-item">x &nbsp;Masterplanning</div>
-					<div class="newest-item">Architecture</div>
-					<div class="newest-item">Interiors</div>
-					<div class="newest-item">Lighting</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">AV&nbsp;&amp;&nbsp;Acoustics</div>
-					<div class="newest-item">MEP</div>
-					<div class="newest-item">Landscape</div>
-					<div class="newest-item">Landscape</div>
+					<div class="newest-item query">All</div>
+					<div class="newest-item query">x &nbsp;Masterplanning</div>
+					<div class="newest-item query">Architecture</div>
+					<div class="newest-item query">Interiors</div>
+					<div class="newest-item query">Lighting</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">AV&nbsp;&amp;&nbsp;Acoustics</div>
+					<div class="newest-item query">MEP</div>
+					<div class="newest-item query">Landscape</div>
+					<div class="newest-item query">Landscape</div>
 					<div style="flex:1;"></div>
 					<div class="newest-item"><img src="../../assets/img/landing_right_arrow.png"></div>
 				</div>
 				
 				<div class="search-list" style="margin-top:30px;">
 					<div class="search-item">
-						<label class="i18n-text"  i18n="landingpage_Newest">Location</label>
+						<label class="i18n-text"  i18n="landingpage_Location">Location</label>
 						<select class="selectpicker">
 						  <option class="i18n-text"  i18n="landingpage_By project" >By project</option>
 						  <option class="i18n-text"  i18n="landingpage_By company">By company</option>
@@ -166,11 +165,8 @@
 					
 					<div class="search-item">
 						<label>&nbsp;</label>
-						<select class="selectpicker" multiple>
-						  <option>Canada</option>
-						  <option>China</option>
-						  <option>France</option>
-						  <option>Germany</option>
+						<select class="selectpicker selectLocation" multiple>
+						  
 						</select>
 						
 					</div>
@@ -179,36 +175,72 @@
 					
 					<div class="search-item">
 						<label class="i18n-text"  i18n="landingpage_Disciplines"  >Disciplines</label>
-						<select class="selectpicker my-select" multiple>
-						  <option>Architecture</option>
-						  <option>Landscape</option>
-						  <option>AV</option>
-						  <option>Mustard</option>
-						  <option>Landscape</option>
+						<select class="selectpicker my-select selectDisciplines" multiple>
+						 
 						</select>
 					</div>
 					
 					
 					<div class="search-item">
 						 <label style="display: block;">&nbsp;</label>
-						 <button type="button" class="btn btn-default i18n-text" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
+						 <button type="button" class="btn btn-default i18n-text querybtn" i18n="head_Submit" style="height: 42px;padding:0px 20px;background-color: #000000;color:#ffffff;">Submit</button>
 					</div>
 					
 					<div style="flex:1;"></div>
 					
 					<div class="search-item">
 						<label style="display: block;">&nbsp;</label>
+						
+					
 						<div class="input-group">
-						  <input type="text" class="form-control i18n-placeholder" i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;">
+						  <input type="text" class="form-control i18n-placeholder landingpage_search"  data-toggle="dropdown"
+						  i18n="landingpage_search" placeholder="search..." aria-describedby="basic-addon2" style="height:42px;    width: 300px;">
 						  <span class="input-group-addon" style="
 									padding: 0px;
 								" id="basic-addon2">
-							  <button type="button" style="    width: 50px;
+							  <button type="button" class="querybtn" style="    width: 50px;
 									height: 40px; border: 0;">
-								    <i class="glyphicon glyphicon-search"></i>
+								    <i class="glyphicon glyphicon-search query"></i>
 							  </button>
 							
 							  </span>
+							  <style>
+							  .filterstyle{
+								    padding: 20px;
+								      width: 460px;
+									
+							  }
+							  .filterstyle span{
+								    padding: 10px;
+							  		    display: block;
+							  		    overflow-wrap: break-word;
+							  		    color: rgba(24, 24, 24, 1);
+							  		    font-size: 14px;
+							  		    font-family: Avenir-Roman;
+							  		    white-space: nowrap;
+							  		    line-height: 19px;
+							  		    text-align: left;
+							  }
+							  .filterstyle button{
+								    margin: 5px;
+							  		         padding: 5px 16px;
+										       font-size: 14px;
+											       color: rgba(130, 130, 130, 1);
+							  }
+							  </style>
+							  <ul class="dropdown-menu dropdown-menu-right filter-menu filterstyle" aria-labelledby="dropdownMenu1">
+							       <li>
+									    <span  class="i18n-text" i18n="landingpage_Resent searches">Resent searches</span>
+										<div class="resentlist">
+ 										</div>
+										
+							  		 </li>
+							      <li>
+							      		 <span class="i18n-text" i18n="landingpage_Trending searches">Trending searches</span>
+							      			<div class="trendinglist">
+ 							      			</div>
+							      	</li>
+							  </ul>
 						</div>
 					</div>
 					

i18n/strings.properties

@@ -33,6 +33,8 @@ headcommon7=Password
 headcommon8=Sign out
 
 
+
+
 account_Favorites=Favorites
 account_Filters=Filters
 account_Follow=Follow
@@ -40,7 +42,8 @@ account_Last saved to=Last saved to
 account_Edit=Edit
 account_Following=Following
 
-
+landingpage_Resent searches=Resent searches
+landingpage_Trending searches=Trending searches
 landingpage_Library=Library
 landingpage_Project location=Project location
 landingpage_Contact us=Contact us

i18n/strings_zh.properties

@@ -43,6 +43,9 @@ changepwd_Change success=修改成功
 moments_Show=展示你创造力的世界
 moments_Here=在这里发布你的日常设计
 
+landingpage_Resent searches=最近搜索
+landingpage_Trending searches=趋势搜索
+
 landingpage_Library=图书馆
 landingpage_Project location=项目位置
 landingpage_Contact us=联系我们