优化
This commit is contained in:
@@ -508,9 +508,9 @@ namespace Home.Controllers
|
|||||||
exp = exp.And(m => m.ProductId == request.ProductId);
|
exp = exp.And(m => m.ProductId == request.ProductId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request.PackageId > 0)
|
if (request.PackageId != "0")
|
||||||
{
|
{
|
||||||
exp = exp.And(m => m.PackageId == request.PackageId);
|
exp = exp.And(m => m.PackageName == request.PackageId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request.ExpiredDay > -1)
|
if (request.ExpiredDay > -1)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ namespace Home.Models
|
|||||||
public int? ExpiredDay { get; set; } = -1;//OrderType
|
public int? ExpiredDay { get; set; } = -1;//OrderType
|
||||||
|
|
||||||
public int ProductId { get; set; } = 0;
|
public int ProductId { get; set; } = 0;
|
||||||
public int PackageId { get; set; } = 0;
|
public string PackageId { get; set; } = "0";
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,8 +37,29 @@
|
|||||||
@*<div class="qq">
|
@*<div class="qq">
|
||||||
<img src="~/m/img/smile.png"> 为给您带来更好的服务体验,请完善QQ号和微信号
|
<img src="~/m/img/smile.png"> 为给您带来更好的服务体验,请完善QQ号和微信号
|
||||||
</div>*@
|
</div>*@
|
||||||
|
|
||||||
<div class="chaxun2">
|
<div class="chaxun2">
|
||||||
<input type="text" v-model="searchModel.Keyword" placeholder="账号" /><button type="button" class="btnOrange" v-on:click="search">查询</button>
|
<div class="row shaixuan">
|
||||||
|
<div class="col-sm-4 col-xs-4">
|
||||||
|
<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 @@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>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="row riqi">
|
<div class="row riqi">
|
||||||
<div class="col-sm-4 col-xs-4">
|
<div class="col-sm-4 col-xs-4">
|
||||||
@@ -52,21 +73,12 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row shaixuan">
|
<div class="chaxun2" style="background-color: white;margin-top:0;">
|
||||||
<div class="col-sm-4 col-xs-4">
|
<input type="text" v-model="searchModel.Keyword" placeholder="账号" /><button type="button" class="btnOrange" v-on:click="search">查询</button>
|
||||||
<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 @@change="search" v-model="searchModel.PackageId">
|
|
||||||
<option value="0">全部套餐</option>
|
|
||||||
<option v-for="item in packages" :value="item.Id">{{item.Name}}</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<table border="0" cellspacing="0" cellpadding="0" class="orderTable">
|
<table border="0" cellspacing="0" cellpadding="0" class="orderTable">
|
||||||
<tr>
|
<tr>
|
||||||
<th><input type="checkbox" name="" id="checkAll" value="" style="width: 0.4rem;height: 0.4rem;" /></th>
|
<th><input type="checkbox" name="" id="checkAll" value="" style="width: 0.4rem;height: 0.4rem;" /></th>
|
||||||
@@ -318,7 +330,7 @@
|
|||||||
searchModel: {
|
searchModel: {
|
||||||
ExpiredDay:-1,
|
ExpiredDay:-1,
|
||||||
ProductId:@this.Context.Request.GetInt("ProductId"),
|
ProductId:@this.Context.Request.GetInt("ProductId"),
|
||||||
PackageId:@this.Context.Request.GetInt("PackageId"),
|
PackageId:'0',
|
||||||
Keyword:'@this.Context.Request.Get("Keyword")',
|
Keyword:'@this.Context.Request.Get("Keyword")',
|
||||||
BTime: '@this.Context.Request.Get("BTime")',
|
BTime: '@this.Context.Request.Get("BTime")',
|
||||||
ETime: '@this.Context.Request.Get("ETime")',
|
ETime: '@this.Context.Request.Get("ETime")',
|
||||||
@@ -351,18 +363,7 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'searchModel.ProductId': { //加引号监听对象里的属性
|
|
||||||
handler: function (newValue, oldValue) {
|
|
||||||
for (var i = 0; i < this.productWithPackage.length; i++) {
|
|
||||||
var item = this.productWithPackage[i];
|
|
||||||
if (item.Product.Id == newValue) {
|
|
||||||
this.packages = item.Packages
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
immediate: true
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
mounted: function () {
|
mounted: function () {
|
||||||
this.getProducts();
|
this.getProducts();
|
||||||
|
|||||||
@@ -349,7 +349,13 @@
|
|||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
<select v-model="searchModel.PackageId" @@change="search" style="height:35px;">
|
<select v-model="searchModel.PackageId" @@change="search" style="height:35px;">
|
||||||
<option value="0">全部套餐</option>
|
<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>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -476,7 +482,7 @@
|
|||||||
searchModel: {
|
searchModel: {
|
||||||
ExpiredDay:-1,
|
ExpiredDay:-1,
|
||||||
ProductId:@this.Context.Request.GetInt("ProductId"),
|
ProductId:@this.Context.Request.GetInt("ProductId"),
|
||||||
PackageId:@this.Context.Request.GetInt("PackageId"),
|
PackageId:'0',
|
||||||
Keyword:'@this.Context.Request.Get("Keyword")',
|
Keyword:'@this.Context.Request.Get("Keyword")',
|
||||||
BTime: '@this.Context.Request.Get("BTime")',
|
BTime: '@this.Context.Request.Get("BTime")',
|
||||||
ETime: '@this.Context.Request.Get("ETime")',
|
ETime: '@this.Context.Request.Get("ETime")',
|
||||||
@@ -505,18 +511,7 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
'searchModel.ProductId': { //加引号监听对象里的属性
|
|
||||||
handler: function (newValue, oldValue) {
|
|
||||||
for (var i = 0; i < this.productWithPackage.length; i++) {
|
|
||||||
var item = this.productWithPackage[i];
|
|
||||||
if (item.Product.Id == newValue) {
|
|
||||||
this.packages = item.Packages
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
immediate: true
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
created: function () {
|
created: function () {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user