From b357af3e710dca489d9778e9c2361122f8ae7ab2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 7 Nov 2024 16:48:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9E=81=E5=85=89ip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Host/Controllers/ProductController.cs | 54 +++++++++
Host/Views.Mobile/LineList/Index.cshtml | 20 +++-
Host/Views.Mobile/Product/Index.cshtml | 113 +++++++++++++++++-
Host/Views.Mobile/Product/ReBuyIndex.cshtml | 2 +-
Host/Views/LineList/Index.cshtml | 15 ++-
Host/Views/Product/Index.cshtml | 124 +++++++++++++++++++-
Host/Views/Product/ReBuyIndex.cshtml | 2 +-
7 files changed, 314 insertions(+), 16 deletions(-)
diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index d968ee9..d3c4c58 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -992,6 +992,40 @@ namespace Home.Controllers
return View(model);
}
}
+
+ //0 无状态 1:尊享 2:高级 3:普通
+ var pro_type_flag_jiguang = 0;
+ var pro_type_temp_jiguang = 0;
+ if (productId == 3) {
+
+
+
+ accountList.ForEach(m => {
+
+
+ if (m.PackageId<1220 || m.PackageId>1232&&m.PackageId<1235) {
+ pro_type_flag_jiguang = 1;
+ }
+ if (m.PackageId>1219&&m.PackageId<1226 || m.PackageId>1234&&m.PackageId<1238) {
+ pro_type_flag_jiguang = 2;
+ }
+ if (m.PackageId>1225&&m.PackageId<1232 || m.PackageId>1237&&m.PackageId<1241) {
+ pro_type_flag_jiguang = 3;
+ }
+
+ if (pro_type_temp_jiguang==0){
+ pro_type_temp_jiguang = pro_type_flag_jiguang;
+ }
+ if (pro_type_temp_jiguang!=pro_type_flag_jiguang){
+ ViewBag.errorTip = "不同类型不能同时续费";
+ }
+
+ });
+
+ if (ViewBag.errorTip == "不同类型不能同时续费"){
+ return View(model);
+ }
+ }
//0 无状态 1:1m 5m 3:10m 4:20m
var pro_type_flag_qilindongtai = 0;
var pro_type_temp_qilindongtai = 0;
@@ -1154,6 +1188,16 @@ namespace Home.Controllers
if (pro_type_temp_jihu ==3 && (m.Id>1199&&m.Id<1205 || m.Id>1210&&m.Id<1214)) {
package_temp.Add(m);
}
+ }else if(m.ProductId == 3){
+ if (pro_type_temp_jiguang ==1 && (m.Id<1220 || m.Id>1232&&m.Id<1235)) {
+ package_temp.Add(m);
+ }
+ if (pro_type_temp_jiguang ==2 && (m.Id>1219&&m.Id<1226 || m.Id>1234&&m.Id<1238)) {
+ package_temp.Add(m);
+ }
+ if (pro_type_temp_jiguang ==3 && (m.Id>1225&&m.Id<1232 || m.Id>1237&&m.Id<1241)) {
+ package_temp.Add(m);
+ }
}else if(m.ProductId == 27){
if (pro_type_temp_qilindongtai ==1 && m.Id<1121) {
package_temp.Add(m);
@@ -1236,6 +1280,16 @@ namespace Home.Controllers
if (pro_type_temp_jihu ==3 && (m.Id>1199&&m.Id<1205 || m.Id>1210&&m.Id<1214)) {
package_temp.Add(m);
}
+ }else if(m.ProductId == 3){
+ if (pro_type_temp_jiguang ==1 && (m.Id<1220 || m.Id>1232&&m.Id<1235)) {
+ package_temp.Add(m);
+ }
+ if (pro_type_temp_jiguang ==2 && (m.Id>1219&&m.Id<1226 || m.Id>1234&&m.Id<1238)) {
+ package_temp.Add(m);
+ }
+ if (pro_type_temp_jiguang ==3 && (m.Id>1225&&m.Id<1232 || m.Id>1237&&m.Id<1241)) {
+ package_temp.Add(m);
+ }
}else if(m.ProductId == 27){
if (pro_type_temp_qilindongtai ==1 && m.Id<1121) {
package_temp.Add(m);
diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml
index 643932f..7632fb3 100644
--- a/Host/Views.Mobile/LineList/Index.cshtml
+++ b/Host/Views.Mobile/LineList/Index.cshtml
@@ -148,7 +148,7 @@
@@ -1146,7 +1158,7 @@
}
}
function onrecommend(id) {
- if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+ if (id != 29 && id != 3 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
var lastClosedTime = localStorage.getItem('buyrecommend');
if (!lastClosedTime) {
// 如果之前没有关闭时间记录,则显示提示框
@@ -1183,6 +1195,7 @@
},500);
$(".type14").hide();
$(".type29").show();
+ $(".type3").hide();
$(".type6").hide();
$(".type27").hide();
$(".type26").hide();
@@ -1228,6 +1241,7 @@
$(".type6").hide();
$(".type27").hide();
$(".type29").hide();
+ $(".type3").hide();
$("#package-89").show();
$("#package-69").show();
$("#package-70").show();
@@ -1248,6 +1262,7 @@
$(".type6").hide();
$(".type27").hide();
$(".type29").hide();
+ $(".type3").hide();
for (var i=1090;i<1097;i++){
$("#package-"+i).show();
@@ -1263,6 +1278,7 @@
$(".type14").hide();
$(".type29").show();
$(".type6").hide();
+ $(".type3").hide();
$(".type27").hide();
$(".type26").hide();
@@ -1288,12 +1304,39 @@
$(".jhgj").css('background-color','white');
$(".jhpt").css('background-color','white');
});
+
+ $("#p3").click(function () {
+ $(".type14").hide();
+ $(".type29").hide();
+ $(".type6").hide();
+ $(".type3").show();
+ $(".type27").hide();
+ $(".type26").hide();
+
+ for (var i=1214;i<1220;i++){
+ $("#package-"+i).show();
+ }
+ for (var i=1235;i<1241;i++){
+ $("#package-"+i).hide();
+ }
+ for (var i=1232;i<1235;i++){
+ $("#package-"+i).show();
+ }
+
+ for (var i=1220;i<1232;i++){
+ $("#package-"+i).hide();
+ }
+ $(".jgzx").css('background-color','#FF9900');
+ $(".jggj").css('background-color','white');
+ $(".jgpt").css('background-color','white');
+ });
$("#p27").click(function () {
$(".type14").hide();
$(".type26").hide();
$(".type27").show();
$(".type6").hide();
$(".type29").hide();
+ $(".type3").hide();
for (var i=1115;i<1121;i++){
$("#package-"+i).show();
@@ -1320,6 +1363,7 @@
$(".type6").show();
$(".type27").hide();
$(".type29").hide();
+ $(".type3").hide();
$("#package-60").show();
for (var i=22;i<27;i++){
@@ -1383,6 +1427,25 @@
$("#package-"+i).hide();
}
}
+ function jgzhizun() {
+ $(".jgzx").css('background-color','#FF9900');
+ $(".jggj").css('background-color','white');
+ $(".jgpt").css('background-color','white');
+
+ for (var i=1214;i<1220;i++){
+ $("#package-"+i).show();
+ }
+ for (var i=1235;i<1241;i++){
+ $("#package-"+i).hide();
+ }
+ for (var i=1232;i<1235;i++){
+ $("#package-"+i).show();
+ }
+
+ for (var i=1220;i<1232;i++){
+ $("#package-"+i).hide();
+ }
+ }
function ttgaoji() {
$(".ttgj").css('background-color','#FF9900');
$(".ttzx").css('background-color','white');
@@ -1443,6 +1506,34 @@
$("#package-"+i).hide();
}
}
+
+ function jggaoji() {
+ $(".jgzx").css('background-color','white');
+ $(".jggj").css('background-color','#FF9900');
+ $(".jgpt").css('background-color','white');
+
+ for (var i=1214;i<1220;i++){
+ $("#package-"+i).hide();
+ }
+ for (var i=1232;i<1235;i++){
+ $("#package-"+i).hide();
+ }
+ for (var i=1220;i<1226;i++){
+ $("#package-"+i).show();
+ }
+
+
+ for (var i=1235;i<1238;i++){
+ $("#package-"+i).show();
+ }
+ for (var i=1226;i<1232;i++){
+ $("#package-"+i).hide();
+ }
+
+ for (var i=1238;i<1241;i++){
+ $("#package-"+i).hide();
+ }
+ }
function ttputong() {
$(".ttpt").css('background-color','#FF9900');
$(".ttzx").css('background-color','white');
@@ -1502,6 +1593,26 @@
$("#package-"+i).show();
}
}
+
+ function jgputong() {
+ $(".jgpt").css('background-color','#FF9900');
+ $(".jgzx").css('background-color','white');
+ $(".jggj").css('background-color','white');
+
+ for (var i=1214;i<1226;i++){
+ $("#package-"+i).hide();
+ }
+ for (var i=1226;i<1232;i++){
+ $("#package-"+i).show();
+ }
+ for (var i=1232;i<1238;i++){
+ $("#package-"+i).hide();
+ }
+
+ for (var i=1238;i<1241;i++){
+ $("#package-"+i).show();
+ }
+ }
function qldt1() {
$(".qldt1").css('background-color','#FF9900');
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
index 959763a..d7368c0 100644
--- a/Host/Views.Mobile/Product/ReBuyIndex.cshtml
+++ b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
@@ -208,7 +208,7 @@
}
}
var id = getUrlParam('productId')
- if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+ if (id != 29 && id != 3 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
var lastClosedTime = localStorage.getItem('buyrecommend');
if (!lastClosedTime) {
// 如果之前没有关闭时间记录,则显示提示框
diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml
index 82cad39..80295d8 100644
--- a/Host/Views/LineList/Index.cshtml
+++ b/Host/Views/LineList/Index.cshtml
@@ -161,7 +161,7 @@
- @foreach (var item in product.Where(m => m.Id != 3 && m.Id != 7 && m.Id != 9&& m.Id != 20&& m.Id != 21).OrderBy(m=>m.Sort))
+ @foreach (var item in product.Where(m => m.Id != 7 && m.Id != 9&& m.Id != 20&& m.Id != 21).OrderBy(m=>m.Sort))
{
@item.Name
@@ -269,6 +269,11 @@
8899 |
4430 |
+
+ | 极光 |
+ 1234 |
+ 4430 |
+
| 麒麟 |
123 |
@@ -476,6 +481,11 @@
this.search_field = '极狐IP';
this.sstp = '4430';
break;
+ case 3:
+ this.l2tp = '1234';
+ this.search_field = '极光IP';
+ this.sstp = '4430';
+ break;
case 22:
this.l2tp = '888888';
this.search_field = '火狐IP';
@@ -623,6 +633,9 @@
case 29:
self.location.href='https://php-api.juip.com/script/linedata/data/download/jihu.csv';
break;
+ case 3:
+ self.location.href='https://php-api.juip.com/script/linedata/data/download/jiguang.csv';
+ break;
case 22:
self.location.href='https://php-api.juip.com/script/linedata/data/download/huohu.csv';
break;
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 7873fb4..aacda00 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -116,7 +116,7 @@
margin-top: -300px;
width: 136px;
text-align: center;
- font-size: 18px;
+ font-size: 17px;
font-family: "微软雅黑";
color: #000;
}
@@ -293,11 +293,22 @@
动态独享IP
@foreach (var item in Model)
{
- if(item.Product.Id == 18) {
- @item.Product.Name大IP池
+ if(item.Product.Id == 29) {
+
+ 新
+ @item.Product.Name
+ 超快
+
}
- else if(item.Product.Id == 29) {
- 新 @item.Product.Name超快
+ else if(item.Product.Id == 3) {
+
+ 新
+ @item.Product.Name
+ 纯净
+
+ }
+ else if(item.Product.Id == 18) {
+ @item.Product.Name大IP池
}
else if(item.Product.Id == 28) {
静态IP
@@ -426,6 +437,21 @@
}
+ @if(item.Product.Id == 3) { //不限速
+
+ }
@if(item.Product.Id == 6) { //不限速
@@ -1518,7 +1544,7 @@
}
function select(id) {
- if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+ if (id != 3 && id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
var lastClosedTime = localStorage.getItem('buyrecommend');
if (!lastClosedTime) {
// 如果之前没有关闭时间记录,则显示提示框
@@ -1575,6 +1601,29 @@
}
$(el).addClass("on");
}
+ if (id == 3) {
+ $(".qilinjingtai").hide();
+ for (var i=1214;i<1220;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1232;i<1235;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1235;i<1241;i++){
+ $("#pkg"+i).hide();
+ }
+ $("#tabjgzx").addClass("active");
+ $("#tabjggj").removeClass("active");
+ $("#tabjgpt").removeClass("active");
+
+ for (var i=1220;i<1232;i++){
+ $("#pkg"+i).hide();
+ }
+ for (var i=1;i<30;i++){
+ $("#p"+i).removeClass("on");
+ }
+ $(el).addClass("on");
+ }
}
function selectPackage(id ,falg = false) {
@@ -1673,6 +1722,24 @@
$("#pkg"+i).hide();
}
}
+ function jgzhizun() {
+ for (var i=1214;i<1220;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1232;i<1235;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1235;i<1241;i++){
+ $("#pkg"+i).hide();
+ }
+ $("#tabjgzx").addClass("active");
+ $("#tabjggj").removeClass("active");
+ $("#tabjgpt").removeClass("active");
+
+ for (var i=1220;i<1232;i++){
+ $("#pkg"+i).hide();
+ }
+ }
function ttgaoji() {
$("#pkg89").hide();
$("#pkg69").hide();
@@ -1729,6 +1796,31 @@
$("#pkg"+i).hide();
}
}
+ function jggaoji() {
+ for (var i=1214;i<1220;i++){
+ $("#pkg"+i).hide();
+ }
+ $("#tabjgzx").removeClass("active");
+ $("#tabjggj").addClass("active");
+ $("#tabjgpt").removeClass("active");
+ for (var i=1232;i<1235;i++){
+ $("#pkg"+i).hide();
+ }
+ for (var i=1220;i<1226;i++){
+ $("#pkg"+i).show();
+ }
+
+ for (var i=1235;i<1238;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1226;i<1232;i++){
+ $("#pkg"+i).hide();
+ }
+
+ for (var i=1238;i<1241;i++){
+ $("#pkg"+i).hide();
+ }
+ }
function ttputong() {
$("#pkg89").hide();
$("#pkg69").hide();
@@ -1787,6 +1879,26 @@
$("#pkg"+i).show();
}
}
+ function jgputong() {
+ for (var i=1214;i<1226;i++){
+ $("#pkg"+i).hide();
+ }
+ $("#tabjgzx").removeClass("active");
+ $("#tabjggj").removeClass("active");
+ $("#tabjgpt").addClass("active");
+ for (var i=1226;i<1232;i++){
+ $("#pkg"+i).show();
+ }
+ for (var i=1232;i<1238;i++){
+ $("#pkg"+i).hide();
+ }
+
+
+
+ for (var i=1238;i<1241;i++){
+ $("#pkg"+i).show();
+ }
+ }
function xfgaoji() {
$("#xfduxiang").removeClass("active");
$("#xfgaoji").addClass("active");
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 170cf4a..769a484 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -580,7 +580,7 @@
}
}
var id = getUrlParam('productId')
- if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+ if (id != 29 && id != 3 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
var lastClosedTime = localStorage.getItem('buyrecommend');
if (!lastClosedTime) {
// 如果之前没有关闭时间记录,则显示提示框