Merge branch 'dev'

src/fe/healthpassport/js/base.js

@@ -1,4 +1,4 @@
-base = function () {
+window.base = function () {
 	//private menbers
 	let isActivityOver = false;
 	let userProfile = null;
@@ -172,4 +172,4 @@ base = function () {
 	};
 };
 
-var base = new base();
+var base = new window.base();

src/fe/healthpassport/js/register.js

@@ -69,7 +69,7 @@ register = function () {
 			if(checkRegister()) {
 				sendRegister();
 			}else {
-				base.myAlert(registerAlert);
+				window.base.myAlert(registerAlert);
 				$(this).removeClass("disable");
                 $(".form-submit p").text("下一步");
 			}
@@ -368,8 +368,8 @@ register = function () {
 	
 						console.log("userData: ",userData)
 						
-						base.sectionFadeOut(".register");
-						base.sectionFadeIn(".passport");
+						window.base.sectionFadeOut(".register");
+						window.base.sectionFadeIn(".passport");
 						passport.buildPassportHandler(userData)
 
 						GameService.getInstanse().sendCompleteMessage();
@@ -380,7 +380,7 @@ register = function () {
 			.catch(_err => {
 				console.log(_err);
 				// let msg = err.message.replaceAll("Error:", "");
-				base.myAlert(_err);
+				window.base.myAlert(_err);
 				$(".register .form-submit").removeClass("disable");
                 $(".register .form-submit p").text("下一步");
 			})