diff --git a/Service/Application.Web/Controllers/Pub/PubController.cs b/Service/Application.Web/Controllers/Pub/PubController.cs index 1f36623..ce95938 100644 --- a/Service/Application.Web/Controllers/Pub/PubController.cs +++ b/Service/Application.Web/Controllers/Pub/PubController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; namespace Application.Web.Controllers.Pub { - /// /// 公共接口 /// @@ -12,20 +11,31 @@ namespace Application.Web.Controllers.Pub public class PubController : ControllerBase { private readonly IAreaService _areaService; - public PubController(IAreaService areaService) - { + private readonly INoticeService _noticeService; + public PubController(IAreaService areaService,INoticeService noticeService) + { _areaService = areaService; + _noticeService = noticeService; } /// /// 获取首页信息 /// + /// /// [HttpGet] - public async Task GetMain() + public async Task GetMain(string sid) { + bool isOnline = false; + if (!string.IsNullOrEmpty(sid)) + { + isOnline = true; + } + var areaData = await _areaService.GetAreaData(); - return PoAction.Ok(new{area=areaData}); + var notice = await _noticeService.GetNoticeDataByTake(5); + + return PoAction.Ok(new { area = areaData ,notice,isOnline}); } } -} +} \ No newline at end of file diff --git a/Web/src/pages/auth/login.vue b/Web/src/pages/auth/login.vue deleted file mode 100644 index 8f0871c..0000000 --- a/Web/src/pages/auth/login.vue +++ /dev/null @@ -1,592 +0,0 @@ - - - - - diff --git a/Web/src/pages/home/im.vue b/Web/src/pages/home/im.vue deleted file mode 100644 index 2f437c2..0000000 --- a/Web/src/pages/home/im.vue +++ /dev/null @@ -1,598 +0,0 @@ -