调整

assets/js/account.js

@@ -5,8 +5,41 @@ $(function(){
 		
 		$("#project-photo-row").append(tmphtml);
 	});
+	var obj={
+				Project_name:'Title for the project',
+				date:"2021.08.11 17:23",
+				read:true,
+				txt:"Contrary to popular belief,Lorem Ipsum is not simply random text.It has roots in a piece of classical Latin literature from 45 BC, 	making it over 2000 years old.Richard McClintock,a Latin professor at Hampden-Sydney College in Virginia,looked up one of the more obscure Latin words,consectetur,from a Lorem lpsum passage,and going through the cites of the word in classical literature,discovered the undoubtable source.",
+				list:[
+					"../../assets/img/landingpage/SketchPng89e9554a3265a9c1f8d56f3f7dd92e7e0af6a15c8c7b8aa9fddfe992757c51a0.png",
+					"../../assets/img/landingpage/SketchPng4f81a60c9fe9d2ae25bb83fb0252c7bdab23768bbc807bbae7f9e5b04b694bd8.png",
+					"../../assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png",
+					"../../assets/img/landingpage/SketchPng3622edd1182388117b81d016412b296bafd4b2e05706408fc9de0dd39c2c52a6.png",
+					"../../assets/img/landingpage/SketchPngcb1de6df3ae05d75f886fa3734104662e588761124ed01a2a70098de8319fd64.png",
+					"../../assets/img/landingpage/SketchPngdeef997ff688c81e59cf6e882f2970cdc203ead50855f1db4e719e5ed73958b7.png",
+					"../../assets/img/landingpage/SketchPngaca45c5ff6a2d365055c1489e841ff3a83787adf7a31d5a5ee88dcc478e79835.png",
+					"../../assets/img/landingpage/SketchPngb0ddea94e6fe18953526d1a639df71ca6ec7cddd5b5299c13b4e1a273fad4ef1.png",
+					"../../assets/img/landingpage/SketchPngb61811580d481d4def6488e495e5e7ce94fb3a74b302b0d46c348b834d261380.png",
+					
+				]
+			}
+			
+	var list=[
+			obj,
+			obj,
+			obj,
+			obj,
+		]
+		var postproject=window.localStorage.getItem("postproject")
+		if(postproject){
+			postproject=JSON.parse(postproject)
+			list=[
+				postproject,
+				...list
+			]
+		}
 	
-	$(".follow-box").append(template("follow-photos",{list:[1,2,3,4]}));
+	$(".follow-box").append(template("follow-photos",{list:list}));
 	
 	$('.sort-box').on('click','.sort-tab',function(){
 		let $this=$(this),showbox=$(this).data('show');
@@ -18,11 +51,13 @@ $(function(){
 		$(".project-box,.follow-box").hide();
 		$("."+showbox).show();
 	});
-	
+	$(".follow-btn2").on('click',function(){
+		window.location.href="../company/postproject.html?1=1"
+	});
 	$(".filter-menu").on('click','li',function(){
-		zeroModal.alert({
-			content:$(this).text()
-		});
+		// zeroModal.alert({
+		// 	content:$(this).text()
+		// });
 	});
 	
 });

assets/js/company-postproject.js

@@ -12,6 +12,34 @@ $(function(){
 			$(".imguploadlist").append(list);
 			$(".imguploadlist").append(list);
 			
+			if(window.location.search){
+				var postproject =window.localStorage.getItem("postproject")
+				if(postproject){
+					postproject=JSON.parse(postproject)
+					
+					$(".Projectdescriptiontxt").val(postproject.txt)
+					$("input[name=completion]").val(postproject.date)
+					$(".showlistLocation1").val(postproject.showlistLocation1)
+					$(".showlistLocation2").val(postproject.showlistLocation2)
+					$(".showlistLocation3").val(postproject.showlistLocation3)
+					
+					for(var i in postproject.list){
+						var input=$(".btnUpload").eq(i)
+						
+						onloadimg(input,postproject.list[i])
+					}
+					
+					$("#form input[type='text']").each(function() {
+						var key = $(this).attr("name")
+						console.log(key)
+						if(key&&postproject[key]){
+							$(this).val(postproject[key])
+						}
+					})
+					
+				}
+				
+			}
 			
 			
 		   var btnUpload=null;
@@ -57,15 +85,8 @@ $(function(){
 	          reader.readAsDataURL(file); // 读取文件
 	          // 渲染文件
 	          reader.onload = function (arg) {
-				 
-	            $(btnUpload).css("background", "url("+arg.target.result+")   no-repeat center")
-				$(btnUpload).css("background-size", "100% 100%")
-				
-				$(btnUpload).css("border", '1px solid #b8b9ba')
-				$(btnUpload).css("border-radius",'10px')
-				$(btnUpload).attr("disabled","disabled")
-				$(btnUpload).find(".imgdel").show()
-				$(btnUpload).find(".imginput").val(arg.target.result)
+				 onloadimg(btnUpload,arg.target.result)
+	          
 				$("#imagePic").val("")
 	          }
 	        } else {
@@ -87,6 +108,20 @@ $(function(){
 	      }
 	    });
 	  })
+	  
+	  function onloadimg(btn,img){
+		 
+	  	$(btn).css("background", "url("+img+")   no-repeat center")
+	  	$(btn).css("background-size", "100% 100%")
+	  	
+	  	$(btn).css("border", '1px solid #b8b9ba')
+	  	$(btn).css("border-radius",'10px')
+	  	$(btn).attr("disabled","disabled")
+	  	$(btn).find(".imgdel").show()
+	  	$(btn).find(".imginput").val(img)
+	  	
+	  }
+	  
 	//---------初始化数据部分-----------
 	var  contact_number_list=["+86","+87","+88"]
 	var  location=[{
@@ -179,7 +214,7 @@ $(function(){
 				  		; //location.href='../signin/signin.html'
 				  	},
 				  	onComplete: function(evn) {
-				  		//submitCompany()
+				  		submitCompany()
 				  		console.log('onComplete')
 				  		setTimeout(function(){
 				  		window.location.href = '../lanhu/index.html'
@@ -190,8 +225,36 @@ $(function(){
 			   }
 		    }
 		});
+		
+		
+		
 		$("#form").validate()
-	
+		function submitCompany(){
+			
+			var time=(1900+new Date().getYear())+"."+(new Date().getMonth()+1)+"."+new Date().getDate()
+			var postmoment={
+				txt:$(".Projectdescriptiontxt").val(),
+				date:$("input[name=completion]").val(),
+				showlistLocation1:$(".showlistLocation1").val(),
+				showlistLocation2:$(".showlistLocation2").val(),
+				showlistLocation3:$(".showlistLocation3").val(),
+				list:[]
+			}
+			$("#form input[type='text']").each(function() {
+				var key = $(this).attr("name")
+				postmoment[key] = $(this).val()
+			})
+		
+			
+			$(".imginput").each(function(){
+				var value=$(this).val()
+				if(value){
+					postmoment.list.push(value)
+				}
+			})
+			window.localStorage.setItem("postproject",JSON.stringify(postmoment))
+			
+		}
 		
 	//页面初始化end
 })

assets/js/moments-postmoment.js

@@ -160,7 +160,7 @@ $(function(){
 		});
 		$("#form").validate()
 		function submitCompany(){
-			debugger
+			
 			var company=window.localStorage.getItem("loginCompany")
 			company=JSON.parse(company)
 			

html/account/account.html

@@ -141,6 +141,7 @@
 			   -ms-column-gap:5px; /*IE*/
 			   column-gap:5px;
 			   width:255px;
+			    height:255px;
 		   }
 		   
 		   .follow-box .follow-item .photos-9 img{
@@ -157,8 +158,8 @@
 		<script>
 			$(function() {
 				$("#head").load("../head.html",function(){
-					//$("#common-navbar-head .active").removeClass("active")
-					//$("#common-navbar-head .head_li_user").addClass("active")
+					$("#common-navbar-head .active").removeClass("active")
+					$("#common-navbar-head .head_li_user").addClass("active")
 				});
 			})
 		</script>
@@ -168,18 +169,20 @@
 			
 			<div class="account-box">
 				<img src="../../assets/img/us_red_big.png" />
-				<span style="margin:0px 20px;font-weight: bold;">wang234…@gmail.com</span>
-				<img src="../../assets/img/edit_icon_small.png" />
+				<span style="margin:0px 20px;font-weight: bold;" class="userName" ></span>
+				<a href="../company/register.html"><img src="../../assets/img/edit_icon_small.png" /></a>
 			</div>
 			
 			<div class="sort-box">
-				<div class="sort-tab sort-tab-active" data-show='project-box'><span>Favorites</span><label>1212</label></div>
-				<div class="sort-tab" data-show='follow-box'><span>Follow</span><label>43</label></div>
+				<div class="sort-tab sort-tab-active" data-show='project-box'><span  class="i18n-text" i18n="account_Favorites">Favorites</span><label>1212</label></div>
+				<div class="sort-tab" data-show='follow-box'><span  class="i18n-text" i18n="account_Follow">Follow</span><label>43</label></div>
 				<div style="flex:1;"></div>
 				<div class="dropdown">
-					<div class="filter-btn dropdown-toggle" data-toggle="dropdown"><span>Filters</span><img src="../../assets/img/filter.png" style="margin-left:25px;"></div>
+					<div class="filter-btn dropdown-toggle" data-toggle="dropdown"><span  class="i18n-text" i18n="account_Filters">Filters</span><img src="../../assets/img/filter.png" style="margin-left:25px;"></div>
 				     <ul class="dropdown-menu dropdown-menu-right filter-menu" aria-labelledby="dropdownMenu1">
-				         <li><a href="#">Last saved to</a></li>
+				         <li>
+							<a  class="i18n-text" i18n="account_Last saved to" href="#">Last saved to</a> 
+							 </li>
 				        
 				    </ul>
 				</div>
@@ -229,28 +232,20 @@
 			{{each  list  followitm index}}
 				<div class="follow-item">
 					<div class="photos-9">
-						<img src="../../assets/img/landingpage/SketchPng89e9554a3265a9c1f8d56f3f7dd92e7e0af6a15c8c7b8aa9fddfe992757c51a0.png">
-						<img src="../../assets/img/landingpage/SketchPng4f81a60c9fe9d2ae25bb83fb0252c7bdab23768bbc807bbae7f9e5b04b694bd8.png">
-						<img src="../../assets/img/landingpage/SketchPng7d6f19699512d467d9c2c6735798214c0ad484446e64adfb3f1215fb3d1cf5bb.png">
-						<img src="../../assets/img/landingpage/SketchPng3622edd1182388117b81d016412b296bafd4b2e05706408fc9de0dd39c2c52a6.png">
-						<img src="../../assets/img/landingpage/SketchPngcb1de6df3ae05d75f886fa3734104662e588761124ed01a2a70098de8319fd64.png">
-						<img src="../../assets/img/landingpage/SketchPngdeef997ff688c81e59cf6e882f2970cdc203ead50855f1db4e719e5ed73958b7.png">
-						<img src="../../assets/img/landingpage/SketchPngaca45c5ff6a2d365055c1489e841ff3a83787adf7a31d5a5ee88dcc478e79835.png">
-						<img src="../../assets/img/landingpage/SketchPngb0ddea94e6fe18953526d1a639df71ca6ec7cddd5b5299c13b4e1a273fad4ef1.png">
-						<img src="../../assets/img/landingpage/SketchPngb61811580d481d4def6488e495e5e7ce94fb3a74b302b0d46c348b834d261380.png">
+						{{each  followitm.list img index2}}
+						<img src="{{img}}">
+						{{/each}}
 					</div>
 					<div style="flex:1;padding:0px 20px;">
-						<h5><strong>Title for the project</strong></h5>
-						<p class="follow-note-time">2021.08.11 17:23</p>
-						<p class="follow-note-con">Contrary to popular belief,Lorem Ipsum is not simply random text.It has roots in a piece of classical Latin literature from 45 BC,
-						making it over 2000 years old.Richard McClintock,a Latin professor at Hampden-Sydney College in Virginia,looked up one of the more obscure Latin words,consectetur,from a Lorem lpsum passage,and going through the cites of the word in classical
-						literature,discovered the undoubtable source.
-						</p>
-						<p class="follow-note-con">
-							Lorem Ipsum comes from sections 1.10.32 and 1.10.33 of "de Finibus Bonorum et Malorum"(The Extremes of Good and Evil)by Cicero.
+						<h5><strong>{{followitm.Project_name}}</strong></h5>
+						<p class="follow-note-time">{{followitm.date}}</p>
+						<p class="follow-note-con">{{followitm.txt}}
 						</p>
+					
 					</div>
-					<button class="btn btn-lg btn-danger btn-block follow-btn" type="button">Following</button>
+					<button class="btn btn-lg  btn-block follow-btn follow-btn2 i18n-text" i18n="account_Edit" style=" {{followitm.read?'display: none;':''}}" type="button">Edit</button>
+					
+					<button class="btn btn-lg btn-danger btn-block follow-btn  i18n-text" i18n="account_Following"  style=" {{!followitm.read?'display: none;':''}}" type="button">Following</button>
 				</div>
 			{{/each}}
 		</script>

html/account/changepwd.html

@@ -88,8 +88,8 @@
 		<script>
 			$(function() {
 				$("#head").load("../head.html",function(){
-					//$("#common-navbar-head .active").removeClass("active")
-					//$("#common-navbar-head .head_li_user").addClass("active")
+					$("#common-navbar-head .active").removeClass("active")
+					$("#common-navbar-head .head_li_user").addClass("active")
 				});
 			})
 		</script>

html/company/company_contact.html

@@ -60,8 +60,8 @@
 		<script>
 			$(function() {
 				$("#head").load("../head.html",function(){
-					//$("#common-navbar-head .active").removeClass("active")
-					//$("#common-navbar-head .head_li_user").addClass("active")
+					$("#common-navbar-head .active").removeClass("active")
+					$("#common-navbar-head .head_li_user").addClass("active")
 				});
 			})
 		</script>

html/company/postproject.html

@@ -11,7 +11,7 @@
 
 		<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/zeroModal.css">
 		<link rel="stylesheet" type="text/css" href="../../assets/plugin/zeroModal/css/normalize.css" />
 
 	</head>
@@ -281,7 +281,7 @@
 											font-size: 12px;">（ optional ）</span>
 										</dt>
 										<dd>
-											<textarea style="height: 90px;" rows="3" class="i18n-placeholder"
+											<textarea style="height: 90px;" rows="3" class="i18n-placeholder Projectdescriptiontxt"
 												 maxlength="500"
 												i18n="company_postproject_A  short  introduction"
 												placeholder="A  short company introduction…"></textarea>

i18n/strings.properties

@@ -32,6 +32,15 @@ headcommon6=Edit profile
 headcommon7=Password
 headcommon8=Sign out
 
+
+account_Favorites=Favorites
+account_Filters=Filters
+account_Follow=Follow
+account_Last saved to=Last saved to
+account_Edit=Edit
+account_Following=Following
+
+
 landingpage_Library=Library
 landingpage_Project location=Project location
 landingpage_Contact us=Contact us

i18n/strings_zh.properties

@@ -21,8 +21,15 @@ headcommon6=编辑配置文件
 headcommon7=密码
 headcommon8=注销
 
+account_Favorites=收藏夹
+account_Filters=筛选
+account_Follow=关注
+account_Last saved to=上次保存
 
 
+account_Edit=修改
+account_Following=已关注
+
 changepwd_Change password=修改密码
 changepwd_Old password=旧密码
 changepwd_Enter your old password=请输入你的旧密码