From 39f99c408c59c52e94e11a106c132c965b80c5fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 29 Jan 2021 16:23:45 +0800
Subject: [PATCH] app

---
 Host/Views.Mobile/Product/Soft.cshtml |  6 +++++-
 Host/Views/Product/Index.cshtml       |  2 +-
 Host/Views/Product/Soft.cshtml        | 11 +++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Host/Views.Mobile/Product/Soft.cshtml b/Host/Views.Mobile/Product/Soft.cshtml
index 082eef3..40012b4 100644
--- a/Host/Views.Mobile/Product/Soft.cshtml
+++ b/Host/Views.Mobile/Product/Soft.cshtml
@@ -25,12 +25,16 @@
 
 
 <div class="softList">
-    @foreach (var item in Model.Where(m=>m.Sort != 1000))
+    @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.OnLine==1).OrderBy(m => m.Sort))
     {
     <div class="item">
         @*<p><img src="@P(item.Image)"></p>*@
         <p>@item.Name</p>        
         <p><a href="@item.SimulatorDownloadUrl"> <button type="button" class="btnBlue">SSTP客户端下载</button></a></p>
+        @if (!string.IsNullOrEmpty(item.DroidDownloadUrl)){      
+            <p><a href="@item.DroidDownloadUrl"> <button type="button" class="btnBlue">安卓客户端</button></a></p>
+            <br>
+        }
     </div>
     }
 </div>
\ No newline at end of file
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 67eacf7..dc749f6 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -497,7 +497,7 @@
                         <p class="youhuiNew">月卡赠送10天，双月卡赠送1个月，新开和续费都有赠送，活动截止时间2020年11月25日。<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     } *@
                     @if(item.Product.Id == 13){
-                        <p class="youhuiNew">双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年1月31日<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
+                        <p class="youhuiNew">双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年2月28日<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
                     }
                     @if(item.Product.Id == 17){
                         <p class="youhuiNew">双月卡赠送1个月，仅限新开账号，续费帐号不赠送，活动截止时间2020年2月28日<br>（同一个IP账号仅限一次，每位会员不限账号数量，您可购买多个IP账号都有赠送）</p>
diff --git a/Host/Views/Product/Soft.cshtml b/Host/Views/Product/Soft.cshtml
index 2e5bc55..1e888b4 100644
--- a/Host/Views/Product/Soft.cshtml
+++ b/Host/Views/Product/Soft.cshtml
@@ -25,17 +25,24 @@
 
 <div class="container">
     <div class="soft">
-        @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12).OrderBy(m => m.Sort))
+        @foreach (var item in Model.Where(m=>m.Sort!=1000 && m.Id!=12 && m.OnLine==1).OrderBy(m => m.Sort))
         {
             <div class="sitem">
                 <div class="smodel">
-                    <div class="softName" style="width:200px;text-align:center;">
+                    <div class="softName" style="width:200px;text-align:center;height:50px;">
                         @item.Name
                     </div>
                     
                     <div class="item">
                         <a href="@item.PcClientDownloadUrl"> <button type="button" class="btn btn-sdefault">Windows</button></a>
                     </div>
+                    @if (!string.IsNullOrEmpty(item.DroidDownloadUrl))
+                    {
+                        <div class="item" >
+                            <a href="@item.DroidDownloadUrl"> <button type="button" class="btn btn-sdefault">安卓客户端</button></a>
+                        </div>
+                        <hr>
+                    }
                     @if (item.Id != 3 && item.Id != 7 && item.Id != 9 && item.Id != 12)
                     {
                         <div class="item">