dev #14384 Правка ошибок отображения WPA КофеЛайк:
fix header; add link to banner; fix last purchase loading;
This commit is contained in:
parent
e5ae004a29
commit
b7cc0ed72d
@ -17,7 +17,9 @@
|
|||||||
</ng-container>
|
</ng-container>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
<a href="https://promo.coffee-like.com/?utm_medium=prilozhenie">
|
||||||
<img src="./assets/970х250_3.png" alt="" width="100%" />
|
<img src="./assets/970х250_3.png" alt="" width="100%" />
|
||||||
|
</a>
|
||||||
<a href="https://yandex.ru/profile/151770398186" target="_blank">
|
<a href="https://yandex.ru/profile/151770398186" target="_blank">
|
||||||
<button class="evaluate-order">Оценить заказ</button>
|
<button class="evaluate-order">Оценить заказ</button>
|
||||||
</a>
|
</a>
|
||||||
|
|||||||
@ -1,8 +1,11 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
|
<div class="block">
|
||||||
|
<h1 class="title">{{title}}</h1>
|
||||||
|
</div>
|
||||||
|
<div class="block">
|
||||||
<div class="back">
|
<div class="back">
|
||||||
<mat-icon *ngIf="backEvent" style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon>
|
<mat-icon *ngIf="backEvent" style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon>
|
||||||
</div>
|
</div>
|
||||||
<h1 class="title">{{title}}</h1>
|
|
||||||
<!-- <div class="plug"></div> -->
|
<!-- <div class="plug"></div> -->
|
||||||
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
|
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
|
||||||
<div *ngIf="showMenu" class="menu">
|
<div *ngIf="showMenu" class="menu">
|
||||||
@ -45,3 +48,4 @@
|
|||||||
<button mat-stroked-button appDownloadApp>Установить</button>
|
<button mat-stroked-button appDownloadApp>Установить</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|||||||
@ -10,16 +10,21 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
|
max-width: 600px;
|
||||||
|
margin: 0 auto;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 12px 16px;
|
padding: 12px 16px;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
background: var(--button-color);
|
background: var(--button-color);
|
||||||
color: var(--button-text-color);
|
color: var(--button-text-color);
|
||||||
display: grid;
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
.block {
|
||||||
|
display: flex;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
grid-template-columns: auto auto auto;
|
|
||||||
justify-items: center;
|
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
}
|
||||||
.back {
|
.back {
|
||||||
width: 40px;
|
width: 40px;
|
||||||
}
|
}
|
||||||
@ -38,7 +43,8 @@
|
|||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
font-size: 17px;
|
font-size: 17px;
|
||||||
line-height: 22px;
|
line-height: 22px;
|
||||||
margin: 0;
|
margin: 0 auto;
|
||||||
|
|
||||||
}
|
}
|
||||||
.wrapper {
|
.wrapper {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|||||||
@ -97,9 +97,6 @@ export class AuthService {
|
|||||||
error: (e) => {
|
error: (e) => {
|
||||||
this.error = e;
|
this.error = e;
|
||||||
},
|
},
|
||||||
complete: () => {
|
|
||||||
this.loading = false;
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -251,11 +248,15 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getLastPurchase() {
|
getLastPurchase() {
|
||||||
|
this.loading = true;
|
||||||
if (this.userInfo) {
|
if (this.userInfo) {
|
||||||
this.wpJsonService.getLastPurchase(environment.systemId, this.token!).subscribe({
|
this.wpJsonService.getLastPurchase(environment.systemId, this.token!).subscribe({
|
||||||
next: (res) => {
|
next: (res) => {
|
||||||
this.purchaseData.lastPurchase = res[this.userInfo!.id][0];
|
this.purchaseData.lastPurchase = res[this.userInfo!.id][0];
|
||||||
},
|
},
|
||||||
|
complete: () => {
|
||||||
|
this.loading = false;
|
||||||
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user