fix : ui bug`

This commit is contained in:
2025-10-01 15:25:37 +03:30
parent 3d957b8aee
commit 84ab266431
4 changed files with 59 additions and 50 deletions

View File

@@ -77,7 +77,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
spacing: 3, spacing: 3,
children: [ children: [
Text( Text(
item.steward?.user?.fullname ?? 'N/A', item.toSteward?.user?.fullname ?? 'N/A',
textAlign: TextAlign.start, textAlign: TextAlign.start,
style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal), style: AppFonts.yekan12.copyWith(color: AppColor.blueNormal),
), ),
@@ -118,7 +118,7 @@ class BuyInProvinceWaitingPage extends GetView<BuyInProvinceWaitingLogic> {
), ),
Text( Text(
item.steward?.guildsName ?? 'N/A', item?.toSteward?.guildsName ?? 'N/A',
textAlign: TextAlign.start, textAlign: TextAlign.start,
style: AppFonts.yekan12.copyWith(color: AppColor.bgDark), style: AppFonts.yekan12.copyWith(color: AppColor.bgDark),
), ),

View File

@@ -25,10 +25,13 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
onFilterTap: () { onFilterTap: () {
Get.bottomSheet(filterBottomSheet()); Get.bottomSheet(filterBottomSheet());
}, },
widgets: [
child: Stack(
children: [
Positioned.fill(child:Column(
children: [
inventoryWidget(controller.rootLogic), inventoryWidget(controller.rootLogic),
Expanded( ObxValue((data) {
child: ObxValue((data) {
return RPaginatedListView( return RPaginatedListView(
listType: ListType.separated, listType: ListType.separated,
resource: data.value, resource: data.value,
@@ -56,10 +59,13 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
await controller.getStewardPurchaseOutOfProvince(); await controller.getStewardPurchaseOutOfProvince();
}, },
); );
}, controller.purchaseOutOfProvinceList), }, controller.purchaseOutOfProvinceList)
),
], ],
floatingActionButton: RFab.add( )),
Positioned(
right: 5,
bottom: 95,
child: RFab.add(
onPressed: () { onPressed: () {
Get.bottomSheet( Get.bottomSheet(
addPurchasedInformationBottomSheet(), addPurchasedInformationBottomSheet(),
@@ -69,8 +75,11 @@ class BuyOutOfProvincePage extends GetView<BuyOutOfProvinceLogic> {
controller.resetSubmitForm(); controller.resetSubmitForm();
}); });
}, },
))
],
), ),
floatingActionButtonLocation: FloatingActionButtonLocation.startFloat,
); );
} }

View File

@@ -65,7 +65,7 @@ class HomePage extends GetView<HomeLogic> {
), ),
SizedBox(height: 8), SizedBox(height: 8),
_todayShipmentWidget(), _todayShipmentWidget(),
_todayShipmentWidget2(), //_todayShipmentWidget2(),
_inventoryWidget(), _inventoryWidget(),
Row( Row(
@@ -105,7 +105,7 @@ class HomePage extends GetView<HomeLogic> {
children: [Icon(CupertinoIcons.chevron_down, size: 18)], children: [Icon(CupertinoIcons.chevron_down, size: 18)],
), ),
_todayShipmentWidget(), _todayShipmentWidget(),
_todayShipmentWidget2(), // _todayShipmentWidget2(),
_inventoryWidget(), _inventoryWidget(),
], ],
), ),

View File

@@ -74,7 +74,7 @@ class SalesInProvincePage extends GetView<SalesInProvinceLogic> {
), ),
Positioned( Positioned(
right: 5, right: 5,
bottom: 15, bottom: 95,
child: SizedBox( child: SizedBox(
width: Get.width - 30, width: Get.width - 30,
child: Row( child: Row(