diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index deb77fe..575495d 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -440,9 +440,9 @@ namespace Home.Controllers orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId); } - if (request.PackageId > 0) + if (request.PackageId !="0") { - orderQuery = orderQuery.Where(m => m.PackageId == request.PackageId); + orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); } if (request.ETime.HasValue && request.BTime.HasValue) @@ -475,9 +475,9 @@ namespace Home.Controllers orderQuery = orderQuery.Where(m => m.ProductId == request.ProductId); } - if (request.PackageId > 0) + if (request.PackageId != "0") { - orderQuery = orderQuery.Where(m => m.PackageId == request.PackageId); + orderQuery = orderQuery.Where(m => m.PackageName == request.PackageId); } if (request.ETime.HasValue && request.BTime.HasValue) @@ -513,9 +513,15 @@ namespace Home.Controllers exp = exp.And(m => m.PackageName == request.PackageId); } - if (request.ExpiredDay > -1) + if (request.ExpiredDay > -100) { - exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) == request.ExpiredDay); + if (request.ExpiredDay > 0){ + exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= request.ExpiredDay && Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) >=0); + } else if (request.ExpiredDay < 0 && request.ExpiredDay!=-4) { + exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) >= request.ExpiredDay && Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <=0); + } else { + exp = exp.And(m => Math.Ceiling((m.EndTime - DateTime.Now).Value.TotalDays) <= -4); + } } if (request.ETime.HasValue && request.BTime.HasValue) diff --git a/Host/Models/AccountSearchModel.cs b/Host/Models/AccountSearchModel.cs index 5b7b911..9f5cbab 100644 --- a/Host/Models/AccountSearchModel.cs +++ b/Host/Models/AccountSearchModel.cs @@ -8,7 +8,7 @@ namespace Home.Models { public DateTime? BTime { get; set; } public DateTime? ETime { get; set; } - public int? ExpiredDay { get; set; } = -1;//OrderType + public int? ExpiredDay { get; set; } = -100;//OrderType public int ProductId { get; set; } = 0; public string PackageId { get; set; } = "0"; diff --git a/Host/Models/OrderSearchModel.cs b/Host/Models/OrderSearchModel.cs index 86c87e4..6b36327 100644 --- a/Host/Models/OrderSearchModel.cs +++ b/Host/Models/OrderSearchModel.cs @@ -11,7 +11,7 @@ namespace Home.Models public int? OrderType { get; set; } = 0;//OrderType public int ProductId { get; set; } = 0; - public int PackageId { get; set; } = 0; + public string PackageId { get; set; } = "0"; public int IsRefund { get; set; } } diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml index 05504fd..f01930f 100644 --- a/Host/Views.Mobile/User/Index.cshtml +++ b/Host/Views.Mobile/User/Index.cshtml @@ -11,9 +11,9 @@ diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml index c554ef1..1bd010c 100644 --- a/Host/Views.Mobile/User/MyAccounts.cshtml +++ b/Host/Views.Mobile/User/MyAccounts.cshtml @@ -37,9 +37,25 @@ @*
为给您带来更好的服务体验,请完善QQ号和微信号
*@ + +
+

筛选功能已优化完成,可正常使用,更加便捷。

+ +
+ +
- + + +
@@ -109,7 +127,7 @@ - + diff --git a/Host/Views.Mobile/User/MyOrders.cshtml b/Host/Views.Mobile/User/MyOrders.cshtml index 385a0c9..8cea03c 100644 --- a/Host/Views.Mobile/User/MyOrders.cshtml +++ b/Host/Views.Mobile/User/MyOrders.cshtml @@ -32,7 +32,7 @@
- @@ -41,15 +41,23 @@
-
- + + + + + + + + + +
@@ -149,7 +157,7 @@ searchModel: { OrderType:0, ProductId:@this.Context.Request.GetInt("ProductId"), - PackageId:@this.Context.Request.GetInt("PackageId"), + PackageId:"0", KeyWord:'', BTime: '@this.Context.Request.Get("BTime")', ETime: '@this.Context.Request.Get("ETime")', diff --git a/Host/Views.Mobile/User/MyRefundOrders.cshtml b/Host/Views.Mobile/User/MyRefundOrders.cshtml index ee1734c..d045f31 100644 --- a/Host/Views.Mobile/User/MyRefundOrders.cshtml +++ b/Host/Views.Mobile/User/MyRefundOrders.cshtml @@ -26,7 +26,7 @@
- @@ -35,15 +35,23 @@
-
- - + + + + + + + + +
@@ -145,7 +153,7 @@ searchModel: { OrderType:0, ProductId:@this.Context.Request.GetInt("ProductId"), - PackageId:@this.Context.Request.GetInt("PackageId"), + PackageId:"0", KeyWord:'', BTime: '@this.Context.Request.Get("BTime")', ETime: '@this.Context.Request.Get("ETime")', diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml index ea632d1..f10e8f1 100644 --- a/Host/Views/Shared/_UserLayout.cshtml +++ b/Host/Views/Shared/_UserLayout.cshtml @@ -189,15 +189,16 @@ + + - diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml index d1991d7..db01ed8 100644 --- a/Host/Views/User/MyAccounts.cshtml +++ b/Host/Views/User/MyAccounts.cshtml @@ -298,45 +298,23 @@

为了给您带来更好的服务体验,请完善qq号和微信号。立即完善》

+

筛选功能已优化完成,可正常使用,更加便捷。

-
+
- + + + + + + + +
-
-
-
-
- -
- - - - -
-
-
-
-
- -
- - - - -
-
-
-
-
+
@@ -386,7 +366,7 @@ 到期时间 剩余时间 在线及踢线 - 指定地区 + 选择地区 服务器 软件下载 @@ -480,7 +460,7 @@ assign_pass:'', productId:'', searchModel: { - ExpiredDay:-1, + ExpiredDay:-100, ProductId:@this.Context.Request.GetInt("ProductId"), PackageId:'0', Keyword:'@this.Context.Request.Get("Keyword")', @@ -514,7 +494,6 @@ }, created: function () { - }, mounted: function () { this.getProducts(); diff --git a/Host/Views/User/MyOrders.cshtml b/Host/Views/User/MyOrders.cshtml index 7432a6f..fa55d83 100644 --- a/Host/Views/User/MyOrders.cshtml +++ b/Host/Views/User/MyOrders.cshtml @@ -62,7 +62,7 @@
- @@ -73,7 +73,7 @@
- @@ -81,14 +81,22 @@
- - + + + + + + + + +
- +
@@ -168,7 +176,7 @@ searchModel: { OrderType:0, ProductId:@this.Context.Request.GetInt("ProductId"), - PackageId:@this.Context.Request.GetInt("PackageId"), + PackageId:"0", KeyWord:'', BTime: '@this.Context.Request.Get("BTime")', ETime: '@this.Context.Request.Get("ETime")', diff --git a/Host/Views/User/MyRefundOrders.cshtml b/Host/Views/User/MyRefundOrders.cshtml index b3b245f..a959e5c 100644 --- a/Host/Views/User/MyRefundOrders.cshtml +++ b/Host/Views/User/MyRefundOrders.cshtml @@ -39,7 +39,7 @@
- @@ -47,15 +47,23 @@
- + + + + + + + + + +
- +
@@ -102,7 +110,7 @@ packages: [], searchModel: { ProductId:@this.Context.Request.GetInt("ProductId"), - PackageId:@this.Context.Request.GetInt("PackageId"), + PackageId:"0", Keyword:'', BTime: '', ETime: ''