diff --git a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs index a6f6f6aa..b4016d47 100644 --- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs +++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Web/Menus/OrdersMenuContributor.cs @@ -37,7 +37,7 @@ namespace EasyAbp.EShop.Orders.Web.Menus if (!orderManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == OrdersMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == OrdersMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(OrdersMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(orderManagementMenuItem); diff --git a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs index 30d284c2..7350f71b 100644 --- a/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs +++ b/modules/EasyAbp.EShop.Payments/src/EasyAbp.EShop.Payments.Web/Menus/PaymentsMenuContributor.cs @@ -43,7 +43,7 @@ namespace EasyAbp.EShop.Payments.Web.Menus if (!paymentManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == PaymentsMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == PaymentsMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(PaymentsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(paymentManagementMenuItem); diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs index 591364de..667bbe81 100644 --- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs +++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Web/Menus/ProductsMenuContributor.cs @@ -40,7 +40,7 @@ namespace EasyAbp.EShop.Products.Web.Menus if (!productManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == ProductsMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == ProductsMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(ProductsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(productManagementMenuItem); diff --git a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs index c294d739..bc8539f7 100644 --- a/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs +++ b/modules/EasyAbp.EShop.Stores/src/EasyAbp.EShop.Stores.Web/Menus/StoresMenuContributor.cs @@ -50,7 +50,7 @@ namespace EasyAbp.EShop.Stores.Web.Menus if (!storeManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == StoresMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == StoresMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(StoresMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(storeManagementMenuItem); diff --git a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenuContributor.cs b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenuContributor.cs index ad964b3e..f80b7649 100644 --- a/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenuContributor.cs +++ b/plugins/Baskets/src/EasyAbp.EShop.Plugins.Baskets.Web/Menus/BasketsMenuContributor.cs @@ -19,19 +19,21 @@ namespace EasyAbp.EShop.Plugins.Baskets.Web.Menus { var l = context.GetLocalizer(); //Add main menu items. - var basketManagementMenuItem = new ApplicationMenuItem(BasketsMenus.Prefix, l["Menu:BasketManagement"]); + // var basketManagementMenuItem = new ApplicationMenuItem(BasketsMenus.Prefix, l["Menu:BasketManagement"]); - basketManagementMenuItem.AddItem( - new ApplicationMenuItem(BasketsMenus.BasketItem, l["Menu:BasketItem"], $"/EShop/Plugins/Baskets/BasketItems/BasketItem?basketName={BasketsConsts.DefaultBasketName}&userId=") + context.Menu.AddItem( + new ApplicationMenuItem(BasketsMenus.BasketItem, l["Menu:BasketItem"], + $"/EShop/Plugins/Baskets/BasketItems/BasketItem?basketName={BasketsConsts.DefaultBasketName}&userId=", + icon: "fa fa-shopping-cart") ); - - if (!basketManagementMenuItem.Items.IsNullOrEmpty()) - { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == BasketsMenus.ModuleGroupPrefix, - () => new ApplicationMenuItem(BasketsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); - - eShopMenuItem.Items.Add(basketManagementMenuItem); - } + + // if (!basketManagementMenuItem.Items.IsNullOrEmpty()) + // { + // var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == BasketsMenus.ModuleGroupPrefix, + // () => new ApplicationMenuItem(BasketsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); + // + // eShopMenuItem.Items.Add(basketManagementMenuItem); + // } } } -} +} \ No newline at end of file diff --git a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Menus/BookingMenuContributor.cs b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Menus/BookingMenuContributor.cs index e05b6a4c..56afad40 100644 --- a/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Menus/BookingMenuContributor.cs +++ b/plugins/Booking/src/EasyAbp.EShop.Plugins.Booking.Web/Menus/BookingMenuContributor.cs @@ -51,8 +51,8 @@ public class BookingMenuContributor : IMenuContributor if (!bookingMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == BookingMenus.ModuleGroupPrefix, - () => new ApplicationMenuItem(BookingMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"])); + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == BookingMenus.ModuleGroupPrefix, + () => new ApplicationMenuItem(BookingMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(bookingMenuItem); } diff --git a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Menus/CouponsMenuContributor.cs b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Menus/CouponsMenuContributor.cs index b80d3aea..71f3c1d4 100644 --- a/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Menus/CouponsMenuContributor.cs +++ b/plugins/Coupons/src/EasyAbp.EShop.Plugins.Coupons.Web/Menus/CouponsMenuContributor.cs @@ -38,7 +38,7 @@ namespace EasyAbp.EShop.Plugins.Coupons.Web.Menus if (!couponManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == CouponsMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == CouponsMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(CouponsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(couponManagementMenuItem); diff --git a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs index 50d1a707..216ea86e 100644 --- a/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs +++ b/plugins/FlashSales/src/EasyAbp.EShop.Plugins.FlashSales.Web/Menus/FlashSalesMenuContributor.cs @@ -46,7 +46,7 @@ public class FlashSalesMenuContributor : IMenuContributor if (!flashSalesManagementMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == FlashSalesMenus.ModuleGroupPrefix, + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == FlashSalesMenus.ModuleGroupPrefix, () => new ApplicationMenuItem(FlashSalesMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(flashSalesManagementMenuItem); diff --git a/plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Menus/PromotionsMenuContributor.cs b/plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Menus/PromotionsMenuContributor.cs index 3ea25399..62e6f133 100644 --- a/plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Menus/PromotionsMenuContributor.cs +++ b/plugins/Promotions/src/EasyAbp.EShop.Plugins.Promotions.Web/Menus/PromotionsMenuContributor.cs @@ -38,9 +38,8 @@ public class PromotionsMenuContributor : IMenuContributor if (!promotionMenuItem.Items.IsNullOrEmpty()) { - var eShopMenuItem = context.Menu.Items.GetOrAdd(i => i.Name == PromotionsMenus.ModuleGroupPrefix, - () => new ApplicationMenuItem(PromotionsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], - icon: "fa fa-badge-percent")); + var eShopMenuItem = context.Menu.GetAdministration().Items.GetOrAdd(i => i.Name == PromotionsMenus.ModuleGroupPrefix, + () => new ApplicationMenuItem(PromotionsMenus.ModuleGroupPrefix, l["Menu:EasyAbpEShop"], icon: "fa fa-shopping-bag")); eShopMenuItem.Items.Add(promotionMenuItem); }