diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index cade9bc..af67fa6 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -112,7 +112,7 @@ namespace Home.Controllers if(m.Price { m.Title = "9.5"; - if ( m.DayCount == 1 ){ + if (m.DayCount == 1||m.DayCount == 2 ){ m.Price = 0.1M; } }); @@ -762,7 +762,7 @@ namespace Home.Controllers package.Price = package.MinPrice; } - if (ProductAccountCount == 0 && package.DayCount == 1){ + if (ProductAccountCount == 0 && (package.DayCount == 1 ||package.DayCount == 2)){ package.Price = 0.1M; } diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml index dd18740..e2153af 100644 --- a/Host/Views.Mobile/LineList/Index.cshtml +++ b/Host/Views.Mobile/LineList/Index.cshtml @@ -234,7 +234,7 @@ this.sstp = '6666'; break; case 18: - this.l2tp = '123456'; + this.l2tp = '8899'; this.search_field = '蘑菇IP'; this.sstp = '4430'; break; diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml index 63b6735..3cb0cbe 100644 --- a/Host/Views.Mobile/Product/Index.cshtml +++ b/Host/Views.Mobile/Product/Index.cshtml @@ -55,40 +55,19 @@ @item.Product.Name送一月 } - else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4||item.Product.Id == 8 ) { + else if(item.Product.Id == 6) { } - else if(item.Product.Id == 18|| item.Product.Id == 5|| item.Product.Id == 14) { + else if(item.Product.Id == 18) { } else if(item.Product.Id == 17) { - } - @* else if(item.Product.Id == 8) { - - } *@ - else if(item.Product.Id == 1) { - - } - else if(item.Product.Id == 7){ - - - } - else if(item.Product.Id == 19) { - } else{ diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml index 920399d..340803d 100644 --- a/Host/Views/LineList/Index.cshtml +++ b/Host/Views/LineList/Index.cshtml @@ -228,7 +228,7 @@ this.sstp = '6666'; break; case 18: - this.l2tp = '123456'; + this.l2tp = '8899'; this.search_field = '蘑菇IP'; this.sstp = '4430'; break; diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml index 812271c..3a72e6a 100644 --- a/Host/Views/Product/Index.cshtml +++ b/Host/Views/Product/Index.cshtml @@ -129,10 +129,11 @@ .mtop { margin-top:30px; } - .packageitem86{ + + .packageitem1{ position: relative; } - .packageitem86::before { + .packageitem1::before { position: absolute; top: 0.3rem; left: -0.5rem; @@ -142,13 +143,70 @@ line-height: 0px; color: white; height: 0px; - border: 1.2rem solid #f64e3d; + border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "免费送一个月"; + content: "首单0.1元"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } - .packageitem86::after { + .packageitem1::after { + content: ""; + position: absolute; + top: 2.1875rem; + left: -0.5rem; + border: 0.25rem solid #f64e3d; + border-left-color: transparent; + border-bottom-color: transparent; + } + + .packageitem2{ + position: relative; + } + .packageitem2::before { + position: absolute; + top: 0.3rem; + left: -0.5rem; + z-index: 1; + padding-right: 0.625rem; + font-weight: bold; + line-height: 0px; + color: white; + height: 0px; + border: 1.0rem solid #FF9933; + border-right-color: transparent; + content: "送 1 天"; + box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; + } + + .packageitem2::after { + content: ""; + position: absolute; + top: 2.1875rem; + left: -0.5rem; + border: 0.25rem solid #f64e3d; + border-left-color: transparent; + border-bottom-color: transparent; + } + .packageitem3{ + position: relative; + } + .packageitem3::before { + position: absolute; + top: 0.3rem; + left: -0.5rem; + z-index: 1; + padding-right: 0.625rem; + font-weight: bold; + line-height: 0px; + color: white; + height: 0px; + border: 1.0rem solid #FF9933; + border-right-color: transparent; + content: "送 3 天"; + box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; + } + + .packageitem3::after { content: ""; position: absolute; top: 2.1875rem; @@ -171,9 +229,9 @@ line-height: 0px; color: white; height: 0px; - border: 1.2rem solid #f64e3d; + border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "8 折+送十天"; + content: "送 10 天"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } @@ -187,11 +245,10 @@ border-bottom-color: transparent; } - - .packageitem710{ + .packageitem30{ position: relative; } - .packageitem710::before { + .packageitem30::before { position: absolute; top: 0.3rem; left: -0.5rem; @@ -201,248 +258,13 @@ line-height: 0px; color: white; height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "7 折+送一月"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem710::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - - .packageitem1{ - position: relative; - } - .packageitem1::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: #FF0033; - height: 0px; border: 1.0rem solid #FF9933; border-right-color: transparent; - content: "首单0.1元"; + content: "送 1 月"; box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; } - .packageitem1::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - .packageitem81{ - position: relative; - } - .packageitem81::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "8 折+送一个月"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem81::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - .packageitem19{ - position: relative; - } - .packageitem19::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "9 折+送七天"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem19::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - .packageitem91{ - position: relative; - } - .packageitem91::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "8 折+送一个月"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem91::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - .packageitem92{ - position: relative; - } - .packageitem92::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "8 折+送两个月"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem92.contentNew::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - - .packageitem8-1{ - position: relative; - } - .packageitem8-1::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "8 折+送七天"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem8-1.contentNew::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - - - .packageitem71{ - position: relative; - } - .packageitem71::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "9折"; - @* content: "@Model[0].Packages[0].Title 折"; *@ - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem71::after { - content: ""; - position: absolute; - top: 2.1875rem; - left: -0.5rem; - border: 0.25rem solid #f64e3d; - border-left-color: transparent; - border-bottom-color: transparent; - } - .packageitem4{ - position: relative; - } - .packageitem4::before { - position: absolute; - top: 0.3rem; - left: -0.5rem; - z-index: 1; - padding-right: 0.625rem; - font-weight: bold; - line-height: 0px; - color: white; - height: 0px; - border: 1.2rem solid #f64e3d; - border-right-color: transparent; - content: "8 折"; - box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000; - } - - .packageitem4::after { + .packageitem30::after { content: ""; position: absolute; top: 2.1875rem; @@ -514,24 +336,15 @@ @if(item.Product.Id == 13){
@item.Product.Name 送一月
} - else if(item.Product.Id == 6||item.Product.Id == 2||item.Product.Id == 4 ||item.Product.Id == 8) { -
@item.Product.Name
- } - else if(item.Product.Id == 18|| item.Product.Id == 5|| item.Product.Id == 19||item.Product.Id == 14) { -
新@item.Product.Name
- } else if(item.Product.Id == 17) { -
新@item.Product.Name 送一月
+
@item.Product.Name 送一月
} - @* else if(item.Product.Id == 8) { -
@item.Product.Name 无限送
- } *@ - else if(item.Product.Id == 1) { + else if(item.Product.Id == 18) { +
新@item.Product.Name活动
+ } + else if(item.Product.Id == 6) {
@item.Product.Name
} - else if(item.Product.Id == 7) { -
@item.Product.Name
- } else {
@item.Product.Name
} @@ -596,7 +409,7 @@ } @if(item.Product.Id == 18){ -

购买须知：本产品所有地区全部屏蔽微信和QQ

+

天卡买一送一，周卡送3天，月卡送10天，双月卡送1个月，聚IP年中回馈，血亏仅一次，有史无前例！
（仅限新开账号，续费帐号不赠送，同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）
新产品上线，全新IP池！不限速网速贼快！城市数量仍在迅速增加中！

} @* @if(item.Product.Id == 4){

全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日
（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）

@@ -682,7 +495,7 @@

@restStatus

@restTimes

-

测试卡

+

测试卡

使用期限:1小时

@@ -732,101 +545,68 @@

原价：@package.LinePrice元

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Name

+

@package.Name

@package.Profile

} - else if(package.Id == 1018||package.Id==1009||package.Id==1019){ + else if(package.Id == 1030){ -
+

@package.Price元

原价：@package.LinePrice元

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Name

+

@package.Name

@package.Profile

- } - else if(package.Id == 88||package.Id == 101||package.Id == 103){ - -
- - -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - else if(package.Id==105){ - -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - else if(package.Id == 100||package.Id == 102) { -
- -

@package.Price元

-

原价：@package.LinePrice元

-

@(Math.Round(package.Price/package.DayCount,2))元/天

-
-

@package.Name

-

@package.Profile

-
- -
- } - else if(package.Id == 1007||package.Id == 1008||package.Id == 104) { -
- + else if(package.Id == 1031){ + +
+

@package.Price元

原价：@package.LinePrice元

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Name

+

@package.Name

@package.Profile

- } - - else if(package.Id == 1||package.Id == 1002||package.Id == 4||package.Id == 7||package.Id == 12||package.Id == 17||package.Id == 22||package.Id == 27||package.Id == 32||package.Id == 37||package.Id == 42||package.Id == 62||package.Id == 69||package.Id == 73||package.Id == 80) { + else if(package.Id == 1032){ - -
- +

@package.Price元

原价：@package.LinePrice元

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Name

+

@package.Name

@package.Profile

+ } + else if(package.Id == 1033){ + +
- } +

@package.Price元

+

原价：@package.LinePrice元

+

@(Math.Round(package.Price/package.DayCount,2))元/天

+
+

@package.Name

+

@package.Profile

+
+ +
+ } else {
@@ -840,7 +620,7 @@

原价：@package.LinePrice元

@(Math.Round(package.Price/package.DayCount,2))元/天

-

@package.Name

+

@package.Name

@package.Profile

diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs index a8ee0f7..351c60d 100644 --- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs +++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs @@ -305,7 +305,7 @@ FROM product_order where {where} GROUP BY Channel,ProductName order by Channel, - if (ProductAccountCount == 0 && request.OrderType != OrderType.News && packageEntity.DayCount == 1 && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ + if (ProductAccountCount == 0 && request.OrderType != OrderType.News && (packageEntity.DayCount == 1||packageEntity.DayCount == 1) && request.ConnectCount == 1 && request.OrderType!=OrderType.AgainBuy&& request.OrderType!=OrderType.AgainBuys){ price = 0.1M; userEntity.ProductAccountCount = 1; await m_UserService.Update(userEntity);