wyk/juipnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【手机端和电脑端筛选功能】 https://www.tapd.cn/39598945/prong/stories/view/1139598945001000223

Browse Source
This commit is contained in:
“wanyongkang”
2021-05-27 09:23:02 +08:00
parent 28ae9d410b
commit 9907f87ee9
11 changed files with 110 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Host/Controllers/UserController.cs
View File

@@ -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)

2
Host/Models/AccountSearchModel.cs
View File

@@ -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";

2
Host/Models/OrderSearchModel.cs
View File

@@ -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; }
}

2
Host/Views.Mobile/User/Index.cshtml
View File

@@ -11,9 +11,9 @@
<ul class="plist">
<li><img src="~/m/img/p1.png"><a asp-action="indexInfo" asp-controller="user">个人信息<img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p3.png"><a asp-action="myaccounts" asp-controller="user">IP账号管理<img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p1.png"><a asp-action="myorders" asp-controller="user">我的订单<img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p2.png"><a asp-action="myrefundorders" asp-controller="user">退货订单<img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p3.png"><a asp-action="myaccounts" asp-controller="user">IP账号管理<img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券&nbsp;<span style="background-color: red;font-size:25px;" class="badge" id="coupon_num"></span><img src="~/m/img/arrow.png"></a></li>
<li><img src="~/m/img/p4.png"></span><a asp-action="cashout" asp-controller="user">提现管理<img src="~/m/img/arrow.png"></a></li>
</ul>

22
Host/Views.Mobile/User/MyAccounts.cshtml
View File

@@ -37,9 +37,25 @@
@*<div class="qq">
<img src="~/m/img/smile.png"> 为给您带来更好的服务体验，请完善QQ号和微信号
</div>*@
<div class="chaxun2">
<p style="text-align:center;color:white;">筛选功能已优化完成，可正常使用，更加便捷。</p>
<div class="row shaixuan">
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.ExpiredDay" @@change="search">
<option :value="-100">选择过期时间</option>
<option :value="-100">全部</option>
<option :value="1">1天内到期</option>
<option :value="3">3天内到期</option>
<option :value="7">一周内到期</option>
<option :value="-1">已经到期1天内</option>
<option :value="-3">已经到期3天内</option>
<option :value="-4">已经到期3天以上</option>
</select>
</div>
<div class="col-sm-4 col-xs-4">
<select @@change="search" v-model="searchModel.ProductId">
<option value="0">全部产品</option>
@@ -48,13 +64,15 @@
</div>
<div class="col-sm-4 col-xs-4">
<select @@change="search" v-model="searchModel.PackageId">
<option value="0">全部套餐</option>
<option value="0">全部套餐</option>
<option value="测试卡">测试卡</option>
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
</div>
@@ -109,7 +127,7 @@
<button type="button" class="btnXq" style="margin-top:3px">查看在线</button>
</a>
<a class="btnXq" v-if="@item.ProductId==19" href="/User/AssignAddress?productId=@item.ProductId&account=@item.Account&password=@item.Pwd">
<button type="button" class="btnXq" style="margin-top:3px">切换地区</button>
<button type="button" class="btnXq" style="margin-top:3px">选择地区</button>
</a>
</td>

20
Host/Views.Mobile/User/MyOrders.cshtml
View File

@@ -32,7 +32,7 @@
<div class="row shaixuan">
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.OrderType">
<select @@change="search" v-model="searchModel.OrderType">
<option value="0">全部类型</option>
<option value="1">新开</option>
<option value="2">续费</option>
@@ -41,15 +41,23 @@
</select>
</div>
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.ProductId">
<select @@change="search" v-model="searchModel.ProductId">
<option value="0">全部产品</option>
<option v-for="item in productWithPackage" :value="item.Product.Id">{{item.Product.Name}}</option>
</select>
</div>
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.PackageId">
<option value="0">全部套餐</option>
<option v-for="item in packages" :value="item.Id">{{item.Name}}</option>
<select @@change="search" v-model="searchModel.PackageId">
<option value="0">全部套餐</option>
<option value="测试卡">测试卡</option>
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
</div>
</div>
@@ -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")',

18
Host/Views.Mobile/User/MyRefundOrders.cshtml
View File

@@ -26,7 +26,7 @@
<div class="row shaixuan">
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.OrderType">
<select @@change="search" v-model="searchModel.OrderType">
<option value="0">全部类型</option>
<option value="1">新开</option>
<option value="2">续费</option>
@@ -35,15 +35,23 @@
</select>
</div>
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.ProductId">
<select @@change="search" v-model="searchModel.ProductId">
<option value="0">全部产品</option>
<option v-for="item in productWithPackage" :value="item.Product.Id">{{item.Product.Name}}</option>
</select>
</div>
<div class="col-sm-4 col-xs-4">
<select v-model="searchModel.PackageId">
<select @@change="search" v-model="searchModel.PackageId">
<option value="0">全部套餐</option>
<option v-for="item in packages" :value="item.Id">{{item.Name}}</option>
<option value="测试卡">测试卡</option>
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
</div>
</div>
@@ -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")',

7
Host/Views/Shared/_UserLayout.cshtml
View File

@@ -189,15 +189,16 @@
<div class="item @(currentPath=="/user/index"?"active_b":"")">
<img src="~/img/p1.png"><a href="/user/index">个人中心</a>
</div>
<div class="item @(currentPath=="/user/myaccounts"?"active_b":"")">
<img src="~/img/p4.png"><a href="/user/myaccounts">IP账号管理</a>
</div>
<div class="item @(currentPath=="/user/myorders"?"active_b":"")">
<img src="~/img/p2.png"><a href="/user/myorders">订单管理</a>
</div>
<div class="item @(currentPath=="/user/myrefundorders"?"active_b":"")">
<img src="~/img/p3.png"><a href="/user/myrefundorders">退货订单管理</a>
</div>
<div class="item @(currentPath=="/user/myaccounts"?"active_b":"")">
<img src="~/img/p4.png"><a href="/user/myaccounts">IP账号管理</a>
</div>
<div class="item @(currentPath=="/user/mycoupons"?"active_b":"")">
<img src="~/img/p5.png"><a href="/user/mycoupons">我的优惠券&nbsp;<span style="background-color: red;" class="badge" id="coupon_num"></span></a>
</div>

53
Host/Views/User/MyAccounts.cshtml
View File

@@ -298,45 +298,23 @@
</form>
</div>
<p class="wanshan"><img src="~/img/smile.png"> 为了给您带来更好的服务体验，请完善qq号和微信号。<a class="edit" asp-action="index" asp-controller="user" asp-route-e="1">立即完善》</a></p>
<p style="text-align:center;">筛选功能已优化完成，可正常使用，更加便捷。</p>
<div class="toolsBar">
<div class="item">
<div class="item" style="width:20%;">
<div class="btn-group">
<select v-model="searchModel.ExpiredDay" @@change="search" style="height:35px;">
<option>剩余时间</option>
<option :value="-1">全部</option>
<option :value="0">过期</option>
<option :value="1">1天</option>
<option :value="3">3天</option>
<option :value="7">一周</option>
<select v-model="searchModel.ExpiredDay" @@change="search" style="height:35px;width:200%;">
<option :value="-100">选择过期时间</option>
<option :value="-100">全部</option>
<option :value="1">1天内到期</option>
<option :value="3">3天内到期</option>
<option :value="7">一周内到期</option>
<option :value="-1">已经到期1天内</option>
<option :value="-3">已经到期3天内</option>
<option :value="-4">已经到期3天以上</option>
</select>
</div>
</div>
<div class="item">
<div class="row">
<div class='col-sm-6'>
<div class="form-group">
<!--指定 date标记-->
<div class='input-group date' id='datetimepicker1'>
<input type='text' class="form-control" v-model="searchModel.BTime" placeholder="到期开始时间" id="BTime" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
<div class='col-sm-6'>
<div class="form-group">
<!--指定 date标记-->
<div class='input-group date' id='datetimepicker2'>
<input type='text' class="form-control" placeholder="到期结束时间" v-model="searchModel.ETime" id="ETime" />
<span class="input-group-addon">
<span class="glyphicon glyphicon-calendar"></span>
</span>
</div>
</div>
</div>
</div>
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.ProductId" @@change="search" style="height:35px;">
@@ -353,8 +331,10 @@
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
@@ -386,7 +366,7 @@
<th>到期时间</th>
<th>剩余时间</th>
<th>在线及踢线</th>
<th>指定地区</th>
<th>选择地区</th>
<th>服务器</th>
<th>软件下载</th>
</tr>
@@ -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();

20
Host/Views/User/MyOrders.cshtml
View File

@@ -62,7 +62,7 @@
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.OrderType" style="height:35px;">
<select @@change="search" v-model="searchModel.OrderType" style="height:35px;">
<option value="0">全部类型</option>
<option value="1">新开</option>
<option value="2">续费</option>
@@ -73,7 +73,7 @@
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.ProductId" style="height:35px;">
<select @@change="search" v-model="searchModel.ProductId" style="height:35px;">
<option value="0">全部产品</option>
<option v-for="item in productWithPackage" :value="item.Product.Id">{{item.Product.Name}}</option>
</select>
@@ -81,14 +81,22 @@
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.PackageId" style="height:35px;">
<select @@change="search" v-model="searchModel.PackageId" style="height:35px;">
<option value="0">全部套餐</option>
<option v-for="item in packages" :value="item.Id">{{item.Name}}</option>
<option value="测试卡">测试卡</option>
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
</div>
</div>
<div class="item">
<input type="text" v-model="searchModel.KeyWord" placeholder="订单编号" class="bianhao" /><button type="button" class="btn btn-primary" v-on:click="search">查询</button>
<input type="text" v-model="searchModel.KeyWord" placeholder="账号" class="bianhao" /><button type="button" class="btn btn-primary" v-on:click="search">查询</button>
</div>
</div>
@@ -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")',

20
Host/Views/User/MyRefundOrders.cshtml
View File

@@ -39,7 +39,7 @@
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.ProductId" style="height:35px;">
<select @@change="search" v-model="searchModel.ProductId" style="height:35px;">
<option value="0" selected >全部产品</option>
<option v-for="item in productWithPackage" :value="item.Product.Id">{{item.Product.Name}}</option>
</select>
@@ -47,15 +47,23 @@
</div>
<div class="item">
<div class="btn-group">
<select v-model="searchModel.PackageId" style="height:35px;">
<option value="0">全部套餐</option>
<option v-for="item in packages" :value="item.Id">{{item.Name}}</option>
<select @@change="search" v-model="searchModel.PackageId" style="height:35px;">
<option value="0">全部套餐</option>
<option value="测试卡">测试卡</option>
<option value="天卡">天卡</option>
<option value="周卡">周卡</option>
<option value="月卡">月卡</option>
<option value="月卡(活动)">月卡(活动)</option>
<option value="双月卡(活动)">双月卡(活动)</option>
<option value="季卡">季卡</option>
<option value="季卡(活动)">季卡(活动)</option>
<option value="年卡">年卡</option>
</select>
</div>
</div>
<div class="item">
<input type="text" v-model="searchModel.KewWord" placeholder="订单编号" class="bianhao" />
<input type="text" v-model="searchModel.KewWord" placeholder="账号" class="bianhao" />
<button type="button" class="btn btn-primary" v-on:click="search">查询</button>
</div>
</div>
@@ -102,7 +110,7 @@
packages: [],
searchModel: {
ProductId:@this.Context.Request.GetInt("ProductId"),
PackageId:@this.Context.Request.GetInt("PackageId"),
PackageId:"0",
Keyword:'',
BTime: '',
ETime: ''