This commit is contained in:
“wanyongkang”
2024-01-02 14:13:19 +08:00
parent 09da57ad92
commit 5d8bbcc67b
9 changed files with 791 additions and 11 deletions

View File

@@ -739,7 +739,7 @@ namespace Home.Controllers
{
var product = new ProductEntity();
var package = new ProductPackageEntity();
if (id==1034||id==1040||id==89){
if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097){
package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync();
product = await m_ProductService.GetById(package.ProductId);
} else {
@@ -894,6 +894,39 @@ namespace Home.Controllers
return View(model);
}
}
//0 无状态 1尊享 2高级 3普通
var pro_type_flag_liebao = 0;
var pro_type_temp_liebao = 0;
if (productId == 26) {
accountList.ForEach(m => {
if (m.PackageId<1097) {
pro_type_flag_liebao = 1;
}
if (m.PackageId>1096&&m.PackageId<1103) {
pro_type_flag_liebao = 2;
}
if (m.PackageId>1103&&m.PackageId<1109) {
pro_type_flag_liebao = 3;
}
if (pro_type_temp_liebao==0){
pro_type_temp_liebao = pro_type_flag_liebao;
}
if (pro_type_temp_liebao!=pro_type_flag_liebao){
ViewBag.errorTip = "猎豹不同类型不能同时续费";
}
});
if (ViewBag.errorTip == "猎豹不同类型不能同时续费"){
return View(model);
}
}
@@ -943,7 +976,7 @@ namespace Home.Controllers
if (m.ProductId == 6||m.ProductId == 5){
m.Title = "9";
}
if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){
if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 26||m.ProductId == 17){
m.Title = "8";
}
}
@@ -961,7 +994,17 @@ namespace Home.Controllers
if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) {
package_temp.Add(m);
}
}else {
}else if(m.ProductId == 26){
if (pro_type_temp_liebao ==1 && m.Id<1097) {
package_temp.Add(m);
}
if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) {
package_temp.Add(m);
}
if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) {
package_temp.Add(m);
}
} else {
package_temp.Add(m);
}
@@ -1003,7 +1046,17 @@ namespace Home.Controllers
if (pro_type_temp ==3 && m.Id>1040&&m.Id<1046) {
package_temp.Add(m);
}
}else {
}else if(m.ProductId == 26){
if (pro_type_temp_liebao ==1 && m.Id<1097) {
package_temp.Add(m);
}
if (pro_type_temp_liebao ==2 && m.Id>1097&&m.Id<1103) {
package_temp.Add(m);
}
if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) {
package_temp.Add(m);
}
} else {
package_temp.Add(m);
}
});

View File

@@ -483,6 +483,9 @@
case 25:
self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv';
break;
case 26:
self.location.href='http://php-api.juip.com/script/linedata/data/download/liebao.csv';
break;
}
},
detail(r){

View File

@@ -171,6 +171,10 @@
<li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" id="p14" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
</li>
}else if(item.Product.Id == 26) {
<li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
<a href="#@item.Product.Id" id="p26" role="tab" data-toggle="tab" style="font-size: 25px;border:1px solid #99CCFF">@item.Product.Name</a>
</li>
}
else if(item.Product.Id == 22) {
<li >
@@ -216,11 +220,21 @@
<p class=" text-center" style="color:#FF9933">需求五个以上、可联系右侧客服设置优惠价</p>
</div>
<div style="margin-top:calc(2vh);">
@if (item.Product.Id == 14){
<div class="p_type @("type"+item.Product.Id)" style="padding-top: 10px;">
<button type="button" onclick="ttzhizun()" class="btn btn-default btn-lg ttzx" style="background-color: #FF9900;font-size:1.3em;">尊享版-不限速</button>
<button type="button" onclick="ttgaoji()" class="btn btn-default btn-lg ttgj" style="background-color: white;font-size:1.3em;">高级版-限速4M</button><br>
<button type="button" onclick="ttputong()" class="btn btn-default btn-lg ttpt" style="background-color: white;font-size:1.3em;margin-top:10px;">普通版-限速2M</button>
</div>
}
@if (item.Product.Id == 26){
<div class="p_type @("type"+item.Product.Id)" style="padding-top: 10px;">
<button type="button" onclick="lbzhizun()" class="btn btn-default btn-lg lbzx" style="background-color: #FF9900;font-size:1.3em;">尊享版-不限速</button>
<button type="button" onclick="lbgaoji()" class="btn btn-default btn-lg lbgj" style="background-color: white;font-size:1.3em;">高级版-限速4M</button><br>
<button type="button" onclick="lbputong()" class="btn btn-default btn-lg lbpt" style="background-color: white;font-size:1.3em;margin-top:10px;">普通版-限速2M</button>
</div>
}
@if (item.Product.Id == 20) {
<div style="margin: 5px;">
@@ -247,7 +261,7 @@
@foreach (var package in item.Packages.Where(m => m.Status == 1&&(m.TenantId==1157||m.TenantId==9999||m.TenantId==10000)).OrderBy(m => m.TenantId))
{
if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040)
if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040&&package.Id != 1094&&package.Id != 1097&&package.Id != 1103)
{
<a asp-action="test" id="@("package-"+package.Id)" asp-controller="product" asp-route-id="@package.ProductId">
<div class="card color_2">
@@ -279,7 +293,7 @@
</div>
</div>
</a>
} else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){
} else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1094||package.Id == 1097||package.Id == 1103)&&package.IsTest==1){
<a asp-action="test" id="@("package-"+package.Id)" asp-controller="product" asp-route-id="@package.Id">
<div class="card color_2">
<div class="item">
@@ -332,6 +346,7 @@
$(".p_type").hide();
$("#p14").click(function () {
$(".type14").show();
$(".type26").hide();
$("#package-89").show();
$("#package-69").show();
$("#package-70").show();
@@ -341,6 +356,24 @@
for (var i=1034;i<1046;i++){
$("#package-"+i).hide();
}
$(".ttzx").css('background-color','#FF9900');
$(".ttgj").css('background-color','white');
$(".ttpt").css('background-color','white');
});
$("#p26").click(function () {
$(".type14").hide();
$(".type26").show();
for (var i=1090;i<1097;i++){
$("#package-"+i).show();
}
for (var i=1097;i<1109;i++){
$("#package-"+i).hide();
}
$(".lbzx").css('background-color','#FF9900');
$(".lbgj").css('background-color','white');
$(".lbpt").css('background-color','white');
});
function ttzhizun() {
$("#package-89").show();
@@ -357,6 +390,18 @@
$(".ttgj").css('background-color','white');
$(".ttpt").css('background-color','white');
}
function lbzhizun() {
for (var i=1090;i<1097;i++){
$("#package-"+i).show();
}
for (var i=1097;i<1109;i++){
$("#package-"+i).hide();
}
$(".lbzx").css('background-color','#FF9900');
$(".lbgj").css('background-color','white');
$(".lbpt").css('background-color','white');
}
function ttgaoji() {
$(".ttgj").css('background-color','#FF9900');
$(".ttzx").css('background-color','white');
@@ -374,6 +419,21 @@
$("#package-"+i).show();
}
}
function lbgaoji() {
$(".lbgj").css('background-color','#FF9900');
$(".lbzx").css('background-color','white');
$(".lbpt").css('background-color','white');
for (var i=1090;i<1097;i++){
$("#package-"+i).hide();
}
for (var i=1103;i<1109;i++){
$("#package-"+i).hide();
}
for (var i=1097;i<1103;i++){
$("#package-"+i).show();
}
}
function ttputong() {
$(".ttpt").css('background-color','#FF9900');
$(".ttzx").css('background-color','white');
@@ -391,6 +451,21 @@
$("#package-"+i).hide();
}
}
function lbputong() {
$(".lbpt").css('background-color','#FF9900');
$(".lbzx").css('background-color','white');
$(".lbgj").css('background-color','white');
for (var i=1090;i<1097;i++){
$("#package-"+i).hide();
}
for (var i=1103;i<1109;i++){
$("#package-"+i).show();
}
for (var i=1097;i<1103;i++){
$("#package-"+i).hide();
}
}
var wjdxtype = 1;
function wjdxphone() {

View File

@@ -284,6 +284,11 @@
<td>1234</td>
<td>4430</td>
</tr>
<tr>
<td>猎豹</td>
<td>1234</td>
<td>4430</td>
</tr>
<tr>
<td>强子</td>
<td>888888</td>
@@ -396,6 +401,11 @@
this.search_field = '天天IP';
this.sstp = '4430';
break;
case 26:
this.l2tp = '1234';
this.search_field = '猎豹IP';
this.sstp = '4430';
break;
case 15:
this.l2tp = '66';
this.search_field = '共享IP';
@@ -562,6 +572,9 @@
case 25:
self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv';
break;
case 26:
self.location.href='http://php-api.juip.com/script/linedata/data/download/liebao.csv';
break;
}
}
}

View File

@@ -259,6 +259,12 @@
</div>
}
else if(item.Product.Id == 26) {
<div class="dropdown">
<div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">新 </span>@item.Product.Name</div>
</div>
}
else if(item.Product.Id == 22) {
<div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></div>
<div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name</div>
@@ -359,6 +365,21 @@
</ul>
</div>
}
@if(item.Product.Id == 26) { //不限速
<div style="padding-top:10px;">
<ul class="nav nav-tabs nav-justified" style="margin:0 0 0 50px;cursor: pointer;">
<li id="tablbzx" style="border:1px solid #ccc" class="active">
<a onclick="lbzhizun()" style="color: #009966;width:350px;background:rgba(0,0,0,0)">尊享版-不限速</a>
</li>
<li style="border:1px solid #ccc" id="tablbgj">
<a onclick="lbgaoji()" style="color: #009966;width:350px;background:rgba(0,0,0,0)">高级版-限速4M</a>
</li>
<li style="border:1px solid #ccc" id="tablbpt">
<a onclick="lbputong()" style="color: #009966;width:350px;background:rgba(0,0,0,0)">普通版-限速2M</a>
</li>
</ul>
</div>
}
@* @if(item.Product.Id == 18){
@@ -444,7 +465,7 @@
<div class="card" style="margin-top:30px;">
<div style="display: flex;margin: 0 auto;">
@if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14){
@if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26){
<div class="item packageitem" a-test="true" id="@("pkgtest"+item.Product.Id)" a-pkg-id="@item.Product.Id">
<p><span class="price">免费</span></p>
<p class="yuanjia" style="color: #FF9900;text-decoration:none;"><span>@restStatus</span></p>
@@ -457,7 +478,7 @@
</div>
}
@foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) ).OrderBy(m => m.TenantId))
@foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) || (m.ProductId==26 && m.Status == 1) ).OrderBy(m => m.TenantId))
{
@if(package.Title != "0"){
<style>
@@ -520,7 +541,7 @@
</div>
<img src="~/img/check.png" class="cardCheck">
</div>
} else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){
} else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1097||package.Id == 1094||package.Id == 1103)&&package.IsTest==1){
<div class="item packageitem" a-test="true" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
<p><span class="price">@package.Price</span>元</p>
@@ -693,6 +714,19 @@
$("#pkg"+i).hide();
}
}
function lbzhizun() {
for (var i=1090;i<1097;i++){
$("#pkg"+i).show();
}
$("#tablbzx").addClass("active");
$("#tablbgj").removeClass("active");
$("#tablbpt").removeClass("active");
for (var i=1097;i<1109;i++){
$("#pkg"+i).hide();
}
}
function ttgaoji() {
$("#pkg89").hide();
$("#pkg69").hide();
@@ -710,6 +744,20 @@
$("#pkg"+i).show();
}
}
function lbgaoji() {
for (var i=1090;i<1097;i++){
$("#pkg"+i).hide();
}
$("#tablbzx").removeClass("active");
$("#tablbgj").addClass("active");
$("#tablbpt").removeClass("active");
for (var i=1103;i<1109;i++){
$("#pkg"+i).hide();
}
for (var i=1097;i<1103;i++){
$("#pkg"+i).show();
}
}
function ttputong() {
$("#pkg89").hide();
$("#pkg69").hide();
@@ -727,6 +775,20 @@
$("#pkg"+i).hide();
}
}
function lbputong() {
for (var i=1090;i<1097;i++){
$("#pkg"+i).hide();
}
$("#tablbzx").removeClass("active");
$("#tablbgj").removeClass("active");
$("#tablbpt").addClass("active");
for (var i=1103;i<1109;i++){
$("#pkg"+i).show();
}
for (var i=1097;i<1103;i++){
$("#pkg"+i).hide();
}
}
//1 安卓、苹果 2 pc
var wjdxtype = 1;
@@ -908,6 +970,16 @@
for (var i=1;i<30;i++){
$("#p"+i).removeClass("on");
}
} else if (pid == 26) {
for (var i=1090;i<1097;i++){
$("#pkg"+i).show();
}
for (var i=1097;i<1109;i++){
$("#pkg"+i).hide();
}
for (var i=1;i<30;i++){
$("#p"+i).removeClass("on");
}
} else if (pid == 20||pid == 21){
if (pid ==20) {
$("#wjdxgd").removeClass("active");
@@ -943,6 +1015,7 @@
}
} else {
$("#p14").removeClass("on");
$("#p26").removeClass("on");
$("#p20").removeClass("on");
$("#p21").removeClass("on");
}