From 11dda1118a369ddbc449cde62faab92728c106f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Fri, 2 Aug 2024 14:44:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B0=B4=E6=BB=B4=E4=B8=8D?=
 =?UTF-8?q?=E5=90=8C=E5=A5=97=E9=A4=90=E5=8F=AF=E4=BB=A5=E7=BB=AD=E8=B4=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/User/MyAccounts.cshtml | 16 +++++++++++++++-
 Host/Views/Product/Soft.cshtml           |  4 ++--
 Host/Views/User/MyAccounts.cshtml        | 16 +++++++++++++++-
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml
index 3e5a5d5..08877de 100644
--- a/Host/Views.Mobile/User/MyAccounts.cshtml
+++ b/Host/Views.Mobile/User/MyAccounts.cshtml
@@ -108,7 +108,7 @@
             {
             @if (@item.RestTime == "已过期") {
                 <tr style="color:red">
-                    <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>@item.Account <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>
@@ -876,7 +876,17 @@
             var accountModels = [];
             var isTest = false
             var isrefund = false;
+            var product_type_shuidi = '';//0:静态 1：固态
+            var flag = 0;
             $.each($('input:checkbox:checked'), function () {
+                var type = $(this).attr('a-package').split('-')[0];
+                if (product_type_shuidi != '') {
+                    if (product_type_shuidi != type) {
+                        flag = 1;
+                    }
+                } else {
+                    product_type_shuidi = type;
+                }
                 var account = $(this).val();
                 if (account) {
                     var accountItem = {
@@ -896,6 +906,10 @@
                 }
 
             });
+            if (flag)  {
+                alert('静态、固态不同类型无法续费！');
+                return;
+            }
             if (accountModels.length == 0) { alert('请选择账号'); return; }
             if (!isSame(accountModels, 'pid')) { alert('必须选择相同的产品'); return; }
             if (!isSame(accountModels, 'connectCount')) { alert('必须选择相同的连接数'); return; }
diff --git a/Host/Views/Product/Soft.cshtml b/Host/Views/Product/Soft.cshtml
index f62a2b3..8263aba 100644
--- a/Host/Views/Product/Soft.cshtml
+++ b/Host/Views/Product/Soft.cshtml
@@ -103,7 +103,7 @@
                         <a href="https://mp4.juip.com/sstp%20vpn.apk"> <button type="button" class="btn btn-primary" style="width: 100%;padding-left: 0;padding-right: 0;">通用老版sstp安卓客户端</button></a>
                     </div><br><br>
                     <div class="item" style="width: 100%;">
-                        <a href="https://mp4.juip.com/juipsstp.apk"> <button type="button" class="btn btn-primary" style="width: 100%;padding-left: 0;padding-right: 0;">通用新版sstp安卓客户端</button></a>
+                        <a href="https://mp4.juip.com/osstp.apk"> <button type="button" class="btn btn-primary" style="width: 100%;padding-left: 0;padding-right: 0;">通用新版sstp安卓客户端</button></a>
                     </div>
                     
                 </div>
@@ -118,7 +118,7 @@
                         <a href="https://mp4.juip.com/jihu.exe"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-电脑端</button></a>
                     </div>
                     <div class="item" style="margin-bottom: 5px;width:200px;">
-                        <a href="https://mp4.juip.com/jhip-0708.apk"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-安卓版</button></a>
+                        <a href="https://mp4.juip.com/jhip0723.apk"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">极狐IP-安卓版</button></a>
                     </div>
                     <div class="item" style="margin-bottom: 5px;width:200px;">
                         <a href="https://mp4.juip.com/%E8%98%91%E8%8F%87IP-2-17.zip"> <button type="button" class="btn btn-primary" style="width: 99%;margin-right:5px">蘑菇IP-电脑端</button></a>
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index 21dbcd9..b8503ac 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -385,7 +385,7 @@
         {
             @if(item.Status==AccountStatus.Refund || item.RestTime=="已过期") {
                 <tr style="color:red;">
-                    <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>
@@ -1300,7 +1300,17 @@
             var accountModels = [];
             var isTest = false
             var isrefund = false;
+            var product_type_shuidi = '';//0:静态 1：固态
+            var flag = 0;
             $.each($('input:checkbox:checked'), function () {
+                var type = $(this).attr('a-package').split('-')[0];
+                if (product_type_shuidi != '') {
+                    if (product_type_shuidi != type) {
+                        flag = 1;
+                    }
+                } else {
+                    product_type_shuidi = type;
+                }
                 var account = $(this).val();
                 if (account) {
                     var accountItem = {
@@ -1319,6 +1329,10 @@
                     }
                 }
             });
+            if (flag)  {
+                alert('静态、固态不同类型无法续费！');
+                return;
+            }
             if (accountModels.length == 0) { alert('请选择账号'); return; }
             if (!isSame(accountModels, 'pid')) { alert('必须选择相同的产品'); return; }
             if (!isSame(accountModels, 'connectCount')) { alert('必须选择相同的连接数'); return; }