瀏覽代碼

Merge branch 'dev'

VicCG.Lin 11 月之前
父節點
當前提交
66ad88ad66
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 2
    2
      src/fe/healthpassport/js/base.js
  2. 4
    4
      src/fe/healthpassport/js/register.js

+ 2
- 2
src/fe/healthpassport/js/base.js 查看文件

1
-base = function () {
1
+window.base = function () {
2
 	//private menbers
2
 	//private menbers
3
 	let isActivityOver = false;
3
 	let isActivityOver = false;
4
 	let userProfile = null;
4
 	let userProfile = null;
172
 	};
172
 	};
173
 };
173
 };
174
 
174
 
175
-var base = new base();
175
+var base = new window.base();

+ 4
- 4
src/fe/healthpassport/js/register.js 查看文件

69
 			if(checkRegister()) {
69
 			if(checkRegister()) {
70
 				sendRegister();
70
 				sendRegister();
71
 			}else {
71
 			}else {
72
-				base.myAlert(registerAlert);
72
+				window.base.myAlert(registerAlert);
73
 				$(this).removeClass("disable");
73
 				$(this).removeClass("disable");
74
                 $(".form-submit p").text("下一步");
74
                 $(".form-submit p").text("下一步");
75
 			}
75
 			}
368
 	
368
 	
369
 						console.log("userData: ",userData)
369
 						console.log("userData: ",userData)
370
 						
370
 						
371
-						base.sectionFadeOut(".register");
372
-						base.sectionFadeIn(".passport");
371
+						window.base.sectionFadeOut(".register");
372
+						window.base.sectionFadeIn(".passport");
373
 						passport.buildPassportHandler(userData)
373
 						passport.buildPassportHandler(userData)
374
 
374
 
375
 						GameService.getInstanse().sendCompleteMessage();
375
 						GameService.getInstanse().sendCompleteMessage();
380
 			.catch(_err => {
380
 			.catch(_err => {
381
 				console.log(_err);
381
 				console.log(_err);
382
 				// let msg = err.message.replaceAll("Error:", "");
382
 				// let msg = err.message.replaceAll("Error:", "");
383
-				base.myAlert(_err);
383
+				window.base.myAlert(_err);
384
 				$(".register .form-submit").removeClass("disable");
384
 				$(".register .form-submit").removeClass("disable");
385
                 $(".register .form-submit p").text("下一步");
385
                 $(".register .form-submit p").text("下一步");
386
 			})
386
 			})