From a4b0f2e5c5944bd3d78d1553ed1036560f22be14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”> Date: Sat, 26 Aug 2023 17:31:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Host/Controllers/ActicleController.cs | 17 +- Host/Controllers/ProductController.cs | 29 +- Host/Controllers/UserController.cs | 30 +- Host/Views.Mobile/Article/Index.cshtml | 206 ++++-- Host/Views.Mobile/Article/info.cshtml | 6 + Host/Views.Mobile/Home/Index.cshtml | 125 +--- Host/Views.Mobile/LineList/Index.cshtml | 219 ++++-- Host/Views.Mobile/Product/Index.cshtml | 697 ++++++++++++-------- Host/Views.Mobile/Product/Soft.cshtml | 56 +- Host/Views.Mobile/Product/Test.cshtml | 6 +- Host/Views.Mobile/Product/buy.cshtml | 117 ++-- Host/Views.Mobile/Shared/_Layout.cshtml | 2 +- Host/Views.Mobile/Shared/_UserLayout.cshtml | 2 +- Host/Views.Mobile/User/Online.cshtml | 6 +- Host/Views/Article/Index.cshtml | 12 +- Host/Views/LineList/Index.cshtml | 127 ++++ Host/Views/Product/Index.cshtml | 411 +++++++----- Host/Views/Product/Test.cshtml | 2 +- Host/Views/Product/buy.cshtml | 36 +- Host/Views/Product/rebuy.cshtml | 34 +- Host/wwwroot/m/css/base.css | 18 +- Services/Hncore.Pass.Vpn/Domain/Enums.cs | 2 + 22 files changed, 1312 insertions(+), 848 deletions(-) diff --git a/Host/Controllers/ActicleController.cs b/Host/Controllers/ActicleController.cs index 98e0338..a01e7f3 100644 --- a/Host/Controllers/ActicleController.cs +++ b/Host/Controllers/ActicleController.cs @@ -64,9 +64,24 @@ namespace Home.Controllers return View(ret); } + [HttpGet] + public async Task Info(int id) + { + var prev = await m_ArticleServce.Query(m => m.Id < id).OrderByDescending(m => m.Id).FirstOrDefaultAsync(); + var ret = await m_ArticleServce.GetById(id); + var next = await m_ArticleServce.Query(m => m.Id > id).OrderBy(m => m.Id).FirstOrDefaultAsync(); + return View(new ArticleInfoMode() + { + + Prev = prev, + Info = ret, + Next = next + }); + } + [HttpGet] - public async Task Info(int id) + public async Task Infoapi(int id) { var prev = await m_ArticleServce.Query(m => m.Id < id).OrderByDescending(m => m.Id).FirstOrDefaultAsync(); var ret = await m_ArticleServce.GetById(id); diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs index 0e26253..b2805a9 100644 --- a/Host/Controllers/ProductController.cs +++ b/Host/Controllers/ProductController.cs @@ -527,20 +527,23 @@ namespace Home.Controllers try { var ordereNo = sArray["out_trade_no"]; - var order = await m_ProductOrderService.GetOrderByNo(ordereNo); - if (order.OrderState == OrderStatus.Complete|| order.OrderState == OrderStatus.PayOk) - { - await Response.WriteAsync("success"); - return; - } + var trade_status = sArray["trade_status"]; + if (trade_status == "TRADE_SUCCESS") { + var order = await m_ProductOrderService.GetOrderByNo(ordereNo); + if (order.OrderState == OrderStatus.Complete|| order.OrderState == OrderStatus.PayOk) + { + await Response.WriteAsync("success"); + return; + } - order.OrderState = OrderStatus.PayOk; - order.TradeNo = sArray["trade_no"]; - order.UpdateTime = DateTime.Now; - await m_ProductOrderService.Update(order); - await m_ProductOrderService.ProcessOrderAccount(order); + order.OrderState = OrderStatus.PayOk; + order.TradeNo = sArray["trade_no"]; + order.UpdateTime = DateTime.Now; + await m_ProductOrderService.Update(order); + await m_ProductOrderService.ProcessOrderAccount(order); - Console.WriteLine(Request.Form["trade_status"]); + Console.WriteLine(Request.Form["trade_status"]); + } await Response.WriteAsync("success"); }catch(Exception ex) @@ -733,7 +736,7 @@ namespace Home.Controllers { var product = new ProductEntity(); var package = new ProductPackageEntity(); - if (id==1034||id==1040){ + if (id==1034||id==1040||id==89){ package = await m_ProductPackageService.Query(m => m.Id == id).FirstOrDefaultAsync(); product = await m_ProductService.GetById(package.ProductId); } else { diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs index 0879e18..aa69d39 100644 --- a/Host/Controllers/UserController.cs +++ b/Host/Controllers/UserController.cs @@ -1239,21 +1239,24 @@ namespace Home.Controllers try { var ordereNo = sArray["out_trade_no"]; - var order = await m_ChargeService.GetOrderByNo(ordereNo); - if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) - { - await Response.WriteAsync("success"); - return; + var trade_status = sArray["trade_status"]; + if (trade_status == "TRADE_SUCCESS") { + var order = await m_ChargeService.GetOrderByNo(ordereNo); + if (order.OrderState == UOrderStatus.Complete || order.OrderState == UOrderStatus.PayOk) + { + await Response.WriteAsync("success"); + return; + } + + order.OrderState = UOrderStatus.PayOk; + order.TradeNo = sArray["trade_no"]; + order.UpdateTime = DateTime.Now; + await m_ChargeService.Update(order); + await m_ChargeService.ProcessOrderAccount(order); + + Console.WriteLine(Request.Form["trade_status"]); } - order.OrderState = UOrderStatus.PayOk; - order.TradeNo = sArray["trade_no"]; - order.UpdateTime = DateTime.Now; - await m_ChargeService.Update(order); - await m_ChargeService.ProcessOrderAccount(order); - - Console.WriteLine(Request.Form["trade_status"]); - await Response.WriteAsync("success"); } catch (Exception ex) @@ -1409,7 +1412,6 @@ namespace Home.Controllers public async Task OnLine(int productId,string account) { var data= await m_agentService.OnLine(productId, account); - return View(data.Data); } } diff --git a/Host/Views.Mobile/Article/Index.cshtml b/Host/Views.Mobile/Article/Index.cshtml index 0ba0653..c9d96a8 100644 --- a/Host/Views.Mobile/Article/Index.cshtml +++ b/Host/Views.Mobile/Article/Index.cshtml @@ -1,68 +1,156 @@ @using Hncore.Pass.Vpn.Domain @using Hncore.Infrastructure.Data @using Hncore.Infrastructure.Extension +@using ViewComponents @model PageData @{ - var type = this.Context.Request.GetInt("Catalog"); + var type = this.Context.Request.GetInt("Catalog"); } - -
-
-

-

搜索热词：账号无法登录如何充值

-
-
- -
-
-

-

苹果手机教程

-
-
-

-

安卓手机教程

-
-
-

-

安卓模拟器教程

-
-
-

-

windows电脑教程

-
-
-

-

MAC电脑教程

-
-
-

-

软路由教程

-
-
- -
- - - - -
-
-
+
+ + \ No newline at end of file diff --git a/Host/Views.Mobile/Article/info.cshtml b/Host/Views.Mobile/Article/info.cshtml index e32013f..c57bea8 100644 --- a/Host/Views.Mobile/Article/info.cshtml +++ b/Host/Views.Mobile/Article/info.cshtml @@ -37,6 +37,12 @@
} + @if(@Model.Info.Id == 56){ +
+

视频教程

+ +
+ }

@Model.Info.CreateTime.ToString("yyyy.MM.dd")

@Html.Raw(Model.Info.Content) diff --git a/Host/Views.Mobile/Home/Index.cshtml b/Host/Views.Mobile/Home/Index.cshtml index 95fac54..6aafdc9 100644 --- a/Host/Views.Mobile/Home/Index.cshtml +++ b/Host/Views.Mobile/Home/Index.cshtml @@ -36,14 +36,12 @@ position: fixed; width: 90%; height: auto; - left: 27%; + left: 30%; top: 27%; margin-left: -200px; margin-top: -160px; z-index: 3; background: #fff; - border-radius: 10px; - box-shadow: 0px 6px 8px 6px #ccc; display: flex; flex-direction: row; flex-wrap: wrap; @@ -90,7 +88,12 @@

-
- 一号一拨绝不超拨，快速切换平均带宽6-10兆，最高可达50兆 + 一号一拨绝不超拨、快速切换平均带宽6-10兆，最高可达百兆
@@ -191,10 +157,10 @@
- 价低质优，免费测试 + 价低质优、免费测试
- 全自营机房一手资源，价低质优，量大可联系客服获取最低价 + 全自营机房一手资源、价低质优、量大可联系客服获取最低价
@@ -204,10 +170,10 @@
- 专属产品定制 + 专属化产品定制
- 支持定制独立服务器，可针对特定的项目需求定制专用产品 + 支持定制独立服务器、可根据项目需求定制专用产品
@@ -220,7 +186,7 @@ 专业的服务团队
- 资深售前售后1对1指导，7*24小时实时响应，竭诚为您服务 + 资深客服一对一指导、实时在线、竭诚为您服务
@@ -230,63 +196,11 @@ -
- -
-
-
-

INFORMATION

-

教程&帮助

-
-
- - - - -
-
- -
-
- -
-
- -
-
- -
-
-
+

旗下产品

@@ -299,6 +213,7 @@
+

联系我们

  • 客服电话：400 800 9925
  • 客服QQ：800101003

  • 客户经理：

    • @@ -323,7 +238,7 @@
    -

    公告

    +

    公告

    杜绝电信诈骗及任何违法行为

    @@ -338,7 +253,7 @@

    - 我知道了 + 我知道了

    diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml index be6092f..2239677 100644 --- a/Host/Views.Mobile/LineList/Index.cshtml +++ b/Host/Views.Mobile/LineList/Index.cshtml @@ -10,23 +10,152 @@ var lineTotalCount = Model.Count; var lineCount = Model.Where(m => m.Status == "正常").Count(); } + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + +
    -
    -

    -

    实时总线路：{{ count }}条 实时可用线路：{{ use_count }}条

    +
    +

    *线路表和账号必须为同一产品才能使用。

    +

    *请优先选择客户端连接 <<<下载客户端>>>

    +

    *无对应客户端时，可通过线路表直连支持所有设备<<<教程&帮助>>>

    +
    -
    -
    - - 直连教程 - -
    -
    -

    线路表与账号必须为同一产品才能使用

    -
    +
    + +
    +
      + @foreach (var item in product.Where(m => m.Id != 3 && m.Id != 7 && m.Id != 9&& m.Id != 20&& m.Id != 21)) + { +
    • @item.Name
      • + } +
    + +

    {{search_field}} 用服务器地址直连用户请注意： @@ -41,23 +170,15 @@

    只要线路名称里面带“宽带”两个字的是完全模拟家庭宽带网络的线路，和家庭宽度网络一样一般1-2天不等自动换一次ip

    -
    - -
    -
      - @foreach (var item in product.Where(m => m.Id != 3 && m.Id != 7 && m.Id != 9&& m.Id != 20&& m.Id != 21)) - { -
    • @item.Name
      • - } -
    -
    -

    + {{search_field}} - + +

    +

    实时总线路：{{ count }}条 实时可用线路：{{ use_count }}条

    @@ -70,32 +191,26 @@
    -
    -
    - 地区 -
    -
    - 剩余拨数： - 运营商： -
    -
    - 服务器域名 -
    -
    - 详情 -
    -
    -
    -
    {{site.city}}
    -
    {{site.city}}
    -
    {{site.supply}}
    -
    {{site.nasname}}
    -
    - -
    -
    + + + + + + + + + + + + + + + + + +
    地区剩余拨数运营商服务器域名详情操作
    {{site.city}}{{site.city}}{{site.supply}}{{site.nasname}}{{site.online}}
    @@ -144,6 +259,12 @@
    @foreach (var item in Model) {
    -

    @item.Product.Name

    -
      - @foreach (var str in item.Product.ContentLine) - { -
    • ·@str
      • - } -
    - - -

    - 需求5个以上，可以联系客服设置优惠价; - 开通后有任何问题可无理由退款，并支持自助提现 - 退款规则：购买价格-使用天数*天卡价格 -

    - +

    需求五个以上、可联系右侧客服设置优惠价

    +
    +
    - - - + +
    +
    @if (item.Product.Id == 20) { @@ -367,12 +247,12 @@ @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) + if (package.IsTest == 1 &&package.Id != 89&&package.Id != 1034&&package.Id != 1040) { -
    +
    -

    @package.Name

    +

    @package.Name

    @(package.DayPrice)元/天

    @package.Profile

    @@ -388,7 +268,7 @@ { @if(package.Price == 0.1M){     -
    +

    @package.Name 首单

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

    @@ -401,10 +281,24 @@
    - } + } else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){ + +
    +
    +

    @package.Name

    +

    @(package.DayPrice)元/天

    +

    @package.Profile

    +
    +
    +

    ¥0.00

    +

    原价：@package.LinePrice 元

    +
    +
    +     + } else { -
    +

    @package.Name

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

    @@ -424,8 +318,253 @@ } } } +
    }
    + + + \ No newline at end of file diff --git a/Host/Views.Mobile/Product/Soft.cshtml b/Host/Views.Mobile/Product/Soft.cshtml index 63ba641..71874a7 100644 --- a/Host/Views.Mobile/Product/Soft.cshtml +++ b/Host/Views.Mobile/Product/Soft.cshtml @@ -6,19 +6,14 @@ var baseUrl = m_Configuration["BaseInfoUrl"]; Func P = (path) => $"{baseUrl}{path}"; } -
    -
    +
    +
    -
    - -
    -
    -

    -

    软件和账户必须为同一产品才能使用

    -
    -
    - 使用教程→ -
    +

    软件下载

    +

    *软件和账户必须为同一产品才能使用

    +

    *下载和使用电脑客户端时请关闭杀毒，如360，电脑管家

    +

    *无对应客户端时，可通过线路表直连支持所有设备
    <<< IP线路表 >>><<<教程&帮助>>>

    +
    @@ -27,40 +22,39 @@
    @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.Id!=21 && m.OnLine==1).OrderBy(m => m.Sort)) { -
    +
    @*

    *@ @if (item.Id != 20){

    @item.Name

    -

    +

    } @if (!string.IsNullOrEmpty(item.DroidDownloadUrl)){ -

    @item.Name

    -

    +


    } else if (item.Id == 20) {

    无极

    -

    +

    -

    +

    }
    } -
    +
    @*

    *@

    代理商专用客户端

    -

    -


    -


    -


    +

    +


    +


    +


    -

    -

    -

    -

    -

    -

    -


    -


    +


    +


    +


    +


    +


    +


    +


    +


    \ No newline at end of file diff --git a/Host/Views.Mobile/Product/Test.cshtml b/Host/Views.Mobile/Product/Test.cshtml index 63bafb4..9262779 100644 --- a/Host/Views.Mobile/Product/Test.cshtml +++ b/Host/Views.Mobile/Product/Test.cshtml @@ -49,11 +49,10 @@
    -

    -

    @Model.Product.Name

    +

    @Model.Product.Name

    -

    @Model.Package.Name

    +

    @Model.Package.Name

    @(Model.Package.DayPrice)元/天

    @Model.Package.Profile

    @@ -64,7 +63,6 @@
    - *请确认好所需产品，买错产品换货将产生费用
    diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml index 5b0a007..03907ed 100644 --- a/Host/Views.Mobile/Product/buy.cshtml +++ b/Host/Views.Mobile/Product/buy.cshtml @@ -17,7 +17,7 @@ userEntity = await m_UserService.GetById(user.Id); } var randomPwd = ValidateCodeHelper.MakeNumCode(3).ToLower(); - var randomAccount1 = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(4).ToLower(); + var randomAccount1 = ValidateCodeHelper.MakeCharCode(3).ToLower() + ValidateCodeHelper.MakeNumCode(4).ToLower(); @* while (m_AccountService.Exist(m => m.Account == randomAccount1)) { randomAccount1 = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(4).ToLower(); @@ -85,12 +85,11 @@
    -

    -

    @Model.Product.Name

    +

    @Model.Product.Name

    -

    @Model.Package.Name

    -

    @(Model.Package.DayPrice)元/天

    +

    @Model.Package.Name

    +

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

    @Model.Package.Profile

    @@ -108,10 +107,12 @@
    - *请确认好所需产品，买错产品换货将产生费用 - @if (Model.Package.Name == "天卡") + + @if (Model.Package.ProductId == 20 || Model.Package.ProductId == 21) { -

    *天卡不支持退款，请谨慎购买

    +

    *无极不支持退款，请先开天卡测试

    + } else { +

    *请确认好产品套餐，换货将产生费用

    }
    @@ -132,27 +133,27 @@ }
    -
    +
    IP账号：
    -
    +
    -
    +
    IP账号密码：
    -
    +
    @if (Model.Package.IsTest == 0) {
    -
    +
    连接数：
    -
    +
    - @@ -166,15 +167,15 @@
    -
    +
    1
    -
    +
    选择优惠券：
    -
    +
    -
    +
    余额：
    -
    +
    当前账户余额@(userEntity.RestAmount)元 前往充值 @@ -204,10 +205,10 @@
    -
    +
    支付方式：
    -
    +
    @@ -224,30 +225,29 @@
    -
    +
    总金额：
    -
    +
    {{OneTotalAmount}}元
    -
    +
    应付款：
    -
    +
    {{OnePayAmount}}元
    -
    +
    -
    +

    {{auto_discount_text}}

    -

    淘宝每次下单获得优惠券

    {{Tip}}

    @@ -257,50 +257,50 @@

    批量注册的账号会使用【账号前缀】+【开始数】+【个数】顺序进行注册，

    如:注册账号前缀为【user】开始数为【2】个数为【10】，则注册的账号为：user2，user3，user4，....user11

    -
    +
    IP账号前缀：
    -
    +
    -
    +
    IP开始号：
    -
    +
    -
    +
    IP注册个数：
    -
    +
    -
    +
    即将生成的账号：
    -
    +

    {{acount_list}}

    -
    +
    IP账号密码：
    -
    +
    -
    +
    连接数：
    -
    +
    - @@ -313,15 +313,15 @@
    -
    +
    @*超过10个请联系客服开通*@
    -
    +
    选择优惠券：
    -
    +
    -
    +
    余额：
    -
    +
    当前账户余额@(userEntity.RestAmount)元 前往充值 @@ -350,10 +350,10 @@
    -
    +
    支付方式：
    -
    +
    @@ -370,29 +370,28 @@
    -
    +
    总金额：
    -
    +
    {{MoreTotalAmount}}元
    -
    +
    应付款：
    -
    +
    {{MorePayAmount}}元
    -
    +
    -
    +

    {{auto_discount_text}}

    -

    淘宝每次下单获得优惠券

    {{Tip}}

    diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml index 0dd1ab5..75a614d 100644 --- a/Host/Views.Mobile/Shared/_Layout.cshtml +++ b/Host/Views.Mobile/Shared/_Layout.cshtml @@ -45,7 +45,7 @@ 动态代理ip_电脑换ip软件_自动换ip软件_sstp_pptp_L2TP-聚IP } - + diff --git a/Host/Views.Mobile/Shared/_UserLayout.cshtml b/Host/Views.Mobile/Shared/_UserLayout.cshtml index 3fd827b..8876c34 100644 --- a/Host/Views.Mobile/Shared/_UserLayout.cshtml +++ b/Host/Views.Mobile/Shared/_UserLayout.cshtml @@ -20,7 +20,7 @@ 聚IP JUIP.COM-产品购买 - + diff --git a/Host/Views.Mobile/User/Online.cshtml b/Host/Views.Mobile/User/Online.cshtml index 169d1a6..abddb53 100644 --- a/Host/Views.Mobile/User/Online.cshtml +++ b/Host/Views.Mobile/User/Online.cshtml @@ -76,7 +76,7 @@ } @foreach (var item in Model) { -
    #@(Model.IndexOf(item)+1)
    +
    #@(Model.IndexOf(item)+1)
    账号： @@ -97,7 +97,7 @@ @item.OnlineTime
    - 服务器Ip： + 服务器ip：
    @item.ServerIP @@ -133,7 +133,7 @@ var that = this; $.ajax({ type: 'GET', - url: '/api/course/v1/productaccount/KillOut?productId=@productId&id=' + id, + url: '/api/course/v1/productaccount/KillOut?productId='+productId+'&id=' + JSON.stringify(id), success: function (res) { if (res.Code == 10000) { alert("操作成功"); diff --git a/Host/Views/Article/Index.cshtml b/Host/Views/Article/Index.cshtml index 9f69573..aa845c3 100644 --- a/Host/Views/Article/Index.cshtml +++ b/Host/Views/Article/Index.cshtml @@ -25,6 +25,10 @@
  • 优惠活动 +
    • +
  • + 代理合作 +
    • @@ -39,6 +43,12 @@
    + @if (type == 4) { +
    +

    *请优先选择客户端连接 <<<下载客户端>>>

    +

    *无对应客户端时，可通过线路表直连支持所有设备

    +
    + }
      @foreach (var item in Model.List) { @@ -136,7 +146,7 @@ var title_list = [' ','其他帮助','优惠活动','常见售后','直连教程 $("#detail").show(); $.ajax({ type: 'GET', - url: '/article/info?id=' + id, + url: '/article/infoapi?id=' + id, dataType: "json", success: function (res) { $("#content").html(res.Data.Info.Content) diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml index 79e280e..a1c60db 100644 --- a/Host/Views/LineList/Index.cshtml +++ b/Host/Views/LineList/Index.cshtml @@ -13,6 +13,126 @@ var lineTotalCount = Model.Count; var lineCount = Model.Where(m=>m.Status== "正常").Count(); } + +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      +
      + + + + - } - - @if(package.Price == 0.1M){ - -
      - - -

      @package.Price元

      -

      原价：@package.LinePrice元

      -

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

      -
      -

      @package.Name

      -

      @package.Profile

      -
      - -
      - } - else if(package.ProductId == 18 && package.Title=="0"){ - -
      - -

      @package.Price元

      -

      原价：@package.LinePrice元

      -

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

      -
      -

      @package.Name

      -

      @package.Profile

      -
      - -
      - } - else if(package.Title!="0"){ - -
      - - - @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ -

      60.00元

      - } else { -

      @package.Price元

      - } -

      原价：@package.LinePrice元

      -

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

      -
      -

      @package.Name

      -

      @package.Profile

      -
      - -
      - }else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){ - -
      -

      @package.Price元

      -

      原价：@package.LinePrice元

      -

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

      + @if(item.Product.TenantId == 1157 && item.Product.Content=="0" && item.Product.Id != 14){ +
      +

      免费

      +

      @restStatus

      +

      @restTimes

      -

      @package.Name

      +

      测试卡

      使用期限:1小时

      } - else { - -
      - - @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ -

      60.00元

      - } else { + @foreach (var package in item.Packages.Where(m => (m.IsTest == 0 && m.Status == 1) || (m.ProductId==14 && m.Status == 1) ).OrderBy(m => m.TenantId)) + { + @if(package.Title != "0"){ + + } + + @if(package.Price == 0.1M){ + +
      + +

      @package.Price元

      - } -

      原价：@package.LinePrice元

      -

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

      -
      -

      @package.Name

      -

      @package.Profile

      +

      原价：@package.LinePrice元

      +

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

      +
      +

      @package.Name

      +

      @package.Profile

      +
      +
      - -
      + } + else if(package.ProductId == 18 && package.Title=="0"){ + +
      + +

      @package.Price元

      +

      原价：@package.LinePrice元

      +

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

      +
      +

      @package.Name

      +

      @package.Profile

      +
      + +
      + } else if((package.Id == 89||package.Id == 1034||package.Id == 1040)&&package.IsTest==1){ + +
      +

      @package.Price元

      +

      原价：@package.LinePrice元

      +

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

      +
      +

      @package.Name

      +

      使用期限:1小时

      +
      + +
      + } + else if(package.Title!="0"){ + +
      + + + @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +

      60.00元

      + } else { +

      @package.Price元

      + } +

      原价：@package.LinePrice元

      +

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

      +
      +

      @package.Name

      +

      @package.Profile

      +
      + +
      + } + else { + +
      + + + @if((package.Id == 64||package.Id == 1004)&&package.Price<60){ +

      60.00元

      + } else { +

      @package.Price元

      + } +

      原价：@package.LinePrice元

      +

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

      +
      +

      @package.Name

      +

      @package.Profile

      +
      + +
      + } } - } - -
      + +
    @@ -672,6 +680,9 @@ $("#pkg71").show(); $("#pkg1022").show(); $("#pkg1023").show(); + $("#tabttzx").addClass("active"); + $("#tabttgj").removeClass("active"); + $("#tabttpt").removeClass("active"); for (var i=1034;i<1046;i++){ $("#pkg"+i).hide(); } @@ -683,6 +694,9 @@ $("#pkg71").hide(); $("#pkg1022").hide(); $("#pkg1023").hide(); + $("#tabttzx").removeClass("active"); + $("#tabttgj").addClass("active"); + $("#tabttpt").removeClass("active"); for (var i=1040;i<1046;i++){ $("#pkg"+i).hide(); } @@ -697,6 +711,9 @@ $("#pkg71").hide(); $("#pkg1022").hide(); $("#pkg1023").hide(); + $("#tabttzx").removeClass("active"); + $("#tabttgj").removeClass("active"); + $("#tabttpt").addClass("active"); for (var i=1040;i<1046;i++){ $("#pkg"+i).show(); } @@ -710,6 +727,8 @@ function wjdxphone() { $("#wjdxgd").removeClass("active"); $("#wjdxpt").addClass("active"); + $("#tabwjdxsj").addClass("active"); + $("#tabwjdxpc").removeClass("active"); wjdxtype = 1; for (var i=1048;i<1051;i++){ $("#pkg"+i).show(); @@ -722,6 +741,8 @@ function wjdxpc() { $("#wjdxgd").removeClass("active"); $("#wjdxpt").addClass("active"); + $("#tabwjdxsj").removeClass("active"); + $("#tabwjdxpc").addClass("active"); wjdxtype = 2; for (var i=1048;i<1054;i++){ $("#pkg"+i).hide(); @@ -782,6 +803,8 @@ //1 安卓、苹果 2 pc var wjgxtype = 1; function wjgxphone() { + $("#tabwjgxsj").addClass("active"); + $("#tabwjgxpc").removeClass("active"); $("#wjgxgd").removeClass("active"); $("#wjgxpt").addClass("active"); wjgxtype = 1; @@ -794,6 +817,8 @@ } function wjgxpc() { + $("#tabwjgxsj").removeClass("active"); + $("#tabwjgxpc").addClass("active"); $("#wjgxgd").removeClass("active"); $("#wjgxpt").addClass("active"); wjgxtype = 2; @@ -865,12 +890,12 @@ alert('请注意！无尽IP仅供电脑端使用！'); } if (pid == 14) { - $("#pkg89").hide(); - $("#pkg69").hide(); - $("#pkg70").hide(); - $("#pkg71").hide(); - $("#pkg1022").hide(); - $("#pkg1023").hide(); + $("#pkg89").show(); + $("#pkg69").show(); + $("#pkg70").show(); + $("#pkg71").show(); + $("#pkg1022").show(); + $("#pkg1023").show(); for (var i=1034;i<1046;i++){ $("#pkg"+i).hide(); } @@ -878,11 +903,37 @@ $("#p"+i).removeClass("on"); } } else if (pid == 20||pid == 21){ - for (var i=1048;i<1072;i++){ - $("#pkg"+i).hide(); + if (pid ==20) { + $("#wjdxgd").removeClass("active"); + $("#wjdxpt").addClass("active"); + $("#tabwjdxsj").removeClass("active"); + $("#tabwjdxpc").addClass("active"); + wjdxtype = 2; + for (var i=1048;i<1054;i++){ + $("#pkg"+i).hide(); + } + for (var i=1057;i<1060;i++){ + $("#pkg"+i).hide(); + } + for (var i=1054;i<1057;i++){ + $("#pkg"+i).show(); + } } - for (var i=1;i<30;i++){ - $("#p"+i).removeClass("on"); + if (pid ==21) { + $("#tabwjgxsj").removeClass("active"); + $("#tabwjgxpc").addClass("active"); + $("#wjgxgd").removeClass("active"); + $("#wjgxpt").addClass("active"); + wjgxtype = 2; + for (var i=1060;i<1066;i++){ + $("#pkg"+i).hide(); + } + for (var i=1069;i<1072;i++){ + $("#pkg"+i).hide(); + } + for (var i=1066;i<1069;i++){ + $("#pkg"+i).show(); + } } } else { $("#p14").removeClass("on"); @@ -894,7 +945,6 @@ $(".card .item").click(function () { currentPkgId = $(this).attr('a-pkg-id'); - console.log(isTest); if ($(this).attr('a-test')){ isTest = true; } else { @@ -919,7 +969,6 @@ } else { window.location.href = "Buy?id=" + currentPkgId; } - console.log(isTest); }) $(".testLogin").click(function () { loginCallback = testLoginSuccess; diff --git a/Host/Views/Product/Test.cshtml b/Host/Views/Product/Test.cshtml index e80db81..675dde6 100644 --- a/Host/Views/Product/Test.cshtml +++ b/Host/Views/Product/Test.cshtml @@ -59,7 +59,7 @@

    @Model.Product.Name

    -

    @Model.Package.Name

    +

    @Model.Package.Name

    0元

    @Model.Package.Profile

    diff --git a/Host/Views/Product/buy.cshtml b/Host/Views/Product/buy.cshtml index 96b64cd..c7a99e5 100644 --- a/Host/Views/Product/buy.cshtml +++ b/Host/Views/Product/buy.cshtml @@ -92,39 +92,33 @@
    -
    +
    当前已选产品：
    -
    -
    -
    -

    @Model.Product.Name

    -
    -
    -

    @Model.Package.Name

    -

    @(Model.Package.DayPrice)元/天

    -

    @Model.Package.Profile

    +
    +
    +
    + @Model.Product.Name - @Model.Package.Name   -
    -
    @if(Model.Package.Price < 60 && (Model.Package.Id == 64||Model.Package.Id == 1004)){ -

    60.00元

    +
    ￥60.00
    } else { @if (Model.Package.IsTest == 0) { -

    @Model.Package.Price元

    +
    ￥@Model.Package.Price 元
    } else { -

    1.0元

    +
    ￥1.0元
    } } -
    +
    -

    *请务必选好所需商品，换货会产生费用

    +

    +

    *请务必选好所需商品，换货会产生费用

    @if (Model.Package.Name == "天卡") - { -

    *天卡不支持退款，请谨慎购买

    - } + { +

    *天卡不支持退款，请谨慎购买

    + }
    -
    +
    返回重新选择》
    diff --git a/Host/Views/Product/rebuy.cshtml b/Host/Views/Product/rebuy.cshtml index 2615217..4559d0b 100644 --- a/Host/Views/Product/rebuy.cshtml +++ b/Host/Views/Product/rebuy.cshtml @@ -66,29 +66,31 @@
    -
    +
    当前已选产品：
    -
    -
    -
    -

    @Model.Product.Name

    -
    -
    -

    @Model.Package.Name

    -

    @(Model.Package.DayPrice)元/天

    -

    @Model.Package.Profile

    +
    +
    +
    + @Model.Product.Name - @Model.Package.Name   -
    -
    @if(Model.Package.Price < 60 && (Model.Package.Id == 64||Model.Package.Id == 1004)){ -

    60.00元

    +
    ￥60.00
    } else { -

    @Model.Package.Price元

    + @if (Model.Package.IsTest == 0) { +
    ￥@Model.Package.Price 元
    + } else { +
    ￥1.0元
    + } } -
    +
    -

    *请务必选好所需商品，换货会产生费用

    +

    +

    *请务必选好所需商品，换货会产生费用

    + @if (Model.Package.Name == "天卡") + { +

    *天卡不支持退款，请谨慎购买

    + }
    返回重新选择》 diff --git a/Host/wwwroot/m/css/base.css b/Host/wwwroot/m/css/base.css index 386203e..758922c 100644 --- a/Host/wwwroot/m/css/base.css +++ b/Host/wwwroot/m/css/base.css @@ -29,7 +29,7 @@ body { } .banner { - background: url(../img/banner.png) no-repeat left top; + background: url(http://mp4.juip.com/banner.png?id=1) no-repeat left top; background-size: cover; height: 6.133333rem; position: relative; @@ -132,8 +132,8 @@ body { } .youshi { - background: url(../img/youshi.png) no-repeat left top; - background-size: 100%; + background: url(../../img/youshi.png) left top; + background-size: 100% 100%; height: 9.6rem; position: relative; } @@ -161,7 +161,7 @@ body { } .swiper-container-youshi { - padding-top: 2.426666rem; + padding-top: 1.426666rem; } .swiper-container-youshi .swiper-slide { @@ -253,7 +253,7 @@ body { } .linkus .item { - width: 50%; + width: 100%; } .linkus .item p:first-child { @@ -555,13 +555,13 @@ body { float: none !important; text-align: center; margin-bottom: 0px !important; - height: 1.466666rem !important; - line-height: 1.466666rem !important; + height: 1.2rem !important; + line-height: 1.2rem !important; } .cpName li a { - height: 1.466666rem !important; - line-height: 1.466666rem !important; + height: 1.2rem !important; + line-height: 1.2rem !important; padding: 0 !important; border-radius: 0px !important; } diff --git a/Services/Hncore.Pass.Vpn/Domain/Enums.cs b/Services/Hncore.Pass.Vpn/Domain/Enums.cs index 518cbdc..8b57912 100644 --- a/Services/Hncore.Pass.Vpn/Domain/Enums.cs +++ b/Services/Hncore.Pass.Vpn/Domain/Enums.cs @@ -174,6 +174,8 @@ namespace Hncore.Pass.Vpn.Domain Help = 4, [DisplayName("公告中心")] Notice = 5, + [DisplayName("代理合作")] + Agnet = 6, } public enum PayChannel