From f4918a7273ccc922314eaa46f2f8853297cf9ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Tue, 12 Oct 2021 16:53:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=98=E6=89=A3=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/ProductController.cs  | 45 ++++++++++++++++++++++++++
 Host/Views.Mobile/Product/Index.cshtml | 14 ++++++--
 Host/Views/Product/Index.cshtml        | 18 +++++++----
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/Host/Controllers/ProductController.cs b/Host/Controllers/ProductController.cs
index af67fa6..414401e 100644
--- a/Host/Controllers/ProductController.cs
+++ b/Host/Controllers/ProductController.cs
@@ -108,6 +108,15 @@ namespace Home.Controllers
                                 m.Title = discount.Remark;
                             } else {
                                 m.Title = "9.5";
+                                if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){
+                                    m.Title = "8";
+                                }
+                                if (m.ProductId == 18){
+                                    m.Title = "7";
+                                }
+                                if (m.ProductId == 6||m.ProductId == 5){
+                                    m.Title = "9";
+                                }
                             }
                             if(m.Price<m.MinPrice){
                                 m.Price = m.MinPrice;
@@ -125,6 +134,15 @@ namespace Home.Controllers
                     {
                         product.Packages.ForEach(m => {
                             m.Title = "9.5";
+                            if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){
+                                m.Title = "8";
+                            }
+                            if (m.ProductId == 18){
+                                m.Title = "7";
+                            }
+                            if (m.ProductId == 6||m.ProductId == 5){
+                                m.Title = "9";
+                            }
 
                             var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id && p.ProductId == m.ProductId);
                             if (userPrice != null && userPrice.UserPrice > 0)
@@ -142,6 +160,15 @@ namespace Home.Controllers
                 {
                     product.Packages.ForEach(m => {
                         m.Title = "9.5";
+                        if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){
+                            m.Title = "8";
+                        }
+                        if (m.ProductId == 18){
+                            m.Title = "7";
+                        }
+                        if (m.ProductId == 6||m.ProductId == 5){
+                            m.Title = "9";
+                        }
                         if (m.DayCount == 1||m.DayCount == 2 ){
                             m.Price = 0.1M;
                         }
@@ -825,6 +852,15 @@ namespace Home.Controllers
                                 m.Title = discount.Remark;
                             } else {
                                 m.Title = "9.5";
+                                if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){
+                                m.Title = "8";
+                                }
+                                if (m.ProductId == 18){
+                                    m.Title = "7";
+                                }
+                                if (m.ProductId == 6||m.ProductId == 5){
+                                    m.Title = "9";
+                                }
                             }
                             if(m.Price<m.MinPrice){
                                 m.Price = m.MinPrice;
@@ -838,6 +874,15 @@ namespace Home.Controllers
                     respList.Packages.ForEach(m =>
                     {
                         m.Title = "9.5";
+                        if (m.ProductId == 1||m.ProductId == 2||m.ProductId == 13||m.ProductId == 17||m.ProductId == 14||m.ProductId == 19){
+                            m.Title = "8";
+                        }
+                        if (m.ProductId == 18){
+                            m.Title = "7";
+                        }
+                        if (m.ProductId == 6||m.ProductId == 5){
+                            m.Title = "9";
+                        }
                         var userPrice = userPrices.FirstOrDefault(p => p.PackageId == m.Id);
                         if (userPrice != null && userPrice.UserPrice > 0)
                         {
diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index d236792..7fc9b7f 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -51,14 +51,24 @@
             {
                 if(item.Product.Id == 6) {
                     <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</a>
+                        <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>
                     </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;">活动</span></a>
+                        <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折</span></a>
                     </li>
                 }
+                else if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 13||item.Product.Id == 14||item.Product.Id == 17||item.Product.Id == 19) {
+                    <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 == 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{
                     
                     <li role="presentation" class="@(item.Product.Id==defaultProduct.Id?"active":"")">
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 0c3c332..550755d 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -174,7 +174,7 @@
         height: 0px;
         border: 1.0rem solid #FF9933;
         border-right-color: transparent;
-        content: "送 1 天";
+        content: "7折+送 1 天";
         box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
     }
 
@@ -202,7 +202,7 @@
         height: 0px;
         border: 1.0rem solid #FF9933;
         border-right-color: transparent;
-        content: "送 3 天";
+        content: "7折+送 3 天";
         box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
     }
 
@@ -231,7 +231,7 @@
         height: 0px;
         border: 1.0rem solid #FF9933;
         border-right-color: transparent;
-        content: "送 10 天";
+        content: "7折+送 10 天";
         box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
     }
 
@@ -260,7 +260,7 @@
         height: 0px;
         border: 1.0rem solid #FF9933;
         border-right-color: transparent;
-        content: "送 1 月";
+        content: "7折+送 1 月";
         box-shadow: 0px 0.3125rem 0.3125rem -0.3125rem #000;
     }
 
@@ -334,10 +334,16 @@
             @foreach (var item in Model)
             {
                 if(item.Product.Id == 18) {
-                    <div class="productItem" style="" 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;">活动</span></div>
+                    <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折</span></div>
                 }
                 else if(item.Product.Id == 6) {
-                    <div class="productItem" style="" 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</div>
+                    <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||item.Product.Id == 13||item.Product.Id == 14||item.Product.Id == 17||item.Product.Id == 19) {
+                    <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;">8折</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 {
                     <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name </div>