From c4cfb8888eaddb2d197c28402beffd2f5b2db08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Mon, 12 Aug 2024 14:43:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=BA=E5=AD=90=E8=BF=85=E8=BF=9E=E5=81=9C?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Product/Index.cshtml        | 59 +++++++++++++-
 Host/Views.Mobile/Product/ReBuyIndex.cshtml   | 61 ++++++++++++++-
 Host/Views.Mobile/User/MyAccounts.cshtml      |  2 +-
 Host/Views/Product/Index.cshtml               | 76 ++++++++++++++++++-
 Host/Views/Product/ReBuyIndex.cshtml          | 62 ++++++++++++++-
 Host/Views/User/MyAccounts.cshtml             |  4 +-
 .../Service/ProductOrderService.cs            | 11 +++
 7 files changed, 265 insertions(+), 10 deletions(-)

diff --git a/Host/Views.Mobile/Product/Index.cshtml b/Host/Views.Mobile/Product/Index.cshtml
index 6683445..f7d55a3 100644
--- a/Host/Views.Mobile/Product/Index.cshtml
+++ b/Host/Views.Mobile/Product/Index.cshtml
@@ -745,6 +745,42 @@
     </div><!-- /.modal -->
 </div>
 
+<div class="modal fade" id="product_recommend_2" tabindex="-1" role="dialog" aria-labelledby="myModalLabelproduct" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" id="myModalLabelproduct">
+                    产品推荐
+                </h4>
+            </div>
+            <div class="modal-body">
+                <p style="font-weight:bold;color: red;">强子IP即将停运，IP资源池将加进极狐IP。</p>
+                <p style="font-weight:bold;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！</p>
+
+                <p style="font-weight:bold;">现推广期天卡1毛体验，周送1天，月送1周，双月送1月！</p>
+
+                <p style="font-weight:bold;">承诺不好用48小时内免费退款！</p>
+                <div class="text-right">
+                    <label>
+                      <input id="recommendchechk_2" type="checkbox"> 7天内不再提示
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a href="/product/index" type="button" class="btn btn-primary" >
+                    查看
+                </a>
+                <button type="button" class="btn btn-warning" onclick="buyrecommendfunc_2()" data-dismiss="modal">
+                    忽略
+                </button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
+
 
 <script src="~/js/vue.js"></script>
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.18/css/bootstrap-select.min.css">
@@ -1103,8 +1139,14 @@
             localStorage.setItem('buyrecommend', new Date().getTime());
         }
     }
+    function buyrecommendfunc_2() {
+        var isChecked = $('#recommendchechk_2').is(':checked');
+        if (isChecked) {
+            localStorage.setItem('buyrecommend_2', new Date().getTime());
+        }
+    }
     function onrecommend(id) {
-        if (id != 29 && id != 28 && id != 25 && id != 22 && id != 21 && id != 20 && id != 18 ) {
+        if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
             var lastClosedTime = localStorage.getItem('buyrecommend');
             if (!lastClosedTime) {
                 // 如果之前没有关闭时间记录，则显示提示框
@@ -1119,6 +1161,21 @@
                 }
             }
         }
+        if (id == 1) {
+            var lastClosedTime = localStorage.getItem('buyrecommend_2');
+            if (!lastClosedTime) {
+                // 如果之前没有关闭时间记录，则显示提示框
+                $('#product_recommend_2').modal('show')
+            } else {
+                // 如果有关闭时间记录，则检查是否超过7天
+                var sevenDaysInMillis = 7 * 24 * 60 * 60 * 1000; // 7天的毫秒数
+                var currentTime = new Date().getTime();
+                if (currentTime - lastClosedTime > sevenDaysInMillis) {
+                    // 超过7天，显示提示框
+                    $('#product_recommend_2').modal('show')
+                }
+            }
+        }
     }
     $(function(){
         setTimeout(function(){
diff --git a/Host/Views.Mobile/Product/ReBuyIndex.cshtml b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
index 53c7a75..e72752d 100644
--- a/Host/Views.Mobile/Product/ReBuyIndex.cshtml
+++ b/Host/Views.Mobile/Product/ReBuyIndex.cshtml
@@ -157,6 +157,42 @@
     </div><!-- /.modal -->
 </div>
 
+<div class="modal fade" id="product_recommend_2" tabindex="-1" role="dialog" aria-labelledby="myModalLabelproduct" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" id="myModalLabelproduct">
+                    产品推荐
+                </h4>
+            </div>
+            <div class="modal-body">
+                <p style="font-weight:bold;color: red;">强子IP即将停运，IP资源池将加进极狐IP。</p>
+                <p style="font-weight:bold;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！</p>
+
+                <p style="font-weight:bold;">现推广期天卡1毛体验，周送1天，月送1周，双月送1月！</p>
+
+                <p style="font-weight:bold;">承诺不好用48小时内免费退款！</p>
+                <div class="text-right">
+                    <label>
+                      <input id="recommendchechk_2" type="checkbox"> 7天内不再提示
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a href="/product/index" type="button" class="btn btn-primary" >
+                    查看
+                </a>
+                <button type="button" class="btn btn-warning" onclick="buyrecommendfunc_2()" data-dismiss="modal">
+                    忽略
+                </button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
+
 <script type="text/javascript">
 
     function buyrecommendfunc() {
@@ -165,9 +201,15 @@
             localStorage.setItem('rebuyrecommend', new Date().getTime());
         }
     }
+    function buyrecommendfunc_2() {
+        var isChecked = $('#recommendchechk_2').is(':checked');
+        if (isChecked) {
+            localStorage.setItem('buyrecommend_2', new Date().getTime());
+        }
+    }
     var id = getUrlParam('productId')
-    if (id != 29 && id != 28 && id != 25 && id != 22 && id != 21 && id != 20 && id != 18 ) {
-        var lastClosedTime = localStorage.getItem('rebuyrecommend');
+    if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+        var lastClosedTime = localStorage.getItem('buyrecommend');
         if (!lastClosedTime) {
             // 如果之前没有关闭时间记录，则显示提示框
             $('#product_recommend').modal('show')
@@ -181,6 +223,21 @@
             }
         }
     }
+    if (id == 1) {
+        var lastClosedTime = localStorage.getItem('buyrecommend_2');
+        if (!lastClosedTime) {
+            // 如果之前没有关闭时间记录，则显示提示框
+            $('#product_recommend_2').modal('show')
+        } else {
+            // 如果有关闭时间记录，则检查是否超过7天
+            var sevenDaysInMillis = 7 * 24 * 60 * 60 * 1000; // 7天的毫秒数
+            var currentTime = new Date().getTime();
+            if (currentTime - lastClosedTime > sevenDaysInMillis) {
+                // 超过7天，显示提示框
+                $('#product_recommend_2').modal('show')
+            }
+        }
+    }
 
     //获取url中的参数
     function getUrlParam(name) {
diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml
index 718833b..3df00d5 100644
--- a/Host/Views.Mobile/User/MyAccounts.cshtml
+++ b/Host/Views.Mobile/User/MyAccounts.cshtml
@@ -138,7 +138,7 @@
                 </tr>
             } else {
                 <tr>
-                    <td><input type="checkbox" class="selectAccount" value="@item.Account" a-status="@(item.Status)" a-pid="@(item.ProductId)" a-connectCount="@item.ConnectCount" a-aType="@item.AccountType" style="width: 0.4rem;height: 0.4rem;" /></td>
+                    <td><input type="checkbox" class="selectAccount" value="@item.Account"  a-package="@(item.PackageName)" a-status="@(item.Status)" a-pid="@(item.ProductId)" a-connectCount="@item.ConnectCount" a-aType="@item.AccountType" style="width: 0.4rem;height: 0.4rem;" /></td>
                     <td>@item.ProductName/@item.PackageName</td>
                     <td> <a style="cursor:pointer;" v-on:click="copyText('@item.Account')">复制</a><br>@item.Pwd <a style="cursor:pointer;" v-on:click="copyText('@item.Pwd')">复制</a></td>
                     <td>
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index 590da82..d8ff1a0 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -498,6 +498,23 @@
                     @if(item.Product.Id == 17 || item.Product.Id == 13){
                         <p class="youhuiNew" style="color: #0066CC;margin:0;padding:0;">本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月</p>
                     } 
+
+                    @if(item.Product.Id == 1){
+                        <p class="youhuiNew" style="color: red;margin:0;padding:0;">强子IP即将停运，IP资源池将加进极狐IP。</p>
+                        <p class="youhuiNew" style="color: #0066CC;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！
+                        <br>现推广期天卡1毛体验，周送1天，月送1周，双月送1月！
+                        承诺不好用48小时内免费退款！</p>
+                    } 
+                    @if(item.Product.Id == 2){
+                        <p class="youhuiNew" style="color: red;margin:0;padding:0;">迅连IP即将停运，IP资源池将加进极狐IP。</p>
+                        <p class="youhuiNew" style="color: #0066CC;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！
+                        <br>现推广期天卡1毛体验，周送1天，月送1周，双月送1月！
+                        承诺不好用48小时内免费退款！</p>
+                    } 
+
+                    @if(item.Product.Id == 25){
+                        <p class="youhuiNew" style="color: red;margin:0;padding:0;">强子静态IP即将停运，已开通账号不受影响可继续使用。需要购买静态请开通水滴或火狐。</p>
+                    } 
                     
                         
                     @if(item.Product.Id == 20){
@@ -1121,6 +1138,42 @@
     </div><!-- /.modal -->
 </div>
 
+<div class="modal fade" id="product_recommend_2" tabindex="-1" role="dialog" aria-labelledby="myModalLabelproduct" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" id="myModalLabelproduct">
+                    产品推荐
+                </h4>
+            </div>
+            <div class="modal-body">
+                <p style="font-weight:bold;color: red;">强子IP即将停运，IP资源池将加进极狐IP。</p>
+                <p style="font-weight:bold;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！</p>
+
+                <p style="font-weight:bold;">现推广期天卡1毛体验，周送1天，月送1周，双月送1月！</p>
+
+                <p style="font-weight:bold;">承诺不好用48小时内免费退款！</p>
+                <div class="text-right">
+                    <label>
+                      <input id="recommendchechk_2" type="checkbox"> 7天内不再提示
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a href="/product/index" type="button" class="btn btn-primary" >
+                    查看
+                </a>
+                <button type="button" class="btn btn-warning" onclick="buyrecommendfunc_2()" data-dismiss="modal">
+                    忽略
+                </button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
+
 
 @section Scripts{
     
@@ -1492,9 +1545,15 @@
                 localStorage.setItem('buyrecommend', new Date().getTime());
             }
         }
+        function buyrecommendfunc_2() {
+            var isChecked = $('#recommendchechk_2').is(':checked');
+            if (isChecked) {
+                localStorage.setItem('buyrecommend_2', new Date().getTime());
+            }
+        }
         function select(id) {
 
-            if (id != 29 && id != 28 && id != 25 && id != 22 && id != 21 && id != 20 && id != 18 ) {
+            if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
                 var lastClosedTime = localStorage.getItem('buyrecommend');
                 if (!lastClosedTime) {
                     // 如果之前没有关闭时间记录，则显示提示框
@@ -1509,6 +1568,21 @@
                     }
                 }
             }
+            if (id == 1) {
+                var lastClosedTime = localStorage.getItem('buyrecommend_2');
+                if (!lastClosedTime) {
+                    // 如果之前没有关闭时间记录，则显示提示框
+                    $('#product_recommend_2').modal('show')
+                } else {
+                    // 如果有关闭时间记录，则检查是否超过7天
+                    var sevenDaysInMillis = 7 * 24 * 60 * 60 * 1000; // 7天的毫秒数
+                    var currentTime = new Date().getTime();
+                    if (currentTime - lastClosedTime > sevenDaysInMillis) {
+                        // 超过7天，显示提示框
+                        $('#product_recommend_2').modal('show')
+                    }
+                }
+            }
             var el = "#p" + id;
             var packageBox = "#box" + id;
             $(".packagebox").hide();
diff --git a/Host/Views/Product/ReBuyIndex.cshtml b/Host/Views/Product/ReBuyIndex.cshtml
index 625fb7d..2a05b59 100644
--- a/Host/Views/Product/ReBuyIndex.cshtml
+++ b/Host/Views/Product/ReBuyIndex.cshtml
@@ -519,6 +519,42 @@
     </div><!-- /.modal -->
 </div>
 
+<div class="modal fade" id="product_recommend_2" tabindex="-1" role="dialog" aria-labelledby="myModalLabelproduct" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    &times;
+                </button>
+                <h4 class="modal-title" id="myModalLabelproduct">
+                    产品推荐
+                </h4>
+            </div>
+            <div class="modal-body">
+                <p style="font-weight:bold;color: red;">强子IP即将停运，IP资源池将加进极狐IP。</p>
+                <p style="font-weight:bold;">极狐IP（聚IP最好的动态产品），260城市纯净IP（三网混合IP），稳定极速！视频直播无压力！且有不同带宽可选！</p>
+
+                <p style="font-weight:bold;">现推广期天卡1毛体验，周送1天，月送1周，双月送1月！</p>
+
+                <p style="font-weight:bold;">承诺不好用48小时内免费退款！</p>
+                <div class="text-right">
+                    <label>
+                      <input id="recommendchechk_2" type="checkbox"> 7天内不再提示
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <a href="/product/index" type="button" class="btn btn-primary" >
+                    查看
+                </a>
+                <button type="button" class="btn btn-warning" onclick="buyrecommendfunc_2()" data-dismiss="modal">
+                    忽略
+                </button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal -->
+</div>
+
 
 @if(!string.IsNullOrWhiteSpace(ViewBag.errorTip))
 {
@@ -537,9 +573,15 @@
                 localStorage.setItem('rebuyrecommend', new Date().getTime());
             }
         }
+        function buyrecommendfunc_2() {
+            var isChecked = $('#recommendchechk_2').is(':checked');
+            if (isChecked) {
+                localStorage.setItem('buyrecommend_2', new Date().getTime());
+            }
+        }
         var id = getUrlParam('productId')
-        if (id != 29 && id != 28 && id != 25 && id != 22 && id != 21 && id != 20 && id != 18 ) {
-            var lastClosedTime = localStorage.getItem('rebuyrecommend');
+        if (id != 29 && id != 28 && id != 22 && id != 21 && id != 20 && id != 18 && id != 1 ) {
+            var lastClosedTime = localStorage.getItem('buyrecommend');
             if (!lastClosedTime) {
                 // 如果之前没有关闭时间记录，则显示提示框
                 $('#product_recommend').modal('show')
@@ -553,7 +595,21 @@
                 }
             }
         }
-
+        if (id == 1) {
+            var lastClosedTime = localStorage.getItem('buyrecommend_2');
+            if (!lastClosedTime) {
+                // 如果之前没有关闭时间记录，则显示提示框
+                $('#product_recommend_2').modal('show')
+            } else {
+                // 如果有关闭时间记录，则检查是否超过7天
+                var sevenDaysInMillis = 7 * 24 * 60 * 60 * 1000; // 7天的毫秒数
+                var currentTime = new Date().getTime();
+                if (currentTime - lastClosedTime > sevenDaysInMillis) {
+                    // 超过7天，显示提示框
+                    $('#product_recommend_2').modal('show')
+                }
+            }
+        }
         //获取url中的参数
         function getUrlParam(name) {
           var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index a8e2b27..04f494c 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -406,7 +406,7 @@
                 </tr>
             } else {
                 <tr>
-                    <td><input type="checkbox" class="selectAccount" value="@item.Account" a-status="@(item.Status)" a-pid="@(item.ProductId)" a-connectCount="@item.ConnectCount" a-aType="@item.AccountType" /></td>
+                    <td><input type="checkbox" class="selectAccount" value="@item.Account"  a-package="@(item.PackageName)" a-status="@(item.Status)" a-pid="@(item.ProductId)" a-connectCount="@item.ConnectCount" a-aType="@item.AccountType" /></td>
                     <td>@item.CreateTime.ToString("yyyy.MM.dd")</td>
                     <td>@item.ProductName</td>
                     <td>@item.PackageName</td>
@@ -1304,7 +1304,7 @@
             var flag = 0;
             $.each($('input:checkbox:checked'), function () {
                 var ppip = $(this).attr('a-pid');
-                    if (ppip == '28') {
+                if (ppip == '28') {
                     var type = $(this).attr('a-package').split('-')[0];
                     if (product_type_shuidi != '') {
                         if (product_type_shuidi != type) {
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 7163958..14891c6 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -252,6 +252,11 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
             {
                 return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "本产品已升级更新为极狐，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月");
             }
+
+            if (packageEntity.ProductId == 1 || packageEntity.ProductId == 25)
+            {
+                return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "强子IP即将停运，IP资源池将加进极狐IP。极狐IP，地区超全，涵盖全国260个城市，IP高纯净度，超速且稳定，且每个城市都是三网混合，更真实有效 现活动推广期，周卡送1天，月卡送1周，双月送1个月");
+            }
             // if (productEntity.Status == 0)
             // {
             //     return new ApiResult<ProductOrderEntity>(ResultCode.C_INVALID_ERROR, "产品不存在或者下架");
@@ -1308,6 +1313,12 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                 return new ApiResult(ResultCode.C_Illegal_Operation, "此类帐号不允许退款");
             }
 
+
+            if (accountInfo.ProductId == 1 || accountInfo.ProductId == 2 || accountInfo.ProductId == 25)
+            {
+                return new ApiResult(ResultCode.C_Illegal_Operation, "该类型账号不允许退款！");
+            }
+
             if (accountInfo == null)
             {
                 return new ApiResult(ResultCode.C_Illegal_Operation, "账户不存在");