From e1467a13eb2c8c216ce053ee2ebb093d18e18522 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Wed, 27 Jan 2021 17:13:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=A7=E5=93=81=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml | 26 +++++++++++++++++++++++---
 Host/Views/Product/Index.cshtml        | 16 ++++++++++++++--
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index e693e07..e0db522 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -33,15 +33,35 @@
         <ul class="nav nav-tabs cpName" role="tablist">
             @foreach (var item in Model)
             {
-                @if(item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 6||item.Product.Id == 13||item.Product.Id == 17){
+                @if(item.Product.Id == 2||item.Product.Id == 13){
                     
                     <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>
                 } 
-                else if(item.Product.Id == 4 || item.Product.Id == 5 || item.Product.Id == 14 || item.Product.Id == 18) {
+                else if(item.Product.Id == 4 || 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: 20px;">@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;">@item.Product.Name<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">抄底价</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 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>
+                    </li>
+                }
+                else if(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;"><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>
+                    </li>
+                }
+                else if(item.Product.Id == 1||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<span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></a>
+                    </li>
+                }
+                else 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;"><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>
                     </li>
                 }
                 else{
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 9058589..67eacf7 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -434,12 +434,24 @@
         <div class="nav" style="width:175px;">
             @foreach (var item in Model)
             {
-                @if( item.Product.Id == 1||item.Product.Id == 2||item.Product.Id == 6||item.Product.Id == 13||item.Product.Id == 17){
+                @if( item.Product.Id == 2||item.Product.Id == 13){
                     <div class="productItem" style="" 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>
                 } 
-                else if(item.Product.Id == 4 || item.Product.Id == 5 || item.Product.Id == 14 || item.Product.Id == 18) {
+                else if(item.Product.Id == 4 || item.Product.Id == 5) {
                     <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;float:right;padding-right: 5px;">抄底价</span></div>
                 } 
+                else if(item.Product.Id == 18) {
+                    <div class="productItem" style="" 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>
+                }
+                else if(item.Product.Id == 17) {
+                    <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>
+                }
+                else if(item.Product.Id == 1||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 <span style="color: #f64e3d;font-weight:bold;float:right;padding-right: 5px;">送一月</span></div>
+                }
+                else if(item.Product.Id == 14) {
+                    <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>
+                }
                 else {
                     <div class="productItem" id="@("p"+item.Product.Id)" a-pid="@item.Product.Id">@item.Product.Name </div>
                 }