diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index d06ca80..d35eee1 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -739,7 +739,7 @@ namespace Home.Controllers { var product = new ProductEntity(); var package = new ProductPackageEntity(); - if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097){ + if (id==1034||id==1040||id==89||id==1094||id==1103||id==1097||id==60||id==1114){ package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); } else { @@ -928,6 +928,37 @@ namespace Home.Controllers } } + //0 无状态 1：尊享 2：高级 3：普通 + var pro_type_flag_xianfeng = 0; + var pro_type_temp_xianfeng = 0; + if (productId == 6) { + + + + accountList.ForEach(m => { + + + if (m.PackageId<61) { + pro_type_flag_xianfeng = 1; + } + if (m.PackageId>1108&&m.PackageId<1115) { + pro_type_flag_xianfeng = 2; + } + + if (pro_type_temp_xianfeng==0){ + pro_type_temp_xianfeng = pro_type_flag_xianfeng; + } + if (pro_type_temp_xianfeng!=pro_type_flag_xianfeng){ + ViewBag.errorTip = "先锋不同类型不能同时续费"; + } + + }); + + if (ViewBag.errorTip == "先锋不同类型不能同时续费"){ + return View(model); + } + } + @@ -1004,6 +1035,13 @@ namespace Home.Controllers if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { package_temp.Add(m); } + }else if(m.ProductId == 6){ + if (pro_type_temp_xianfeng ==1 && m.Id<61) { + package_temp.Add(m); + } + if (pro_type_temp_xianfeng ==2 && m.Id>1108&&m.Id<1115) { + package_temp.Add(m); + } } else { package_temp.Add(m); } @@ -1056,7 +1094,14 @@ namespace Home.Controllers if (pro_type_temp_liebao ==3 && m.Id>1103&&m.Id<1109) { package_temp.Add(m); } - } else { + }else if(m.ProductId == 6){ + if (pro_type_temp_xianfeng ==1 && m.Id<61) { + package_temp.Add(m); + } + if (pro_type_temp_xianfeng ==2 && m.Id>1108&&m.Id<1115) { + package_temp.Add(m); + } + } else { package_temp.Add(m); } }); diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml index 28dd311..9d20f33 100644 --- a/Host/Views.Mobile/LineList/Index.cshtml +++ b/Host/Views.Mobile/LineList/Index.cshtml @@ -314,9 +314,9 @@ this.sstp = '4430'; break; case 6: - this.l2tp = '123'; + this.l2tp = '6666'; this.search_field = '先锋IP'; - this.sstp = '6665'; + this.sstp = '889'; break; case 10: this.l2tp = '88'; @@ -379,6 +379,11 @@ this.search_field = '强子静态IP'; this.sstp = '1500'; break; + case 26: + this.l2tp = '1234'; + this.search_field = '强子静态IP'; + this.sstp = '4430'; + break; } $.ajax({ type: 'GET', diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 16f579b..36f12f9 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -175,6 +175,10 @@ + }else if(item.Product.Id == 6) { + } else if(item.Product.Id == 22) {
  • @@ -234,6 +238,13 @@
    + } + @if (item.Product.Id == 6){ +
    + +
    + +
    } @if (item.Product.Id == 20) { @@ -261,7 +272,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&&package.Id != 1094&&package.Id != 1097&&package.Id != 1103) + if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040&&package.Id != 1094&&package.Id != 1097&&package.Id != 60&&package.Id != 1114) {
    @@ -293,7 +304,7 @@
    - } else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1094||package.Id == 1097||package.Id == 1103)&&package.IsTest==1){ + } else if((package.Id == 89||package.Id == 1034||package.Id == 1040||package.Id == 1094||package.Id == 1097||package.Id == 1103||package.Id == 60||package.Id == 1114)&&package.IsTest==1){
    @@ -347,6 +358,7 @@ $("#p14").click(function () { $(".type14").show(); $(".type26").hide(); + $(".type6").hide(); $("#package-89").show(); $("#package-69").show(); $("#package-70").show(); @@ -364,6 +376,7 @@ $("#p26").click(function () { $(".type14").hide(); $(".type26").show(); + $(".type6").hide(); for (var i=1090;i<1097;i++){ $("#package-"+i).show(); @@ -375,6 +388,21 @@ $(".lbgj").css('background-color','white'); $(".lbpt").css('background-color','white'); }); + $("#p6").click(function () { + $(".type14").hide(); + $(".type26").hide(); + $(".type6").show(); + + $("#package-60").show(); + for (var i=22;i<27;i++){ + $("#package-"+i).show(); + } + for (var i=1109;i<1115;i++){ + $("#package-"+i).hide(); + } + $(".xfgj").css('background-color','#FF9900'); + $(".xfdx").css('background-color','white'); + }); function ttzhizun() { $("#package-89").show(); $("#package-69").show(); @@ -466,6 +494,28 @@ $("#package-"+i).hide(); } } + function xfgaoji() { + $(".xfgj").css('background-color','#FF9900'); + $(".xfdx").css('background-color','white'); + $("#package-60").show(); + for (var i=22;i<27;i++){ + $("#package-"+i).show(); + } + for (var i=1109;i<1115;i++){ + $("#package-"+i).hide(); + } + } + function xfduxiang() { + $(".xfdx").css('background-color','#FF9900'); + $(".xfgj").css('background-color','white'); + $("#package-60").hide(); + for (var i=22;i<27;i++){ + $("#package-"+i).hide(); + } + for (var i=1109;i<1115;i++){ + $("#package-"+i).show(); + } + } var wjdxtype = 1; function wjdxphone() { diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml index 288d5e6..9afccbf 100644 --- a/Host/Views/LineList/Index.cshtml +++ b/Host/Views/LineList/Index.cshtml @@ -251,7 +251,7 @@
    -
    +
    @@ -299,6 +299,11 @@ + + + + + @@ -377,9 +382,9 @@ this.sstp = '4430'; break; case 6: - this.l2tp = '123'; + this.l2tp = '6666'; this.search_field = '先锋IP'; - this.sstp = '6665'; + this.sstp = '889'; break; case 10: this.l2tp = '88'; diff --git a/Host/Views/Product/Http.cshtml b/Host/Views/Product/Http.cshtml index d602ee8..eb2bfe5 100644 --- a/Host/Views/Product/Http.cshtml +++ b/Host/Views/Product/Http.cshtml @@ -29,7 +29,7 @@
    -

    ￥

    +

    ￥

    @@ -977,7 +977,7 @@ $(document).on("ready", function(e) { var that = this $.ajax({ type: 'POST', - url: 'http://juip.wyk/http/product/linecount', + url: 'http://php-api.juip.com/http/product/linecount', dataType: "json", async:false, data:this.game, diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 4cf4c69..d2492de 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -265,6 +265,12 @@
    } + else if(item.Product.Id == 6) { +
    +
    新 @item.Product.Name
    + +
    + } else if(item.Product.Id == 22) {
    静态IP
    @item.Product.Name
    @@ -380,6 +386,18 @@
    } + @if(item.Product.Id == 6) { //不限速 +
    + +
    + } @* @if(item.Product.Id == 18){ @@ -465,7 +483,7 @@
    - @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26){ + @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14&& item.Product.Id != 26&& item.Product.Id != 6){

    免费

    @restStatus

    @@ -478,7 +496,7 @@
    } - @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)) + @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)|| (m.ProductId==6 && m.Status == 1) ).OrderBy(m => m.TenantId)) { @if(package.Title != "0"){
    123 1500
    先锋6666889
    极客 123456