From 6fdd9204fbf38bdf7bdaeb39d25ccb2394398018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 13 Sep 2021 14:36:59 +0800
Subject: [PATCH] user

---
 Host/Controllers/UserController.cs  | 2 +-
 Host/Views.Mobile/Home/Index.cshtml | 6 ++++--
 Host/Views/Article/Index.cshtml     | 8 ++++++++
 Host/Views/Home/Index.cshtml        | 6 ++++--
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs
index 5c0f1e5..4f615a9 100644
--- a/Host/Controllers/UserController.cs
+++ b/Host/Controllers/UserController.cs
@@ -429,7 +429,7 @@ namespace Home.Controllers
         {
             var userId =  this.Request.GetUserInfo().UserId;
 
-            var orderQuery = m_OrderService.Query(m => m.UserId == userId);
+            var orderQuery = m_OrderService.Query(m => m.UserId == userId && m.DeleteTag == 0);
             orderQuery = orderQuery.Where(m => m.OrderState == OrderStatus.PayOk || m.OrderState == OrderStatus.Complete);
             if (request.OrderType > 0)
             {
diff --git a/Host/Views.Mobile/Home/Index.cshtml b/Host/Views.Mobile/Home/Index.cshtml
index b1c88c1..2bac8f9 100644
--- a/Host/Views.Mobile/Home/Index.cshtml
+++ b/Host/Views.Mobile/Home/Index.cshtml
@@ -290,6 +290,8 @@
         <div style="font-size: 15px;">
             <h3 style="margin-top: 0px;margin-bottom: 10px;display:inline;color:red;background-color:#FFFF00;">公告</h3><a style="cursor:pointer;display:inline;float:right;" onclick="know()">X</a>
             <h4 style="margin-top: 10px;">聚IP年中聚惠：</h4>
+        <p style="color:red;">官网已恢复正常！可正常续费购买！<br>
+6日14时至7日10时，因系统故障，导致官网无法正常访问，现已恢复，给您带来不便，敬请谅解！</p>
                 <p>1.动态IP一毛钱一天，每用户限一次。</p>
                 <p>2.新上蘑菇IP，天卡买一送一，周卡送3天，月卡送10天，多买多送</p>
                 <p>3.极客IP，西瓜IP，双月卡送一个月。</p>
@@ -347,9 +349,9 @@
         });
         
         $('.notice').hide();
-        self.setTimeout(function(){
+        @* self.setTimeout(function(){ *@
             $('.notice').show();
-        },3000)
+        @* },3000) *@
         function know() {
             $('.notice').hide();
         }
diff --git a/Host/Views/Article/Index.cshtml b/Host/Views/Article/Index.cshtml
index b164942..11dd326 100644
--- a/Host/Views/Article/Index.cshtml
+++ b/Host/Views/Article/Index.cshtml
@@ -44,6 +44,14 @@
                 <p><a asp-action="info" asp-controller="article" asp-route-id="6"><img src="~/img/pc.png"></a></p>
                 <p>Windows电脑教程</p>
             </div>
+            <div class="item">
+                <p><a asp-action="info" asp-controller="article" asp-route-id="21"><img src="~/img/pc.png"></a></p>
+                <p>MAC电脑教程</p>
+            </div>
+            <div class="item">
+                <p><a asp-action="info" asp-controller="article" asp-route-id="10"><img src="~/img/pc.png"></a></p>
+                <p>软路由教程</p>
+            </div>
         </div>
 
         <div class="mylist">
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index 98110ed..01e9d21 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -681,6 +681,8 @@
     <div style="font-size: 15px;">
         <h3 style="margin-top: 0px;margin-bottom: 10px;display:inline;color:red;background-color:#FFFF00;">公告</h3><a style="cursor:pointer;display:inline;float:right;" onclick="know()">X</a>
         <h4 style="margin-top: 10px;">聚IP年中聚惠：</h4>
+        <p style="color:red;">官网已恢复正常！可正常续费购买！<br>
+6日14时至7日10时，因系统故障，导致官网无法正常访问，现已恢复，给您带来不便，敬请谅解！</p>
         <p>1.动态IP一毛钱一天，每用户限一次。</p>
         <p>2.新上蘑菇IP，天卡买一送一，周卡送3天，月卡送10天，多买多送</p>
         <p>3.极客IP，西瓜IP，双月卡送一个月。</p>
@@ -714,9 +716,9 @@
     </script>
     <script>
         $('.notice').hide();
-        self.setTimeout(function(){
+        @* self.setTimeout(function(){ *@
             $('.notice').show();
-        },3000)
+        @* },3000) *@
         function know() {
             $('.notice').hide();
         }