From fd91fd6e612c7f79146efbb45864c0a833e2ca2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Wed, 12 Jul 2023 19:18:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/ProductController.cs  |  43 +---
 Host/Views.Mobile/Product/Index.cshtml |  51 +----
 Host/Views.Mobile/Product/Soft.cshtml  |   8 +-
 Host/Views/Product/Index.cshtml        | 276 +++++--------------------
 Host/Views/Product/Soft.cshtml         |   2 +-
 5 files changed, 62 insertions(+), 318 deletions(-)

diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index 3ae5c05..4a8b15a 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -107,19 +107,7 @@ namespace Home.Controllers
                                 m.Price = dis_price;
                                 m.Title = discount.Remark;
                             } else {
-                               m.Title = "9.5";
-                        if (m.ProductId == 1||m.ProductId == 2){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 18){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 6||m.ProductId == 5){
-                            m.Title = "9";
-                        }
-                        if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){
-                            m.Title = "8";
-                        }
+                               m.Title = "0";
                             }
                             if(m.Price<m.MinPrice){
                                 m.Price = m.MinPrice;
@@ -136,19 +124,7 @@ namespace Home.Controllers
                     foreach(var product in respList)
                     {
                         product.Packages.ForEach(m => {
-                            m.Title = "9.5";
-                        if (m.ProductId == 1||m.ProductId == 2){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 18){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 6||m.ProductId == 5){
-                            m.Title = "9";
-                        }
-                        if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){
-                            m.Title = "8";
-                        }
+                            m.Title = "0";
 
                             var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId);
                             if (userPrice != null && userPrice.UserPrice > 0)
@@ -165,19 +141,8 @@ namespace Home.Controllers
                 foreach(var product in respList)
                 {
                     product.Packages.ForEach(m => {
-                        m.Title = "9.5";
-                        if (m.ProductId == 1||m.ProductId == 2){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 18){
-                            m.Title = "7.5";
-                        }
-                        if (m.ProductId == 6||m.ProductId == 5){
-                            m.Title = "9";
-                        }
-                        if (m.ProductId == 23||m.ProductId == 13||m.ProductId == 14||m.ProductId == 17){
-                            m.Title = "8";
-                        }
+                        m.Title = "0";
+                        
                         // if ((m.DayCount == 1||m.DayCount == 2) && m.Id != 1034&&m.Id != 1040 &&m.Id != 1079&&m.Id != 1073){
                         //     m.Price = 0.1M;
                         // }
diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 2938aa2..e035f37 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -52,56 +52,11 @@
             </li>
             @foreach (var item in Model)
             {
-                if(item.Product.Id == 6) {
+                if(item.Product.Id == 18) {
                     <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;"></span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">9折</span></a>
+                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;"><span style="color: red;font-weight:bold;">送 </span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">8折</span></a>
                     </li>
-                }
-                else if(item.Product.Id == 18) {
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;">送</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">7.5折</span></a>
-                    </li>
-                }
-                else if(item.Product.Id == 1||item.Product.Id == 2) {
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">7.5折</span></a>
-                    </li>
-                }
-                else if(item.Product.Id == 5) {
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">9折</span></a>
-                    </li>
-                 }
-                else if(item.Product.Id == 23||item.Product.Id == 13||item.Product.Id == 17) {
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">8折</span></a>
-                    </li>
-                 }
-                 else if(item.Product.Id == 14) {
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" id="p14" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">8折</span></a>
-                    </li>
-                }
-                
-                else if(item.Product.Id == 22) {
-                    <li >
-                        <a style="color:#0098fb"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></a>
-                    </li>
-                   
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name </a>
-                    </li>
-                }
-                else if(item.Product.Id == 21) {
-                    
-                    <li >
-                        <a style="color:#0098fb"><span class="glyphicon glyphicon-arrow-down"></span>单窗口单IP<span class="glyphicon glyphicon-arrow-down"></span></a>
-                    </li>
-                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name </a>
-                    </li>
-                }
-                else{
+                } else {
                     
                     <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
                         <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 25px;">@item.Product.Name </a>
diff --git a/Host/Views.Mobile/Product/Soft.cshtml b/Host/Views.Mobile/Product/Soft.cshtml
index ef15385..0de50b1 100644
--- a/Host/Views.Mobile/Product/Soft.cshtml
+++ b/Host/Views.Mobile/Product/Soft.cshtml
@@ -25,18 +25,20 @@
 
 
 <div class="softList">
-    @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.OnLine==1).OrderBy(m => m.Sort))
+    @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.Id!=21 && m.OnLine==1).OrderBy(m => m.Sort))
     {
     <div class="item">
         @*<p><img src="@P(item.Image)"></p>*@
-        <p>@item.Name</p> 
         @if (item.Id != 20){  
+            <p>@item.Name</p> 
             <p><a href="@item.SimulatorDownloadUrl"> <button type="button" class="btnBlue">SSTP客户端下载</button></a></p>
         }
-        @if (!string.IsNullOrEmpty(item.DroidDownloadUrl)){      
+        @if (!string.IsNullOrEmpty(item.DroidDownloadUrl)){  
+            <p>@item.Name</p>     
             <p><a href="@item.DroidDownloadUrl"> <button type="button" class="btnBlue">安卓APP</button></a></p>
             <br>
         } else if (item.Id == 20) {
+            <p>无极</p> 
             <p><a href="http://wuxinxikehuduan.image.qiangzipptp.top/%E6%97%A0%E6%9E%81%E5%AE%89%E5%8D%93-%E5%85%B1%E4%BA%AB%E7%8B%AC%E4%BA%AB%E9%80%9A%E7%94%A8.apk"> <button type="button" class="btnBlue">无极安卓共享独享通用</button></a></p>
 
             <p><a href="https://apps.apple.com/cn/app/jie-zou-da-shi/id1448657437"> <button type="button" class="btnBlue">ios客户端</button></a></p>              
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 3e18999..3b0e72a 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -187,121 +187,6 @@
         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: "7.5折+送 1 天";
-        box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
-    }
-
-    .packageitem3::after {
-        content: "";
-        position: absolute;
-        top: 2.1875rem;
-        left: -0.5rem;
-        border: 0.25rem solid #f64e3d;
-        border-left-color: transparent;
-        border-bottom-color: transparent;
-    }
-
-    .packageitem10{
-        position: relative;
-    }
-    .packageitem10::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: "7.5折+送 5 天";
-        box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
-    }
-
-    .packageitem10::after {
-        content: "";
-        position: absolute;
-        top: 2.1875rem;
-        left: -0.5rem;
-        border: 0.25rem solid #f64e3d;
-        border-left-color: transparent;
-        border-bottom-color: transparent;
-    }
-
-     .packageitem30{
-        position: relative;
-    }
-    .packageitem30::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: "7.5折+送 1 月";
-        box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
-    }
-
-    .packageitem30::after {
-        content: "";
-        position: absolute;
-        top: 2.1875rem;
-        left: -0.5rem;
-        border: 0.25rem solid #f64e3d;
-        border-left-color: transparent;
-        border-bottom-color: transparent;
-    }
-
-     .packageitem8530{
-        position: relative;
-    }
-    .packageitem8530::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: "8.5折+送 1 月";
-        box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
-    }
-
-    .packageitem8530::after {
-        content: "";
-        position: absolute;
-        top: 2.1875rem;
-        left: -0.5rem;
-        border: 0.25rem solid #f64e3d;
-        border-left-color: transparent;
-        border-bottom-color: transparent;
-    }
 
     .warning{
         position: fixed;
@@ -364,23 +249,11 @@
             @foreach (var item in Model)
             {
                 if(item.Product.Id == 18) {
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;">送</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">7.5折</span></div>
-                }
-                else if(item.Product.Id == 6) {
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span class="glyphicon glyphicon-thumbs-up" style="color: #f64e3d;font-weight:bold;padding-right: 5px;"> </span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">9折</span></div>
-                }
-                else if(item.Product.Id == 1||item.Product.Id == 2) {
-                    <div class="productItem" 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;">7.5折</span></div>
-                }
-                else if(item.Product.Id == 5) {
-                    <div class="productItem" 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;">9折</span></div>
-                }
-                else if(item.Product.Id == 23||item.Product.Id == 13||item.Product.Id == 17) {
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span  style="color: #f64e3d;font-weight:bold;padding-right: 5px;"></span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">8折</span></div>
+                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: red;font-weight:bold;">送 </span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">8折</span></div>
                 }
                 else if(item.Product.Id == 14) {
                     <div class="dropdown">
-                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu1" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" 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;">8折</span></div>
+                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu1" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name</div>
                         </button>
                         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
                             <li role="presentation">
@@ -398,7 +271,7 @@
                 else if(item.Product.Id == 20) {
                     
                     <div class="dropdown">
-                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu2" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;"></span></div>
+                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu2" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" 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>
                         </button>
                         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
                             <li role="presentation">
@@ -412,17 +285,17 @@
                 }
                 else if(item.Product.Id == 22) {
                     <div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></div>
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name</div>
+                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name</div>
 
                 }
                 
                 else if(item.Product.Id == 25) {
                     @* <div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>静态IP<span class="glyphicon glyphicon-arrow-down"></span></div> *@
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name</div>
+                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name</div>
 
                 }
                 else if(item.Product.Id == 23) {
-                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name</div>
+                    <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name</div>
 
                 }
                 
@@ -430,7 +303,7 @@
                     
                     <div style="background-color: #ccc;color:#0098fb" disabled="disabled"><span class="glyphicon glyphicon-arrow-down"></span>单窗口单IP<span class="glyphicon glyphicon-arrow-down"></span></div>
                     <div class="dropdown">
-                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu2" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id"><span style="color: #f64e3d;font-weight:bold;padding-right: 5px;">新</span>@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;"></span></div>
+                        <button type="button" class="btn dropdown-toggle" style="width: 99%;height:100%;background:white;padding:0;" id="dropdownMenu2" data-toggle="dropdown"><div style="font-size: 18px;" class="productItem" 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>
                         </button>
                         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
                             <li role="presentation">
@@ -691,37 +564,38 @@
 
                         @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1 ).OrderBy(m => m.TenantId))
                         {
+                            @if(package.Title != "0"){
+                                <style>
+                                    .packageitem-@package.Id{
+                                        position: relative;
+                                    }
+                                    .packageitem-@package.Id::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: "@package.Title 折";
+                                        box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
+                                    }
 
-                            <style>
-                                .packageitem-@package.Id{
-                                    position: relative;
-                                }
-                                .packageitem-@package.Id::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: "@package.Title 折";
-                                    box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
-                                }
-
-                                .packageitem-@package.Id::after {
-                                    content: "";
-                                    position: absolute;
-                                    top: 2.1875rem;
-                                    left: -0.5rem;
-                                    border: 0.25rem solid #f64e3d;
-                                    border-left-color: transparent;
-                                    border-bottom-color: transparent;
-                                }
-                            </style>
+                                    .packageitem-@package.Id::after {
+                                        content: "";
+                                        position: absolute;
+                                        top: 2.1875rem;
+                                        left: -0.5rem;
+                                        border: 0.25rem solid #f64e3d;
+                                        border-left-color: transparent;
+                                        border-bottom-color: transparent;
+                                    }
+                                </style>
+                            }
 
                             @if(package.Price == 0.1M){
                                 
@@ -738,7 +612,7 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
                             } 
-                            else if(package.Id == 1030){
+                            else if(package.ProductId == 18){
                                 
                                 <div class="item packageitem packageitem2" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
@@ -752,67 +626,16 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
                             } 
-                            else if(package.Id == 1031){
-                                
-                                <div class="item packageitem packageitem3" 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;color:white;">@package.Name</p>
-                                        <p class="qixian">@package.Profile</p>
-                                    </div>
-                                    <img src="~/img/check.png" class="cardCheck">
-                                </div>
-                            } 
-                            else if(package.Id == 1032){
-                                
-                                <div class="item packageitem packageitem10" 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;color:white;">@package.Name</p>
-                                        <p class="qixian">@package.Profile</p>
-                                    </div>
-                                    <img src="~/img/check.png" class="cardCheck">
-                                </div>
-                            } 
-                            else if(package.Id == 1033){
-                                
-                                <div class="item packageitem packageitem30" 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;color:white;">@package.Name</p>
-                                        <p class="qixian">@package.Profile</p>
-                                    </div>
-                                    <img src="~/img/check.png" class="cardCheck">
-                                </div>
-                            } 
-                            else if(package.Id == 104){
-                                
-                                <div class="item packageitem packageitem8530" 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;color:white;">@package.Name</p>
-                                        <p class="qixian">@package.Profile</p>
-                                    </div>
-                                    <img src="~/img/check.png" class="cardCheck">
-                                </div>
-                            } 
-                            else if(package.ProductId == 20){
+                            else if(package.Title!="0"){
                                 
                                 <div class="item packageitem packageitem-@package.Id" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
+                                   
 
-                                    <p><span class="price">@package.Price</span>元</p>
+                                    @if((package.Id == 64||package.Id == 1004)&&package.Price<60){
+                                        <p><span class="price">60.00</span>元</p>
+                                    } else {
+                                        <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">
@@ -821,10 +644,9 @@
                                     </div>
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
-                            } 
-                            else {
-                                
-                                <div class="item packageitem packageitem-@package.Id" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
+                            } else {
+                                 
+                                <div class="item " id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
                                    
 
                                     @if((package.Id == 64||package.Id == 1004)&&package.Price<60){
diff --git a/Host/Views/Product/Soft.cshtml b/Host/Views/Product/Soft.cshtml
index a3bf06c..8906dd4 100644
--- a/Host/Views/Product/Soft.cshtml
+++ b/Host/Views/Product/Soft.cshtml
@@ -25,7 +25,7 @@
 
 <div class="container">
     <div class="soft">
-        @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.OnLine==1).OrderBy(m => m.Sort))
+        @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.Id!=21 && m.OnLine==1).OrderBy(m => m.Sort))
         {
             <div class="sitem">
                 <div class="smodel">