Skip to content

G
getme
Commit 9d65e4f1 by Adarsh K
Options

incoming changes

parents 1c76f555 e978b5c6
Showing with 71 additions and 61 deletions
src/app/cart/cart.page.html
...@@ -169,18 +169,20 @@ ...@@ -169,18 +169,20 @@
</ion-slides> </ion-slides>
</div> </div>
</div> </div>
<div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
<div class="continue" (click)="goToPage('productlist')">CONTINUE SHOPING</div>
<div class="checkout" (click)="next(1)">CHECKOUT</div>
</div>
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">
PAY
</div>
<!-- <div class="footer_btn" [hidden]="currentIndex != 2" (click)="finishpop()">
FINISH
</div> -->
</div> </div>
</ion-content> </ion-content>
<ion-footer>
<div class="footer_btnbay" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 0">
<div class="continue" (click)="goToPage('productlist')">CONTINUE SHOPING</div>
<div class="checkout" (click)="next(1)">CHECKOUT</div>
</div>
<div class="footer_btn" *ngIf="cartService.carts && cartService.carts.length > 0" [hidden]="currentIndex != 1" (click)="next(2);">
PAY
</div>
<!-- <div class="footer_btn" [hidden]="currentIndex != 2" (click)="finishpop()">
FINISH
</div> -->
</ion-footer>
<!-- <div class="loader"> <!-- <div class="loader">
<div class="lds-ripple"> <div class="lds-ripple">
<div></div> <div></div>
......
src/app/cart/cart.page.scss
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
.cart_content { .cart_content {
width: calc(100% - 40px); width: calc(100% - 40px);
margin: 0 auto; margin: 0 auto;
height: 500px; height: calc(100vh - 220px);
border-radius: 10px; border-radius: 10px;
background-color: #fff; background-color: #fff;
.checkout_list { .checkout_list {
...@@ -394,54 +394,52 @@ ...@@ -394,54 +394,52 @@
} }
} }
} }
.footer_btn { }
width: 100%;
position: fixed; .footer_btn {
bottom: 0px; width: 100%;
z-index: 999; z-index: 999;
left: 0px; left: 0px;
right: 0px; right: 0px;
box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34); box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34);
background-color: rgba(41, 40, 91, 1);
text-align: center;
color: #fff;
font-size: 18px;
padding: 15px;
font-weight: 300;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
}
.footer_btnbay {
width: 100%;
box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34);
z-index: 999;
left: 0px;
right: 0px;
border-radius: 15px;
.continue {
width: 50%;
border-top-left-radius: 15px;
text-align: center;
font-size: 18px;
padding: 15px;
font-weight: 300;
float: left;
border-top: 1px solid #d7d5e4;
border-left: 1px solid #d7d5e4;
}
.checkout {
width: 50%;
border-top-right-radius: 15px;
background-color: rgba(41, 40, 91, 1); background-color: rgba(41, 40, 91, 1);
border: 1px solid rgba(41, 40, 91, 1);
text-align: center; text-align: center;
color: #fff; color: #fff;
font-size: 18px; font-size: 18px;
padding: 15px; padding: 15px;
font-weight: 300; font-weight: 300;
border-top-left-radius: 15px; float: right;
border-top-right-radius: 15px;
}
.footer_btnbay {
width: 100%;
box-shadow: 0px -2px 3px -1px rgba(0, 0, 0, 0.34);
position: fixed;
bottom: 0px;
z-index: 999;
left: 0px;
right: 0px;
border-radius: 15px;
.continue {
width: 50%;
border-top-left-radius: 15px;
text-align: center;
font-size: 18px;
padding: 15px;
font-weight: 300;
float: left;
border-top: 1px solid #d7d5e4;
border-left: 1px solid #d7d5e4;
}
.checkout {
width: 50%;
border-top-right-radius: 15px;
background-color: rgba(41, 40, 91, 1);
border: 1px solid rgba(41, 40, 91, 1);
text-align: center;
color: #fff;
font-size: 18px;
padding: 15px;
font-weight: 300;
float: right;
}
} }
} }
\ No newline at end of file
src/app/productdetail/productdetail.page.html
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
</button> </button>
<div class="nav_title floatLeft"> <div class="nav_title floatLeft">
</div> </div>
<button class="nav_btn floatRight"> <button class="nav_btn nav_cart floatRight">
</button> </button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</label> </label>
</button> </button>
</li> </li>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
</ul> </ul>
</div> </div>
...@@ -170,6 +170,9 @@ ...@@ -170,6 +170,9 @@
</div> </div>
</div> </div>
</div> </div>
</ion-content>
<ion-footer>
<div class="footer_div"> <div class="footer_div">
<div class="footer_options"> <div class="footer_options">
<button class="share"></button> <button class="share"></button>
...@@ -178,4 +181,4 @@ ...@@ -178,4 +181,4 @@
</div> </div>
<div class="footer_btn" (click)="cartService.buyNow(product)">BUY NOW</div> <div class="footer_btn" (click)="cartService.buyNow(product)">BUY NOW</div>
</div> </div>
</ion-content> </ion-footer>
\ No newline at end of file \ No newline at end of file
src/app/productdetail/productdetail.page.scss
...@@ -279,7 +279,6 @@ ...@@ -279,7 +279,6 @@
} }
.footer_div { .footer_div {
position: fixed;
bottom: 0px; bottom: 0px;
height: 50px; height: 50px;
left: 0px; left: 0px;
......
src/app/productlist/productlist.page.html
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
</div> </div>
<div class="viewset floatRight"> <div class="viewset floatRight">
<div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid"> <div class="grid_view grid_act floatRight" (click)="gridToggle()" [class.line_view]="onGrid">
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
...@@ -37,7 +36,7 @@ ...@@ -37,7 +36,7 @@
</div> </div>
<h5>{{product.prodName}}</h5> <h5>{{product.prodName}}</h5>
<p>A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p> <p>A$ {{product.price}}<span class="offer" *ngIf="product.discount > 0">-{{product.discount}}%</span></p>
</li> </li>
</ul> </ul>
</div> </div>
<div class="sort_wrappper" *ngIf="isShow" [@slideInOut]> <div class="sort_wrappper" *ngIf="isShow" [@slideInOut]>
......
src/global.scss
...@@ -491,6 +491,14 @@ app-deliverypop { ...@@ -491,6 +491,14 @@ app-deliverypop {
} }
} }
.nav_cart {
background-image: url("./assets/cart_icon.png");
img {
width: 25px;
display: none;
}
}
ion-header { ion-header {
z-index: 9999 !important; z-index: 9999 !important;
order: 0 !important; order: 0 !important;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment