diff --git a/src/app/pages/startscan/startscan.page.html b/src/app/pages/startscan/startscan.page.html index 170565a..2047baf 100644 --- a/src/app/pages/startscan/startscan.page.html +++ b/src/app/pages/startscan/startscan.page.html @@ -5,7 +5,7 @@ -
+
Stop Scan
diff --git a/src/app/pages/startscan/startscan.page.scss b/src/app/pages/startscan/startscan.page.scss index 1c3cf7a..d41b11a 100644 --- a/src/app/pages/startscan/startscan.page.scss +++ b/src/app/pages/startscan/startscan.page.scss @@ -369,8 +369,8 @@ ion-footer { font-size: 25px; } - .button { - background-color: var(--ion-color-primary); + .cancel_button { + background-color: var(--ion-color-danger); display: flex; align-items: center; justify-content: space-around; diff --git a/src/app/pages/startscan/startscan.page.ts b/src/app/pages/startscan/startscan.page.ts index b768df2..f7e18b4 100644 --- a/src/app/pages/startscan/startscan.page.ts +++ b/src/app/pages/startscan/startscan.page.ts @@ -52,18 +52,19 @@ 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) { - alert("Here 00009a"); + // alert("Here 00009a"); // this.getBlogData(); this.router.navigate(['tabs/tab1']); } else{ this.showAlert("Error","Unable to use the code to login"); + this. stopScan(); } } );