From 03056ebe337a0629c980c797cbae3dec51d32247 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 20 Jul 2023 14:54:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/LineList/Index.cshtml       | 27 ++++++++++++++-----
 Host/Views.Mobile/User/Regist.cshtml          | 14 +++++-----
 Host/Views/Home/Index.cshtml                  | 10 +++----
 Host/Views/LineList/Index.cshtml              | 12 +++++++++
 Host/Views/Shared/_Layout.cshtml              |  2 +-
 Host/Views/User/MyAccounts.cshtml             |  4 +--
 .../Hncore.Pass.Vpn/Service/ProductService.cs |  2 +-
 7 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/Host/Views.Mobile/LineList/Index.cshtml b/Host/Views.Mobile/LineList/Index.cshtml
index 5dcbc94..4edc3a7 100644
--- a/Host/Views.Mobile/LineList/Index.cshtml
+++ b/Host/Views.Mobile/LineList/Index.cshtml
@@ -29,13 +29,18 @@
     </div>
 </div>
 <div style="color: red;" v-if="product_id ==1|| product_id==2">
-            <p style="text-align:center;">
-                <span style="font-size: 20px;color:#FF0033;">{{search_field}}</span> 用服务器地址直连用户请注意：
-            </p>
-            <p>因电信联通机房限制此协议，会存在个别地区直连无法连接，电脑客户端和安卓APP不受影响。</p>
-            <p v-if="product_id ==1">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连温州的，那账号框就输入：zx1234@zjwz，服务器输入任意一个全国混拨的服务器，则会连接到温州。</p>
-            <p v-if="product_id==2">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连三亚的，那账号框就输入：zx1234@hnsy，服务器输入任意一个全国混拨的服务器，则会连接到三亚。</p>
-        </div>
+    <p style="text-align:center;">
+        <span style="font-size: 20px;color:#FF0033;">{{search_field}}</span> 用服务器地址直连用户请注意：
+    </p>
+    <p>因电信联通机房限制此协议，会存在个别地区直连无法连接，电脑客户端和安卓APP不受影响。</p>
+    <p v-if="product_id ==1">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连温州的，那账号框就输入：zx1234@zjwz，服务器输入任意一个全国混拨的服务器，则会连接到温州。</p>
+    <p v-if="product_id==2">解决方法：IP账号后边输入：@@特征码，例如您的IP账号为zx1234，要用sstp直连三亚的，那账号框就输入：zx1234@hnsy，服务器输入任意一个全国混拨的服务器，则会连接到三亚。</p>
+</div>
+
+<div style="color: red;text-align:center;font-size:20px;" v-if="product_id ==22">
+    <p>静态线路里面名称不带‘宽带’字样的线路ip是相对固定不变的。</p>
+    <p>只要线路名称里面带“宽带”两个字的是完全模拟家庭宽带网络的线路，和家庭宽度网络一样一般1-2天不等自动换一次ip</p>
+</div>
 
 <div class="lineBar"></div>
 
@@ -249,6 +254,11 @@
                         this.search_field = '云牛IP';
                         this.sstp = '5908';
                     break;
+                    case 25:
+                        this.l2tp = '888888';
+                        this.search_field = '强子静态IP';
+                        this.sstp = '1500';
+                    break;
                 }
                 $.ajax({
                     type: 'GET',
@@ -350,6 +360,9 @@
                     case 19:
                         self.location.href='http://php-api.juip.com/script/linedata/data/download/huohu.csv';
                     break;
+                    case 25:
+                        self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv';
+                    break;
                 }
             },
             detail(r){
diff --git a/Host/Views.Mobile/User/Regist.cshtml b/Host/Views.Mobile/User/Regist.cshtml
index 013085b..3405e0f 100644
--- a/Host/Views.Mobile/User/Regist.cshtml
+++ b/Host/Views.Mobile/User/Regist.cshtml
@@ -18,16 +18,16 @@
     </div>
 
     <div class="loginCenter">
-        <p><img src="~/m/img/phone.png"><input type="text" name="" id="username" value="" placeholder="手机号" /></p>
-        <p><img src="~/m/img/password.png"><input type="password" name="" id="password" value="" placeholder="密码" /></p>
-        <p class="yzm"><img src="~/m/img/yanzhengma.png"><input type="text" name="" id="yanzhengma" value="" placeholder="验证码" /><button type="button" class="btnBlue" onclick="getCode(this)">获取验证码</button></p>
-        <p><img src="~/m/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="微信号" /></p>
-        <p><img src="~/m/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="QQ号" /></p>
+        <p><img src="~/m/img/phone.png"><input type="text" name="" id="username" value="" placeholder="* 手机号" /></p>
+        <p><img src="~/m/img/password.png"><input type="password" name="" id="password" value="" placeholder="* 密码" /></p>
+        <p class="yzm"><img src="~/m/img/yanzhengma.png"><input type="text" name="" id="yanzhengma" value="" placeholder="* 验证码" /><button type="button" class="btnBlue" onclick="getCode(this)">获取验证码</button></p>
+        <p><img src="~/m/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="微信号(选填)" /></p>
+        <p><img src="~/m/img/phone.png"><input type="text" name="" id="wxhao" value="" placeholder="QQ号(选填)" /></p>
     </div>
-    <p class="xieyi"><input type="checkbox" name="" id="xieyi" value="" />我同意<span><a href="/LineList/xieyi" target="_blank">《聚IP JUIP.COM用户注册协议》</a></span></p>
+    <p class="xieyi"><input type="checkbox" name="" id="xieyi" checked value="" />我同意<span><a href="/LineList/xieyi" target="_blank">《聚IP JUIP.COM用户注册协议》</a></span></p>
     <p><button type="button" class="btnLogin" onclick="reg()">注册</button></p>
     <p class="tixing">*手机号不是IP账号，请登录后开通IP账号*</p>
-    <p class="bianjie">已有账号？<a href="#">立即登录</a></p>
+    <p class="bianjie">已有账号？<a href="/User/WebLogin">立即登录</a></p>
 </div>
 
 <script>
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index cf586e6..cde139a 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -66,13 +66,13 @@
             });
 
             $(".login").click(function () {
-                $(".mask").show();
                 $(".main").show();
+                $(".mask").show();
                 $(".main").addClass("animated bounceInDown");
             });
             $(".reg").click(function () {
-                $(".mask").show();
                 $(".main_reg").show();
+                $(".mask").show();
                 $(".main_reg").addClass("animated bounceInDown");
             });
 
@@ -83,7 +83,7 @@
                 setTimeout(function () {
                     $(".main").removeClass("animated bounceOutDown");
                     $(".main").hide();
-                }, 1000)
+                }, 100)
             });
             $(".regClose").click(function () {
                 $(".main_reg").addClass("animated bounceOutDown");
@@ -92,7 +92,7 @@
                 setTimeout(function () {
                     $(".main_reg").removeClass("animated bounceOutDown");
                     $(".main_reg").hide();
-                }, 1000)
+                }, 100)
             });
             // 新闻选项卡
             $("#myTab a").click(function (e) {
@@ -312,7 +312,7 @@
 
         <p class="tixing">*手机号不是IP账号，请登录后开通IP账号*</p>
         <p class="denglu"><button type="button" class="btn btn-reset">重置</button></p>
-        <p class="zhiyin grayText">已有账号？<a href="#" class="loginLink">立即登录</a></p>
+        <p class="zhiyin grayText">已有账号？<a href="/User/WebLogin" class="loginLink">立即登录</a></p>
     </div>
 
 
diff --git a/Host/Views/LineList/Index.cshtml b/Host/Views/LineList/Index.cshtml
index 2a0d658..1524a1a 100644
--- a/Host/Views/LineList/Index.cshtml
+++ b/Host/Views/LineList/Index.cshtml
@@ -75,6 +75,10 @@
             <div style="color: #CC3333;line-height:50%;text-align:center;font-size:20px;" v-if="product_id ==19">
                 <p>该产品切记一定要指定一下地区，不然会没有网络</p>
             </div>
+            <div style="color: red;line-height:50%;text-align:center;font-size:20px;" v-if="product_id ==22">
+                <p>静态线路里面名称不带‘宽带’字样的线路ip是相对固定不变的。</p>
+                <p>只要线路名称里面带“宽带”两个字的是完全模拟家庭宽带网络的线路，和家庭宽度网络一样一般1-2天不等自动换一次ip</p>
+            </div>
     </div>
     <div class="row">
         <div class="col-lg-2 miyao">
@@ -243,6 +247,11 @@
                         this.search_field = '云牛IP';
                         this.sstp = '5908';
                     break;
+                    case 25:
+                        this.l2tp = '888888';
+                        this.search_field = '强子静态IP';
+                        this.sstp = '1500';
+                    break;
                 }
                 $.ajax({
                     type: 'GET',
@@ -365,6 +374,9 @@
                     case 23:
                         self.location.href='http://php-api.juip.com/script/linedata/data/download/yunniu.csv';
                     break;
+                    case 25:
+                        self.location.href='http://php-api.juip.com/script/linedata/data/download/qiangzijt.csv';
+                    break;
                 }
             }
         }
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index 6cef212..60e3618 100644
--- a/Host/Views/Shared/_Layout.cshtml
+++ b/Host/Views/Shared/_Layout.cshtml
@@ -388,7 +388,7 @@
 
         <p class="tixing">*手机号不是IP账号，请登录后开通IP账号*</p>
         <p class="denglu"><button type="button" class="btn btn-reset">重置</button></p>
-        <p class="zhiyin grayText">已有账号？<a href="#" class="loginLink">立即登录</a></p>
+        <p class="zhiyin grayText">已有账号？<a href="/User/WebLogin" class="loginLink">立即登录</a></p>
     </div>
 
     <script>
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index 7eb90f5..2fefdfd 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -295,7 +295,7 @@
                 <label>新密码：</label>
                 <input type="text" class="form-control" placeholder="" v-model="UpdateAccountModel.Pwd">
             </div>
-            <p class="text-center"><button type="button" class="btn btn-primary" v-on:click="UpdateAccountPwd">提交</button><button type="reset" class="btn btn-danger quxiao" style="margin-left:20px;">取消</button></p>
+            <p class="text-center"><button type="button" class="btn btn-primary" v-on:click="UpdateAccountPwd">提交</button><button type="button" class="btn btn-danger quxiao" style="margin-left:20px;">取消</button></p>
         </form>
     </div>
     <p class="wanshan"><img src="~/img/smile.png"> 为了给您带来更好的服务体验，请完善qq号和微信号。<a class="edit" asp-action="index" asp-controller="user" asp-route-e="1">立即完善》</a></p>
@@ -382,7 +382,7 @@
             <td>@item.ProductName</td>
             <td>@item.PackageName</td>
             <td>@item.Account</td>
-            <td>@item.Pwd <img src="~/img/change.png" class="change" v-on:click="showAccountBox(@item.Id,'@item.Account','@item.Pwd')" /></td>
+            <td>@item.Pwd<img src="~/img/change.png" class="change" v-on:click="showAccountBox(@item.Id,'@item.Account','@item.Pwd')" /></td>
             <td>@item.ConnectCount</td>
             <td>@item.EndTime.Value.ToString("yyyy.MM.dd")</td>
             <td class="redT">@(item.Status==AccountStatus.Refund?"已退货": item.RestTime)</td>
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductService.cs b/Services/Hncore.Pass.Vpn/Service/ProductService.cs
index 19ccfd7..57b8b68 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductService.cs
@@ -56,7 +56,7 @@ namespace Hncore.Pass.Vpn.Service
             {
                 var resp = new ProductWithPackageResponse();
                 resp.Product = p.MapTo<ProductResponse>();
-                resp.Packages = packages.Where(m => m.ProductId == p.Id).ToList();
+                resp.Packages = packages.Where(m => m.ProductId == p.Id && m.Status == 1).ToList();
                 respList.Add(resp);
             });
             return respList;