From 7d6d7cfd00508095f4b3817932e2aa404fb1a3fc Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Wed, 2 Dec 2020 13:50:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=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      |  5 +++--
 Host/Views.Mobile/Shared/_Layout.cshtml     |  4 ++--
 Host/Views.Mobile/Shared/_UserLayout.cshtml |  4 ++--
 Host/Views/Home/Index.cshtml                |  2 +-
 Host/Views/Product/Index.cshtml             | 19 ++++++++++---------
 Host/Views/Shared/_Layout.cshtml            |  2 +-
 Host/Views/Shared/_UserLayout.cshtml        |  2 +-
 7 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 9e7c29b..99bf848 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -141,7 +141,7 @@
 
                             
                         }  *@
-                        else if(package.Id == 71||package.Id == 102||package.Id == 100) {
+                        @* else if(package.Id == 71||package.Id == 102||package.Id == 100) {
 
                             <a asp-action="buy" asp-controller="product" asp-route-id="@package.Id">
                                 <div class="card color_@((item.Packages.IndexOf(package)+1)%5)">
@@ -158,7 +158,8 @@
                             </a>
 
                             
-                        } else {
+                        }  *@
+                        else {
                             <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">
diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml
index ac15461..18ae3e9 100644
--- a/Host/Views.Mobile/Shared/_Layout.cshtml
+++ b/Host/Views.Mobile/Shared/_Layout.cshtml
@@ -18,7 +18,7 @@
     <meta content="yes" name="apple-touch-fullscreen" />
     <meta content="telephone=no,email=no" name="format-detection" />
     <meta content="maximum-dpr=2" name="flexible" />
-    <title>聚IP JUIP.COM-产品购买 <span style="color: red;">活动</span></title>
+    <title>聚IP JUIP.COM-产品购买</title>
     <link rel="stylesheet" type="text/css" href="~/m/css/base.css" />
     <link rel="stylesheet" type="text/css" href="~/m/css/swiper.min.css" />
     <link rel="stylesheet" type="text/css" href="~/m/css/bootstrap.css" />
@@ -187,7 +187,7 @@
     <div class="mask">
         <ul class="layNav">
             <li><a href="/">首页</a></li>
-            <li><a asp-action="index" asp-controller="product">产品购买 <span style="color: red;">活动</span></a> </li>
+            <li><a asp-action="index" asp-controller="product">产品购买</a> </li>
             <li><a asp-action="index" asp-controller="LineList" asp-route-Catalog="1">线路表</a> </li>
             <li><a asp-action="soft" asp-controller="product">软件下载</a> </li>
             <li><a asp-action="index" asp-controller="article">教程&咨询</a></li>
diff --git a/Host/Views.Mobile/Shared/_UserLayout.cshtml b/Host/Views.Mobile/Shared/_UserLayout.cshtml
index 2599f7d..06a8988 100644
--- a/Host/Views.Mobile/Shared/_UserLayout.cshtml
+++ b/Host/Views.Mobile/Shared/_UserLayout.cshtml
@@ -19,7 +19,7 @@
     <meta content="telephone=no,email=no" name="format-detection" />
     <meta content="maximum-dpr=2" name="flexible" />
 
-    <title>聚IP JUIP.COM-产品购买 <span style="color: red;">活动</span></title>
+    <title>聚IP JUIP.COM-产品购买</title>
     <link rel="stylesheet" type="text/css" href="~/m/css/base.css" />
     <link rel="stylesheet" type="text/css" href="~/m/css/swiper.min.css" />
     <link rel="stylesheet" type="text/css" href="~/m/css/bootstrap.css" />
@@ -49,7 +49,7 @@
     <div class="mask">
         <ul class="layNav">
             <li><a href="/">首页</a></li>
-            <li><a asp-action="index" asp-controller="product">产品购买 <span style="color: red;">活动</span></a> </li>
+            <li><a asp-action="index" asp-controller="product">产品购买</a> </li>
             <li><a asp-action="index" asp-controller="LineList">线路表</a> </li>
             <li><a asp-action="soft" asp-controller="product">软件下载</a> </li>
             <li><a asp-action="index" asp-controller="article">教程&咨询</a></li>
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index ab00a35..95e0736 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -356,7 +356,7 @@
                 <div class="col-lg-10 col-md-10">
                     <ul class="navList pull-right">
                         <li><a href="/">首页</a></li>
-                        <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
+                        <li><a href="/product/index">产品购买</a></li>
                         <li><a href="/LineList/index">IP线路表</a></li>
                         <li><a href="/product/soft">软件下载</a></li>
                         <li><a href="/article/index">教程&咨询</a></li>
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index abcf176..9ea1fae 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -287,15 +287,15 @@
         <div class="nav" style="width:175px;">
             @foreach (var item in Model)
             {
-                @if( 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) {
+                else if(item.Product.Id == 4 || item.Product.Id == 13) {
                     <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;">八折</span></div>
-                }  *@
-                else {
+                } 
+                else { *@
                     <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 </div>
-                }
+                @* } *@
             }
 
         </div>
@@ -342,9 +342,9 @@
                     @if(item.Product.Id == 4){
                         <p class="youhuiNew">全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     } *@
-                    @if(item.Product.Id == 14){
+                    @* @if(item.Product.Id == 14){
                         <p class="youhuiNew">月卡赠送7天，双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年12月1日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
-                    }
+                    } *@
                     @* @if(item.Product.Id == 1){
                         <p class="youhuiNew">月卡赠送7天，季卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     }
@@ -418,7 +418,7 @@
                                 </div>
 
                             }  *@
-                            else if(package.Id == 71||package.Id == 100||package.Id == 102) {
+                            @* else if(package.Id == 71||package.Id == 100||package.Id == 102) {
                                 <div class="item packageitem packageitem71" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
@@ -431,7 +431,8 @@
                                     <img src="~/img/check.png" class="cardCheck">
                                 </div>
 
-                            } else {
+                            }  *@
+                            else {
                                 
                                 <div class="item packageitem" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index a5c3b85..d979f1b 100644
--- a/Host/Views/Shared/_Layout.cshtml
+++ b/Host/Views/Shared/_Layout.cshtml
@@ -195,7 +195,7 @@
             <div class="col-lg-10 col-md-10">
                 <ul class="navList navList_buy pull-right">
                     <li><a href="/">首页</a></li>
-                    <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
+                    <li><a href="/product/index">产品购买</a></li>
                     <li><a href="/LineList/index">IP线路表</a></li>
                     <li><a href="/product/soft">软件下载</a></li>
                     <li><a href="/article/index?Catalog=1">教程&咨询</a></li>
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index 52abe17..e176ba7 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -163,7 +163,7 @@
             <div class="col-lg-10 col-md-10">
                 <ul class="navList navList_buy pull-right">
                     <li><a href="/">首页</a></li>
-                    <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
+                    <li><a href="/product/index">产品购买</a></li>
                     <li><a href="/LineList/index" ">IP线路表</a></li>
                     <li><a href="/product/soft">软件下载</a></li>
                     <li><a href="/article/index">教程&咨询</a></li>