fix issue

src/fe/healthpassport/css/all.css

@@ -11382,6 +11382,11 @@ p {
   margin-bottom: 1.5em;
   padding: 0.5em 0.55em;
 }
+.passport__edit {
+  width: 89%;
+  margin: 0 auto;
+  box-shadow: 0 0.2em 0.5em rgba(0, 0, 0, 0.2);
+}
 
 .methods p {
   font-size: 1.3em;

src/fe/healthpassport/css/page/_passport.scss

@@ -112,4 +112,9 @@
             }
         }
     }
+    &__edit {
+        width: 89%;
+        margin: 0 auto;
+        box-shadow: 0 0.2em 0.5em rgba(#000, 0.2);
+    }
 }

src/fe/healthpassport/index.html

@@ -362,7 +362,7 @@
                     <div class="label__checkbox"></div>
                     <p>我同意<span class="goToActivity">個人資料使用方法</span></p>
                 </label>
-            </div>
+              </div>
               <div class="button form-submit">
                 <p>下一步</p>
               </div>
@@ -436,6 +436,9 @@
                 <div class="tags"></div>
               </div>
             </div>
+            <div class="button passport__edit">
+              <p>編輯健康護照</p>
+            </div>
           </div>
         </section>
       </main>

src/fe/healthpassport/js/base.js

@@ -38,41 +38,34 @@ base = function () {
 					
 					if(userData === null) {
 						register.LinePicHandler(profile.pictureUrl)
-						sectionFadeIn(".register");
-						sectionFadeOut(".passport");
-						sectionFadeOut(".methods");
+						goToRegister();
 					}else {
-						sectionFadeIn(".passport");
-						sectionFadeOut(".methods");
-						sectionFadeOut(".register");
 						passport.buildPassportHandler(userData)
+						register.insertFromData(userData);
+						goToPassport();
 					}
 
 					// 測試用
-					// sectionFadeIn(".passport");
-					// sectionFadeOut(".methods");
-					// sectionFadeOut(".register");
+					// goToPassport();
 					// passport.buildPassportHandler(userData)
-
+					// register.insertFromData(userData);
+					// ------------------------------------------
+					// goToRegister();
 					// register.LinePicHandler(profile.pictureUrl)
-					// sectionFadeIn(".register");
-					// sectionFadeOut(".passport");
-					// sectionFadeOut(".methods");
+
 				})
 		})
 
 		// 返回表單頁
 		$(".backform").on("click", function(){
-			console.log("backform click")
-			sectionFadeOut(".methods");
-			sectionFadeIn(".register");
+			// console.log("backform click");
+			goToRegister();
 		});
 
 		// 前往活動辦法頁
 		$(".goToActivity").on("click", function(){
-			console.log("backform click")
-			sectionFadeOut(".register");
-			sectionFadeIn(".methods");
+			// console.log("goToActivity click");
+			goToMethods();
 		});
 
 		
@@ -109,6 +102,24 @@ base = function () {
 		$(".modal-backdrop.show").css("-webkit-backdrop-filter", "blur(2px)")
 	}
 
+	function goToRegister() {
+		sectionFadeIn(".register");
+		sectionFadeOut(".passport");
+		sectionFadeOut(".methods");
+	}
+
+	function goToPassport() {
+		sectionFadeIn(".passport");
+		sectionFadeOut(".methods");
+		sectionFadeOut(".register");
+	}
+
+	function goToMethods() {
+		sectionFadeIn(".methods");
+		sectionFadeOut(".passport");
+		sectionFadeOut(".register");
+	}
+
 	// page進入動態
 	function sectionFadeIn(el) {
 		$(el).show();
@@ -147,7 +158,9 @@ base = function () {
 			myAlert(_msg);
 		},
 		getProfile,
-
+		goToRegister,
+		goToPassport,
+		goToMethods,
 	};
 };
 

src/fe/healthpassport/js/passport.js

@@ -25,7 +25,9 @@ passport = function () {
 			}
 		});
 
-		
+		$(".passport__edit").on("click", function(){
+			base.goToRegister();
+		});
 	}
 
 	function getTagData(){
@@ -37,7 +39,7 @@ passport = function () {
 
 	function buildPassportHandler(_data){
 		let data = _data;
-		console.log(data);
+		// console.log(data);
 
 		setTimeout(()=>{
 

src/fe/healthpassport/js/register.js

@@ -220,7 +220,55 @@ register = function () {
 		
 	}
 
+	function insertFromData(data) {
+		resetRegister();
+		let formData = data.filler_content;
+		// console.log(formData)
+		
+		// 健康行動
+		formData.healthAction.forEach((val)=>{
+			$(`.form__item-healthAction input[value=${val}]`).prop("checked", true);
+			$(`.form__item-healthAction input[value=${val}]`).parents(".form__options__item").addClass("checked");
+		});
+
+		// 對什麼健康話題有興趣
+		formData.healthTopic.forEach((val)=>{
+			$(`.form__item-healthTopic input[value=${val}]`).prop("checked", true);
+			$(`.form__item-healthTopic input[value=${val}]`).parents(".form__options__item").addClass("checked");
+		});
+
+		// 身體狀況如何
+		$(`input[value=${formData.healthStatus}]`).prop("checked",true);
+		$(`input[value=${formData.healthStatus}]`).parents(".form__options__item").addClass("checked");
+
+		// 最符合你的應對
+		$(`input[value=${formData.healthAdapt}]`).prop("checked",true);
+		$(`input[value=${formData.healthAdapt}]`).parents(".form__options__item").addClass("checked");
+
+		// 符合你的想法
+		formData.healthThought.forEach((val)=>{
+			$(`.form__item-healthThought input[value=${val}]`).prop("checked", true);
+			$(`.form__item-healthThought input[value=${val}]`).parents(".form__options__item").addClass("checked");
+		});
+
+		// 你的年齡
+		$(`input[value=${formData.healthAge}]`).prop("checked",true);
+		$(`input[value=${formData.healthAge}]`).parents(".form__options__item").addClass("checked");
 
+		// 暱稱
+		$(`input[id="nickName"]`).val(data.nickname);
+
+		// 性別
+		$(`select[id="gender"]`).val(formData.healthGender);
+
+		// 頭貼
+		$(".register .photo__img").append(`
+			<img src=${data.head_sticker} />
+		`);
+	}
+
+
+	// 取得選取的checkbox
 	function getCheckboxVal(name) {
 
 		let vals = $(".register input[type=checkbox][name="+name+"]:checked").map(function() {
@@ -230,10 +278,12 @@ register = function () {
 		return vals;
 	}
 
+	// 取得選取的radio
 	function getRadioVal(name){
 		return $("input[name="+name+"]:checked").val();
 	}
 
+	// 確認註冊表單
 	function checkRegister(){
 		let isComplete = true;
 		registerAlert = "";
@@ -314,6 +364,7 @@ register = function () {
 		return isComplete;
 	}
 
+	// 送出表單
 	function sendRegister() {
 
 		// 測試用
@@ -357,9 +408,11 @@ register = function () {
 			})
 	}
 
+	// 重設表單
 	function resetRegister() {
 		$('.register .form input[type=checkbox], .register .form input[type=radio]').prop('checked', false);
 		$('.register .form input[type=text], .register .form select').val('');
+
 	}
 	
 
@@ -386,6 +439,9 @@ register = function () {
 		},
 		selectImage: function() {
 			selectImage();
+		},
+		insertFromData: function(data) {
+			insertFromData(data);
 		}
 	};
 };