From 8c46075c4a1a0ef73222c91d824d4952a1a5cae5 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Wed, 25 Nov 2020 18:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=81=E9=B9=B0=E6=B4=BB=E5=8A=A8=E4=B8=8B?=
 =?UTF-8?q?=E6=9E=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml      |  9 +++++----
 Host/Views.Mobile/Product/ReBuyIndex.cshtml |  8 +++++---
 Host/Views/Product/Index.cshtml             | 13 +++++++------
 Host/Views/Product/ReBuyIndex.cshtml        | 16 +++++++++-------
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 4fd159d..9e7c29b 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -33,7 +33,7 @@
         <ul class="nav nav-tabs cpName" role="tablist">
             @foreach (var item in Model)
             {
-                @if(item.Product.Id == 5 || item.Product.Id == 14){
+                @if(item.Product.Id == 14){
                     
                     <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;">送1月</span></a>
@@ -89,7 +89,7 @@
                     }
                     else
                     {
-                        @if(package.Id == 86||package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
+                        @if(package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
                             <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">
@@ -104,7 +104,8 @@
                                     </div>
                                 </div>
                             </a>
-                        } else if(package.Id == 19) {
+                        } 
+                        @* else if(package.Id == 19) {
 
                             <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
                                 <div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
@@ -121,7 +122,7 @@
                             </a>
 
                             
-                        } 
+                        }  *@
                         @* else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) {
 
                             <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
index 53fe4bb..55cc780 100644
--- a/Host/Views.Mobile/Product/ReBuyIndex.cshtml
+++ b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
@@ -41,7 +41,7 @@
                 </ul>
                 @foreach (var package in Model.Packages.Where(m=>m.IsTest==0&&m.Status==1).OrderBy(m => m.TenantId))
                 {
-                    @if(package.Id == 86||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
+                    @if(package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
                         <a asp-action="rebuy" asp-controller="Product" asp-route-packageId="@package.Id" asp-route-accounts=@ViewBag.accounts>
                             <div class="card color_@((Model.Packages.IndexOf(package)+1)%5)">
                                 <div class="item">
@@ -55,7 +55,8 @@
                                 </div>
                             </div>
                         </a>
-                    } else if(package.Id == 19){
+                    } 
+                    @* else if(package.Id == 19){
                         <a asp-action="rebuy" asp-controller="Product" asp-route-packageId="@package.Id" asp-route-accounts=@ViewBag.accounts>
                             <div class="card color_@((Model.Packages.IndexOf(package)+1)%5)">
                                 <div class="item">
@@ -69,7 +70,8 @@
                                 </div>
                             </div>
                         </a>
-                    } else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16){
+                    }  *@
+                    else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16){
                         <a asp-action="rebuy" asp-controller="Product" asp-route-packageId="@package.Id" asp-route-accounts=@ViewBag.accounts>
                             <div class="card color_@((Model.Packages.IndexOf(package)+1)%5)">
                                 <div class="item">
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 0efc7f3..3adb971 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -249,7 +249,7 @@
         <div class="nav" style="width:175px;">
             @foreach (var item in Model)
             {
-                @if(item.Product.Id == 5 || item.Product.Id == 14){
+                @if( item.Product.Id == 14){
                     <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;font-size:12px;float:right;padding-right: 5px;">送1月</span></div>
                 } 
                 @* else if(item.Product.Id == 4 || item.Product.Id == 13) {
@@ -299,9 +299,9 @@
                             </div>
                         </div>
                     </div>
-                    @if(item.Product.Id == 5){
+                    @* @if(item.Product.Id == 5){
                         <p class="youhuiNew">月卡赠送10天，双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月25日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
-                    }
+                    } *@
                     @* @if(item.Product.Id == 13){
                         <p class="youhuiNew">全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     }
@@ -328,7 +328,7 @@
                     <div class="card" style="margin-top:30px;">
                         @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId))
                         {
-                            @if(package.Id == 86||package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
+                            @if(package.Id == 88||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
                                 
                                 <div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
@@ -341,7 +341,8 @@
                                     </div>
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
-                            } else if(package.Id == 19) {
+                            } 
+                            @* else if(package.Id == 19) {
                                 <div class="item packageitem packageitem19" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
@@ -354,7 +355,7 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
 
-                            } 
+                            }  *@
                             @* else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) {
                                 <div class="item packageitem packageitem4" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index a58c1cc..78a538f 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -179,9 +179,9 @@
             </div>
         </div>
     </div> 
-    @if(defaultProduct.Id == 5){
+    @* @if(defaultProduct.Id == 5){
         <p class="youhuiNew">月卡赠送10天，双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月25日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
-    }
+    } *@
     @if(defaultProduct.Id == 14){
         <p class="youhuiNew">月卡赠送7天，双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年12月1日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
     }
@@ -197,17 +197,17 @@
     @if(defaultProduct.Id == 8||defaultProduct.Id == 7||defaultProduct.Id == 9||defaultProduct.Id == 3||defaultProduct.Id == 10||defaultProduct.Id == 16||defaultProduct.Id == 15){
         <p class="youhuiNew">双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
     } *@
-    @if(defaultProduct.Id == 13){
+    @* @if(defaultProduct.Id == 13){
         <p class="youhuiNew">全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
     }
     @if(defaultProduct.Id == 4){
         <p class="youhuiNew">全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
-    }
+    } *@
                     
     <div class="card">
         @foreach (var package in Model.Packages.Where(m => m.IsTest == 0 && m.Status == 1).OrderBy(m => m.TenantId))
         {
-            @if(package.Id == 86||package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
+            @if(package.Id == 101||package.Id == 103||package.Id == 104||(package.Id>103)){
                                 
                     <div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
@@ -220,7 +220,8 @@
                         </div>
                         <img src="~/img/check.png" class="cardCheck">
                     </div>
-                } else if(package.Id == 19) {
+                } 
+                @* else if(package.Id == 19) {
                     <div class="item packageitem packageitem19" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>
@@ -233,7 +234,8 @@
                         <img src="~/img/check.png" class="cardCheck">
                     </div>
 
-                }else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) {
+                } *@
+                else if(package.Id == 63||package.Id == 64||package.Id == 65||package.Id == 66||package.Id == 67||package.Id == 13||package.Id == 14||package.Id == 15||package.Id == 16) {
                     <div class="item packageitem packageitem4" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>