From 08fc3f644b51490b05212e6dfc75a4a197c5c701 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Tue, 10 Nov 2020 20:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=B4=BB=E5=8A=A8=E6=96=B9=E6=A1=88?=
 =?UTF-8?q?=E3=80=91=20https://www.tapd.cn/39598945/prong/stories/view/113?=
 =?UTF-8?q?9598945001000109?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml      |  57 ++++++---
 Host/Views.Mobile/Product/ReBuyIndex.cshtml |  28 ++++-
 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             |  84 ++++++++++---
 Host/Views/Product/ReBuyIndex.cshtml        |  99 ++++++++++++---
 Host/Views/Shared/_Layout.cshtml            |   2 +-
 Host/Views/Shared/_UserLayout.cshtml        | 130 +++++++++++++++++++-
 9 files changed, 349 insertions(+), 61 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 3fb70d2..33fc28a 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -33,16 +33,20 @@
         <ul class="nav nav-tabs cpName" role="tablist">
             @foreach (var item in Model)
             {
-                @if(item.Product.Id == 5||item.Product.Id == 14||item.Product.Id == 1||item.Product.Id == 2){
+                @if(item.Product.Id != 4 && item.Product.Id != 13&& item.Product.Id != 10){
                     
-                <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                    <a href="#@item.Product.Id" role="tab" data-toggle="tab">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;">活动</span></a>
-                </li>
-                } 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<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送1月</span></a>
+                    </li>
+                } else if(item.Product.Id == 10) {
+                    <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
+                        <a href="#@item.Product.Id" role="tab" data-toggle="tab" style="font-size: 20px;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送1月</span></a>
+                    </li>
+                }else{
                     
-                <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
-                    <a href="#@item.Product.Id" role="tab" data-toggle="tab">@item.Product.Name</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<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">八折</span></a>
+                    </li>
                 }
             }
         </ul>
@@ -63,7 +67,7 @@
                     需求5个以上，可联系客服设置优惠价<br />
                     若之前享优惠价，请联系客服帮你改价
                 </p>
-                @foreach (var package in item.Packages.Where(m => m.Status == 1))
+                @foreach (var package in item.Packages.Where(m => m.Status == 1).OrderBy(m => m.TenantId))
                 {
                     if (package.IsTest == 1)
                     {
@@ -75,14 +79,15 @@
                                     <p>@package.Profile</p>
                                 </div>
                                 <div class="item">
-                                    <p>¥<span>@package.Price</span></p>
+                                    <p>¥<span>@package.Price</span></p> 
+                                    <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                 </div>
                             </div>
                         </a>
                     }
                     else
                     {
-                        @if(package.Id == 86||package.Id == 88||package.Id == 47||package.Id == 49){
+                        @if(package.Id == 86||package.Id == 88||package.Id == 47||package.Id == 49||package.Id == 25||(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">
@@ -91,7 +96,9 @@
                                         <p>@package.Profile</p>
                                     </div>
                                     <div class="item">
-                                        <p>¥<span>@package.Price</span></p>
+                                        <p>¥<span>@package.Price</span></p> 
+                                        <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
+                                        
                                     </div>
                                 </div>
                             </a>
@@ -105,7 +112,25 @@
                                         <p>@package.Profile</p>
                                     </div>
                                     <div class="item">
-                                        <p>¥<span>@package.Price</span></p>
+                                        <p>¥<span>@package.Price</span></p> 
+                                        <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
+                                    </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) {
+
+                            <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 八折</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>
@@ -121,7 +146,8 @@
                                         <p>@package.Profile</p>
                                     </div>
                                     <div class="item">
-                                        <p>¥<span>@package.Price</span></p>
+                                        <p>¥<span>@package.Price</span></p> 
+                                        <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                     </div>
                                 </div>
                             </a>
@@ -136,7 +162,8 @@
                                         <p>@package.Profile</p>
                                     </div>
                                     <div class="item">
-                                        <p>¥<span>@package.Price</span></p>
+                                        <p>¥<span>@package.Price</span></p> 
+                                        <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                     </div>
                                 </div>
                             </a>
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
index cb9dd33..487a7c6 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))
                 {
-                    @if(package.Id == 86||package.Id == 47||package.Id == 49){
+                    @if(package.Id == 86||package.Id == 47||package.Id == 49||package.Id == 25||(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">
@@ -50,7 +50,8 @@
                                     <p>@package.Profile</p>
                                 </div>
                                 <div class="item">
-                                    <p>¥<span>@package.Price</span></p>
+                                    <p>¥<span>@package.Price</span></p> 
+                                    <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                 </div>
                             </div>
                         </a>
@@ -63,7 +64,22 @@
                                     <p>@package.Profile</p>
                                 </div>
                                 <div class="item">
-                                    <p>¥<span>@package.Price</span></p>
+                                    <p>¥<span>@package.Price</span></p> 
+                                    <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
+                                </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){
+                        <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">
+                                    <p style="font-size: 35px;color:#f64e3d;">@package.Name 85折</p>
+                                    <p>@(package.DayPrice)元/天</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>
@@ -76,7 +92,8 @@
                                     <p>@package.Profile</p>
                                 </div>
                                 <div class="item">
-                                    <p>¥<span>@package.Price</span></p>
+                                    <p>¥<span>@package.Price</span></p> 
+                                    <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                 </div>
                             </div>
                         </a>
@@ -89,7 +106,8 @@
                                     <p>@package.Profile</p>
                                 </div>
                                 <div class="item">
-                                    <p>¥<span>@package.Price</span></p>
+                                    <p>¥<span>@package.Price</span></p> 
+                                    <p style="color: #FF9900;text-decoration: line-through">原价：@package.LinePrice 元</p>
                                 </div>
                             </div>
                         </a>
diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml
index 3587bfd..c275a5f 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-产品购买</title>
+    <title>聚IP JUIP.COM-产品购买 <span style="color: red;">活动</span></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">产品购买</a> </li>
+            <li><a asp-action="index" asp-controller="product">产品购买 <span style="color: red;">活动</span></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 5a24a88..e25ee7b 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-产品购买</title>
+    <title>聚IP JUIP.COM-产品购买 <span style="color: red;">活动</span></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">产品购买</a> </li>
+            <li><a asp-action="index" asp-controller="product">产品购买 <span style="color: red;">活动</span></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 2193f94..91011be 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">产品购买</a></li>
+                        <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
                         <li><a href="/LineList/index">PPTP线路表</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 f058c51..c34160b 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -208,7 +208,34 @@
         border-left-color: transparent;
         border-bottom-color: transparent;
     }
+    .packageitem4{
+        position: relative;
+    }
+    .packageitem4::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;
+    }
 
+    .packageitem4::after {
+        content: "";
+        position: absolute;
+        top: 2.1875rem;
+        left: -0.5rem;
+        border: 0.25rem solid #f64e3d;
+        border-left-color: transparent;
+        border-bottom-color: transparent;
+    }
 </style>
 <!-- ad -->
 <div class="container-fluid ad">
@@ -217,15 +244,15 @@
 @*新布局*@
 <p class="text-center tit"><img src="~/img/titi_choose.png"></p>
 <div class="main-page">
-    <div class="left">
-        <div class="nav-back"></div>
-        <div class="nav">
+    <div class="left" style="width: 175px;">
+        <div class="nav-back" style="width: 175px;"></div>
+        <div class="nav" style="width:175px;">
             @foreach (var item in Model)
             {
-                @if(item.Product.Id == 5 || item.Product.Id == 14|| item.Product.Id == 1|| item.Product.Id == 2){
-                    <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;">活动</span></div>
+                @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;">送1月</span></div>
                 } 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 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>
                 }
             }
 
@@ -271,6 +298,12 @@
                     @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>
+                    }
+                    @if(item.Product.Id == 4){
+                        <p class="youhuiNew">全部套餐8折聚惠，天卡除外，新开和续费都有8折，活动截止时间11月20日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+                    }
                     @if(item.Product.Id == 14){
                         <p class="youhuiNew">月卡赠送7天，双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年12月1日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     }
@@ -280,20 +313,26 @@
                     @if(item.Product.Id == 2){
                         <p class="youhuiNew">月卡赠送7天，季卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     }
+                    @if(item.Product.Id == 6){
+                        <p class="youhuiNew">双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+                    }
+                    @if(item.Product.Id == 8||item.Product.Id == 7||item.Product.Id == 9||item.Product.Id == 3||item.Product.Id == 10||item.Product.Id == 16||item.Product.Id == 15){
+                        <p class="youhuiNew">双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+                    }
                     
                     @*<p class="text-center nameSmall">—<span>@item.Product.Name</span>—</p>*@
                     <div class="card" style="margin-top:30px;">
-                        @foreach (var package in item.Packages.Where(m => m.IsTest == 0 && m.Status == 1))
+                        @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 == 47||package.Id == 49){
+                            @if(package.Id == 86||package.Id == 88||package.Id == 47||package.Id == 49||package.Id == 25||(package.Id>103)){
                                 
                                 <div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
-                                    <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                                        <p class="tianka" style="font-size:17px;">@package.Name</p>
                                         <p class="qixian">@package.Profile</p>
                                     </div>
                                     <img src="~/img/check.png" class="cardCheck">
@@ -302,10 +341,23 @@
                                 <div class="item packageitem packageitem19" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
-                                    <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                                        <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 == 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>
+                                    <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">
@@ -315,10 +367,10 @@
                                 <div class="item packageitem packageitem71" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
-                                    <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                                        <p class="tianka" style="font-size:17px;">@package.Name</p>
                                         <p class="qixian">@package.Profile</p>
                                     </div>
                                     <img src="~/img/check.png" class="cardCheck">
@@ -329,10 +381,10 @@
                                 <div class="item packageitem" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                                     <p><span class="price">@package.Price</span>元</p>
-                                    <p class="yuanjia">原价：<span>@package.LinePrice</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">
-                                        <p class="tianka">@package.Name</p>
+                                        <p class="tianka" style="font-size:17px;">@package.Name</p>
                                         <p class="qixian">@package.Profile</p>
                                     </div>
                                     <img src="~/img/check.png" class="cardCheck">
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 8cd5ebc..e3ec08b 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -95,10 +95,10 @@
         border-bottom-color: transparent;
     }
 
-     .packageitem19{
+     .packageitem3{
         position: relative;
     }
-    .packageitem19::before {
+    .packageitem3::before {
         position: absolute;
         top: 0.3rem;
         left: -0.5rem;
@@ -114,7 +114,36 @@
         box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
     }
 
-    .packageitem19::after {
+    .packageitem3::after {
+        content: "";
+        position: absolute;
+        top: 2.1875rem;
+        left: -0.5rem;
+        border: 0.25rem solid #f64e3d;
+        border-left-color: transparent;
+        border-bottom-color: transparent;
+    }
+
+     .packageitem4{
+        position: relative;
+    }
+    .packageitem4::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;
+    }
+
+    .packageitem4::after {
         content: "";
         position: absolute;
         top: 2.1875rem;
@@ -150,21 +179,43 @@
             </div>
         </div>
     </div> 
-     @if(defaultProduct.Id == 5){
-        <p class="youhuiNew">新开账号或续费，1个月赠送10天，2个月赠送1个月，（每个账号限参加一次，活动截止时间2020年11月25日）</p>
+    @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>
+    }
+    @if(defaultProduct.Id == 1){
+        <p class="youhuiNew">月卡赠送7天，季卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+    }
+    @if(defaultProduct.Id == 2){
+        <p class="youhuiNew">月卡赠送7天，季卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+    }
+    @if(defaultProduct.Id == 6){
+        <p class="youhuiNew">双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月15日<br>（同一个IP账号不限次数，您可对同一账号多次续费都有赠送，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+    }
+    @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){
+        <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))
         {
-            @if(package.Id == 86||package.Id == 47||package.Id == 49){
+            @if(package.Id == 86||package.Id == 47||package.Id == 49||package.Id == 104||(package.Id>103)){
                                 
                     <div class="item packageitem packageitem86" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>
-                        <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                            <p class="tianka" style="font-size:17px;">@package.Name</p>
                             <p class="qixian">@package.Profile</p>
                         </div>
                         <img src="~/img/check.png" class="cardCheck">
@@ -173,23 +224,36 @@
                     <div class="item packageitem packageitem19" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>
-                        <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                            <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 == 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 packageitem19" 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 == 3 || package.Id == 6) {
-                    <div class="item packageitem packageitem3" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
+                    <div class="item packageitem packageitem4" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>
-                        <p class="yuanjia">原价：<span>@package.LinePrice</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">@package.Name</p>
+                            <p class="tianka" style="font-size:17px;">@package.Name</p>
                             <p class="qixian">@package.Profile</p>
                         </div>
                         <img src="~/img/check.png" class="cardCheck">
@@ -200,23 +264,22 @@
                     <div class="item packageitem" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
 
                         <p><span class="price">@package.Price</span>元</p>
-                        <p class="yuanjia">原价：<span>@package.LinePrice</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">
-                            <p class="tianka">@package.Name</p>
+                            <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>
                 }
-            }
         @* <div class="item packageitem" id="@("pkg"+package.Id)" a-pkg-id="@package.Id">
            
             <p><span class="price">@package.Price</span>元</p>
-            <p class="yuanjia">原价：<span>@package.LinePrice</span>元</p>
+            <p class="yuanjia" style="color: #FF9900;">原价：<span>@package.LinePrice</span>元</p>
             <p>@(package.DayPrice)元/天</p>
             <div class="pkgNameCard">
-                <p class="tianka">@package.Name</p>
+                <p class="tianka" style="font-size:17px;">@package.Name</p>
                 <p class="qixian">@package.Profile</p>
             </div>           
             <img src="~/img/check.png" class="cardCheck">
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index ad52657..7b9bb47 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">产品购买</a></li>
+                    <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
                     <li><a href="/LineList/index">PPTP线路表</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 f6c50e1..60a6cdc 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -26,8 +26,135 @@
 
     <script src="~/js/vue.js" type="text/javascript" charset="utf-8"></script>
     <script src="~/js/jquery.qrcode.min.js" type="text/javascript" charset="utf-8"></script>
+
+    
+    <script>
+        $(function () {
+          // 侧边栏
+            //$(".on_q").click(function () {
+            //    $(".side_q").toggle();
+            //});
+
+            $(".item_on_q").mouseover(function () {
+                $(".side_q").stop().show();
+            });
+            $(".item_on_q").mouseleave(function () {
+                $(".side_q").stop().hide();
+            });
+
+            //$(".on_wx").click(function () {
+            //    $(".side_kefu").toggle();
+            //});
+
+            $(".item_on_wx").mouseover(function () {
+                $(".side_kefu").stop().fadeIn();
+            });
+            $(".item_on_wx").mouseleave(function () {
+                $(".side_kefu").stop().fadeOut();
+            });
+
+            $(".on_gzh").mouseover(function () {
+                $(".side_gzh").stop().fadeIn();
+            });
+            $(".on_gzh").mouseleave(function () {
+                $(".side_gzh").stop().fadeOut();
+            });
+
+            $(".on_tel").mouseover(function () {
+                $(".side_tel").stop().fadeIn();
+            });
+            $(".on_tel").mouseleave(function () {
+                $(".side_tel").stop().fadeOut();
+            });
+
+        })
+
+    </script>
 </head>
 <body>
+    <div class="sideBar">
+
+        <div class="item item_on_q">
+
+            <img src="~/img/qq.png" class="on_q">  <div class="kefu_tit">QQ</div>
+
+            <div class="side_q">
+                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">实时响应 在线时间8:00-24:00</h4>
+                <div class="item">
+                    <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
+                        <div class="ileft">
+                            <img src="~/img/q.png">
+                        </div>
+                        <div class="iright">
+                            <span>人工客服:售前</span>
+                        </div>
+                    </a>
+                </div>
+                <div class="item">
+                    <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
+                        <div class="ileft">
+                            <img src="~/img/q.png">
+                        </div>
+                        <div class="iright">
+                            <span>人工客服:售后</span>
+                        </div>
+                    </a>
+                </div>
+            </div>
+        </div>
+        <div class="item item_on_wx">
+            <img src="~/img/weixin.png" class="on_wx"> <div class="kefu_tit">微信</div>
+            <div class="side_kefu">
+                <!-- Nav tabs -->
+                <ul class="nav nav-tabs" role="tablist" style="padding-top: 10px;padding-left:10px">
+                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前</a></li>
+                    <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li>
+                    @*<li role="presentation"><a href="#ss" aria-controls="ss" role="tab" data-toggle="tab" style="border-color:#ccc">珊珊</a></li>
+                    <li role="presentation"><a href="#tt" aria-controls="tt" role="tab" data-toggle="tab" style="border-color:#ccc">兔兔</a></li>*@
+                </ul>
+
+                <!-- Tab panes -->
+                <div class="tab-content" style="margin-top: 60px;">
+                    <div role="tabpanel" class="tab-pane active" id="xx">
+                        <img src="~/img/kf_sq.jpg">
+                        <p style="color:#f90">实时响应 在线时间 8:00-24:00</p>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="qq">
+                        <img src="~/img/kf_sh.jpg">
+                        <p style="color:#f90">实时响应 在线时间 8:00-24:00</p>
+                    </div>
+                    @*<div role="tabpanel" class="tab-pane" id="ss">
+                        <img src="~/img/w3.png">
+                        <p style="color:#f90">实时响应 在线时间 8:00-24:00</p>
+                    </div>
+                    <div role="tabpanel" class="tab-pane" id="tt">
+                        <img src="~/img/w4.png">
+                        <p style="color:#f90">实时响应 在线时间 8:00-24:00</p>
+                    </div>*@
+                </div>
+            </div>
+        </div>
+        <div class="item">
+            <img src="~/img/gzh.png" class="on_gzh"><div class="kefu_tit">公众号</div>
+            <div class="side_gzh">
+                <p><img src="~/img/ewm.png"></p>
+                <p style="color:#f90">实时响应 在线时间 8:00-24:00</p>
+                <p style="color:#f90">关注公众号可获取免费的到期提醒服务</p>
+            </div>
+
+        </div>
+        <div class="item">
+            <img src="~/img/tel.png" class="on_tel"><div class="kefu_tit">电话</div>
+            <div class="side_tel">
+                <p><b>400 800 9925</b></p>
+                <p>实时接通</p>
+                <p>电话值班时间 8:00-24:00</p>
+            </div>
+        </div>
+        <div class="item">
+            <a href="#top"><img src="~/img/top.png"></a>
+        </div>
+    </div>
     <div class="container-fluid nav nav_buy">
         <div class="row">
             <div class="col-lg-2 col-md-2 logo">
@@ -36,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">产品购买</a></li>
+                    <li><a href="/product/index">产品购买 <span style="color: red;">活动</span></a></li>
                     <li><a href="/LineList/index" ">PPTP线路表</a></li>
                     <li><a href="/product/soft">软件下载</a></li>
                     <li><a href="/article/index">资讯&帮助</a></li>
@@ -85,6 +212,7 @@
             @RenderBody()
         </div>
     </div> 
+    <script id="qd28521381485d6faa97edf5ad07d7e159f6cb902af0" src="https://wp.qiye.qq.com/qidian/2852138148/5d6faa97edf5ad07d7e159f6cb902af0" charset="utf-8" async defer></script>
 
     @RenderSection("Scripts", required: false)
 </body>