From 8c1b0bac526a139c1b7994c9a7ad26706ce39e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Tue, 26 Jan 2021 15:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=98=91=E8=8F=87=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml        | 18 ++++++-
 Host/Views/Product/Index.cshtml               | 47 ++++++++++++++++++-
 .../Service/AgentClient9Service.cs            |  2 +-
 3 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 32c2be9..43bafca 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -105,7 +105,7 @@
                                 </div>
                             </a>
                         } 
-                        else if(package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103 && package.Id<1000)){
+                        else if(package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103 && package.Id<1000)||package.Id==1019){
                             <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
                                 <div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
                                     <div class="item">
@@ -121,6 +121,22 @@
                                 </div>
                             </a>
                         } 
+                         else if(package.Id==1020){
+                            <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
+                                <div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
+                                    <div class="item">
+                                        <p style="font-size: 35px;color:#FFFF00;">@package.Name 送2月</p>
+                                        <p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
+                                        <p>@package.Profile</p>
+                                    </div>
+                                    <div class="item">
+                                        <p>¥<span>@package.Price</span></p> 
+                                        <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
+                                        
+                                    </div>
+                                </div>
+                            </a>
+                        } 
                         @* else if(package.Id == 19) {
 
                             <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 7d8f32a..974da05 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -274,6 +274,35 @@
         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.0rem solid #f64e3d;
+        border-right-color: transparent;
+        content: "九折+送两个月";
+        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;
+    }
+
     .packageitem71{
         position: relative;
     }
@@ -377,7 +406,7 @@
                 @if( item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 6||item.Product.Id == 13||item.Product.Id == 17){
                     <div class="productItem" style="" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div>
                 } 
-                else if(item.Product.Id == 4 || item.Product.Id == 5 || item.Product.Id == 14) {
+                else if(item.Product.Id == 4 || item.Product.Id == 5 || item.Product.Id == 14 || item.Product.Id == 18) {
                     <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id" a-pkg-id="@(item.Packages.FirstOrDefault(m=>m.Status==1).Id)">@item.Product.Name <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</span></div>
                 } 
                 else {
@@ -481,7 +510,7 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
                             } 
-                            else if(package.Id == 1018||package.Id==1009){
+                            else if(package.Id == 1018||package.Id==1009||package.Id==1019){
                                 
                                 <div class="item packageitem packageitem91" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
@@ -495,6 +524,20 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
                             }
+                            else if(package.Id==1020){
+                                
+                                <div class="item packageitem packageitem92" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
+
+                                    <p><span class="price">@package.Price</span>元</p>
+                                    <p class="yuanjia" style="color: #FF9900;">原价：<span>@package.LinePrice</span>元</p>
+                                    <p>@(Math.Round(package.Price/package.DayCount,2))元/天</p>
+                                    <div class="pkgNameCard" style="background-color:#f64e3d">
+                                        <p class="tianka" style="font-size:17px;">@package.Name</p>
+                                        <p class="qixian">@package.Profile</p>
+                                    </div>
+                                    <img src="~/img/check.png" class="cardCheck">
+                                </div>
+                            }
                             else if(package.Id == 88||package.Id == 101||package.Id == 103){
                                 
                                 <div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
diff --git a/Services/Hncore.Pass.Vpn/Service/AgentClient9Service.cs b/Services/Hncore.Pass.Vpn/Service/AgentClient9Service.cs
index 35fde3b..19c9f8e 100644
--- a/Services/Hncore.Pass.Vpn/Service/AgentClient9Service.cs
+++ b/Services/Hncore.Pass.Vpn/Service/AgentClient9Service.cs
@@ -116,7 +116,7 @@ namespace Hncore.Pass.Vpn.Service
                 interval ="2";
                 packageKey = "month";
             } else if(packageKey == "3") {
-                interval ="2";
+                interval ="3";
                 packageKey = "month";
             }
             var map = new Dictionary<string, string>(){