Commit 3fdfee32 authored by alish's avatar alish
Browse files

feat: update Back functionality and fix popup

parent 75c1e913

packages/shop-mobile-ionic/src/app/pages/+products/+order/+order-info/order-info.page.ts

+3 −1
Original line number Diff line number Diff line
@@ -274,7 +274,9 @@ export class OrderInfoPage implements OnInit, OnDestroy { 
	}



	undo() {

		this.showCancelOrderInfoModal();

		// this.showCancelOrderInfoModal();



		this.router.navigate(['/products']);

	}



	private async showCancelOrderInfoModal(): Promise<void> {

packages/shop-mobile-ionic/src/app/pages/+products/products.page.ts

+8 −0
Original line number Diff line number Diff line
@@ -251,6 +251,14 @@ export class ProductsPage implements OnInit, OnDestroy { 
			merchantIds = [this.inStore];

		}



		if (

			merchantIds.length === 0 &&

			this.store.orderId &&

			this.store.orderWarehouseId

		) {

			merchantIds = [this.store.orderWarehouseId];

		}



		await this.loadProductsCount(merchantIds, imageOrientation);



		this.changePage = false;

packages/shop-mobile-ionic/src/global.scss

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ ion-backdrop { 
.order-info-modal {

	display: block;



	.modal-shadow {

		display: none;

	}



	.modal-wrapper {

		background: rgba(255, 255, 255, 0);

	}