debus scan code
This commit is contained in:
@@ -11,18 +11,35 @@
|
||||
<div class="boxed_contents">
|
||||
<ion-grid>
|
||||
<ion-row>
|
||||
<ion-col>
|
||||
<!-- <ion-button expand="block" fill="outline" >Login</ion-button>-->
|
||||
<ion-col size="6">
|
||||
<ion-button fill="outline" size="large" (click)="moveToStartScan()">
|
||||
<ion-icon slot="start" name="scan"></ion-icon>
|
||||
Scan Login</ion-button>
|
||||
</ion-col>
|
||||
<ion-col class="family_box">
|
||||
<ion-button expand="block" class="login-type" (click)="familyLogin()">
|
||||
<ion-col size="6">
|
||||
<ion-button class="login-type" (click)="familyLogin()">
|
||||
<ion-icon name="people-circle-outline"></ion-icon>
|
||||
Go to Family Account</ion-button>
|
||||
Family Login</ion-button>
|
||||
</ion-col>
|
||||
|
||||
</ion-row>
|
||||
</ion-grid>
|
||||
|
||||
<!-- <ion-grid>-->
|
||||
<!-- <ion-row>-->
|
||||
<!-- <ion-col>-->
|
||||
<!-- <ion-button fill="outline" size="large" (click)="moveToStartScan()">-->
|
||||
<!-- <ion-icon slot="start" name="scan"></ion-icon>-->
|
||||
<!-- Scan Login</ion-button>-->
|
||||
<!-- </ion-col>-->
|
||||
<!-- <ion-col class="family_box">-->
|
||||
<!-- <ion-button expand="block" class="login-type" (click)="familyLogin()">-->
|
||||
<!-- <ion-icon name="people-circle-outline"></ion-icon>-->
|
||||
<!-- Go to Family Login</ion-button>-->
|
||||
<!-- </ion-col>-->
|
||||
|
||||
<!-- </ion-row>-->
|
||||
<!-- </ion-grid>-->
|
||||
|
||||
<ion-label class="simp_lbl_tx">Login to continue</ion-label>
|
||||
<ion-item lines="none">
|
||||
<ion-icon slot="start" name="mail-outline"></ion-icon>
|
||||
|
||||
@@ -105,6 +105,9 @@ getBlogData(){
|
||||
this.router.navigate(['register']);
|
||||
}
|
||||
|
||||
moveToStartScan(){
|
||||
this.router.navigate(['startscan']);
|
||||
}
|
||||
onLoginApple() {
|
||||
|
||||
// -> 'web', 'ios' or 'android'
|
||||
|
||||
@@ -52,10 +52,13 @@ export class StartscanPage implements OnInit {
|
||||
// alert(1000);
|
||||
this.wrenchService.qrLoginUser(this.loginQrData).subscribe(
|
||||
loginResult => {
|
||||
// alert("Here 00009");
|
||||
alert("Here 00009");
|
||||
this.loginResult = loginResult;
|
||||
console.log("INTERNAL RETURN->" + this.loginResult.internal_return);
|
||||
if (loginResult != null && loginResult.internal_return == 100 && this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
|
||||
if (loginResult != null
|
||||
&& loginResult.internal_return == 100
|
||||
&& this.sessionDataProviderService.ConstructGlobalSessionData(this.loginResult) == true) {
|
||||
alert("Here 00009a");
|
||||
// this.getBlogData();
|
||||
this.router.navigate(['tabs/tab1']);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user