From 7968d41beaa069287b76b43fb676c0aeb262d835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 27 May 2021 16:13:29 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=92=8C?=
 =?UTF-8?q?=E7=94=B5=E8=84=91=E7=AB=AF=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91=20https://www.tapd.cn/39598945/prong/stories/view/113?=
 =?UTF-8?q?9598945001000223?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/Home/Index.cshtml      |  6 +--
 Host/Views.Mobile/Shared/_Layout.cshtml  |  4 +-
 Host/Views.Mobile/User/MyAccounts.cshtml | 58 ++++++++++--------------
 Host/Views/Home/Index.cshtml             | 18 ++++----
 Host/Views/Shared/_Layout.cshtml         | 13 ++----
 Host/Views/Shared/_UserLayout.cshtml     | 19 ++++----
 Host/Views/User/MyAccounts.cshtml        | 28 +++++++++---
 7 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/Host/Views.Mobile/Home/Index.cshtml b/Host/Views.Mobile/Home/Index.cshtml
index e8fb8a7..fcaed3a 100644
--- a/Host/Views.Mobile/Home/Index.cshtml
+++ b/Host/Views.Mobile/Home/Index.cshtml
@@ -266,10 +266,10 @@
             <p>联系我们</p>
             <p>企业电话：400 800 9925</p>
             <p>客服QQ：800101003</p>
-            <p>客服微信-售前&售后：</p>
+            <p>客服微信-售前：</p>
                     <img width="300px" src="~/img/kf_sq.jpg?123"><br>
-            @* <p>客服微信-售后：</p>
-                    <img width="300px" src="~/img/kf_sh.jpg?1231"> *@
+            <p>客服微信-售后：</p>
+                    <img width="300px" src="~/img/kf_sh.jpg?1231">
             <p>工作时间：周一到周日8:00-24:00</p>
         </div>
         <div class="item">
diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml
index 89f278c..5791e88 100644
--- a/Host/Views.Mobile/Shared/_Layout.cshtml
+++ b/Host/Views.Mobile/Shared/_Layout.cshtml
@@ -161,8 +161,8 @@
             <div class="side_kefu">
                
                 <ul class="nav nav-tabs" role="tablist" style="padding-top: 10px;padding-left:10px">
-                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前&售后</a></li>
-                    @* <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li> *@
+                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前</a></li>
+                    <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li>
                     @*<li role="presentation"><a href="#ss" aria-controls="ss" role="tab" data-toggle="tab" style="border-color:#ccc">珊珊</a></li>
                     <li role="presentation"><a href="#tt" aria-controls="tt" role="tab" data-toggle="tab" style="border-color:#ccc">兔兔</a></li>*@
                 </ul>
diff --git a/Host/Views.Mobile/User/MyAccounts.cshtml b/Host/Views.Mobile/User/MyAccounts.cshtml
index 1bd010c..c11b77f 100644
--- a/Host/Views.Mobile/User/MyAccounts.cshtml
+++ b/Host/Views.Mobile/User/MyAccounts.cshtml
@@ -46,7 +46,7 @@
                 
             <div class="col-sm-4 col-xs-4">
                 <select v-model="searchModel.ExpiredDay" @@change="search">
-                    <option :value="-100">选择过期时间</option>
+                    <option disabled :value="0">选择过期时间</option>
                     <option :value="-100">全部</option>
                     <option :value="1">1天内到期</option>
                     <option :value="3">3天内到期</option>
@@ -79,17 +79,7 @@
         </div>
             
         </div>
-        <div class="row riqi">
-            <div class="col-sm-4 col-xs-4">
-                日期查询：
-            </div>
-            <div class="col-sm-4 col-xs-4">
-                <input type="text" name="start_date" id="start_date" placeholder="选择开通日期" readonly="readonly" v-model="searchModel.BTime" />
-            </div>
-            <div class="col-sm-4 col-xs-4">
-                <input type="text" name="end_date" id="end_date" placeholder="选择到期日期" readonly="readonly" v-model="searchModel.ETime" />
-            </div>
-        </div>
+        
 
         <div class="chaxun2" style="background-color: white;margin-top:0;">
             <input type="text" v-model="searchModel.Keyword" placeholder="账号" /><button type="button" class="btnOrange" v-on:click="search">查询</button>
@@ -334,10 +324,20 @@
 
     </div>
 
-<script src="~/m/js/LCalendar.js" type="text/javascript" charset="utf-8"></script>
 
 
 <script type="text/javascript">
+
+    function getQueryVariable(variable)
+    {
+       var query = window.location.search.substring(1);
+       var vars = query.split("&");
+       for (var i=0;i<vars.length;i++) {
+               var pair = vars[i].split("=");
+               if(pair[0] == variable){return pair[1];}
+       }
+       return(false);
+    }
     var reason = '';
     var app = new Vue({
         el: '#app',
@@ -346,12 +346,10 @@
             productWithPackage: [],
             packages: [],
             searchModel: {
-                ExpiredDay:-1,
+                ExpiredDay:@this.Context.Request.GetInt("ExpiredDay"),
                 ProductId:@this.Context.Request.GetInt("ProductId"),
                 PackageId:'0', 
                 Keyword:'@this.Context.Request.Get("Keyword")',
-                BTime: '@this.Context.Request.Get("BTime")',
-                ETime: '@this.Context.Request.Get("ETime")',
             },
               oneAuthModel: {
                 ProductId: 0,
@@ -399,6 +397,11 @@
                 }
             },
             getProducts() {
+                if(decodeURIComponent(getQueryVariable('PackageId'))!='false'){
+                    this.searchModel.PackageId = decodeURIComponent(getQueryVariable('PackageId'))
+                } else {
+                    this.searchModel.PackageId = '0'
+                }
                 var that = this;
                 $.ajax({
                     type: 'GET',
@@ -415,8 +418,10 @@
             search() {
                 var ps = [];
                 for (var item in this.searchModel) {
-                    var p = item + "=" + this.searchModel[item];
-                    ps.push(p);
+                    if (this.searchModel[item]!=0 && this.searchModel[item] != 'false' && this.searchModel[item]!=null){
+                        var p = item + "=" + this.searchModel[item];
+                        ps.push(p);
+                    }
                 }
                 window.location.href = "?" + ps.join("&");
             },
@@ -617,20 +622,3 @@
     });
 </script>
 
-<script type="text/javascript">
-    var calendar = new LCalendar();
-    calendar.init({
-        'trigger': '#start_date', //标签id
-        'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
-        'minDate': (new Date().getFullYear() - 3) + '-' + 1 + '-' + 1, //最小日期
-        'maxDate': (new Date().getFullYear() + 3) + '-' + 12 + '-' + 31 //最大日期
-    });
-    var calendar = new LCalendar();
-    calendar.init({
-        'trigger': '#end_date', //标签id
-        'type': 'date', //date 调出日期选择 datetime 调出日期时间选择 time 调出时间选择 ym 调出年月选择,
-        'minDate': (new Date().getFullYear() - 3) + '-' + 1 + '-' + 1, //最小日期
-        'maxDate': (new Date().getFullYear() + 3) + '-' + 12 + '-' + 31 //最大日期
-    });
-
-</script>
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index 58dc80f..c1bd347 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -317,8 +317,8 @@
             <img src="~/img/weixin.png" class="on_wx"><div class="kefu_tit">微信</div>
             <div class="side_kefu">
                 <ul class="nav nav-tabs" role="tablist" style="padding-top: 10px;padding-left:10px">
-                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前&售后</a></li>
-                    @* <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li> *@
+                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前</a></li>
+                    <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li>
                     @*<li role="presentation"><a href="#ss" aria-controls="ss" role="tab" data-toggle="tab" style="border-color:#ccc">珊珊</a></li>
                     <li role="presentation"><a href="#tt" aria-controls="tt" role="tab" data-toggle="tab" style="border-color:#ccc">兔兔</a></li>*@
                 </ul>
@@ -393,15 +393,13 @@
                             }
                             else
                             {
-                                <img src="/img/account.png" onmouseover="$('.exitBox').show()">
-                                <div class="exitBox" onmouseleave="$('.exitBox').hide()">
-                                    <div class="item">
-                                        <a asp-action="index" asp-controller="user">个人中心</a>
-                                    </div>
-                                    <div class="item">
-                                        <a asp-action="LoginOut" asp-controller="user">退出登录</a>
-                                    </div>
+                                <div class="item" style="display: inline-block;margin-right:20px;">
+                                    <a asp-action="index" style="border-radius:25px;background-color:#FF9900;padding:5px;" asp-controller="user">个人中心</a>
                                 </div>
+                                <div class="item"  style="display: inline-block;">
+                                    <a asp-action="LoginOut" asp-controller="user">退出登录</a>
+                                </div>
+                                
                             }
                         </li>
                     </ul>
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index 63a74b5..598000a 100644
--- a/Host/Views/Shared/_Layout.cshtml
+++ b/Host/Views/Shared/_Layout.cshtml
@@ -162,8 +162,8 @@
             <img src="~/img/weixin.png" class="on_wx"> <div class="kefu_tit">微信</div>
             <div class="side_kefu">
                 <ul class="nav nav-tabs" role="tablist" style="padding-top: 10px;padding-left:10px">
-                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前&售后</a></li>
-                    @* <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li> *@
+                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前</a></li>
+                    <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li>
                     @*<li role="presentation"><a href="#ss" aria-controls="ss" role="tab" data-toggle="tab" style="border-color:#ccc">珊珊</a></li>
                     <li role="presentation"><a href="#tt" aria-controls="tt" role="tab" data-toggle="tab" style="border-color:#ccc">兔兔</a></li>*@
                 </ul>
@@ -232,15 +232,12 @@
                         }
                         else
                         {
-                            <img src="/img/account.png" onmouseover="$('.exitBox').show()">
-                            <div class="exitBox" onmouseleave="$('.exitBox').hide()">
-                                <div class="item">
-                                    <a asp-action="index" asp-controller="user">个人中心</a>
+                             <div class="item" style="display: inline-block;margin-right:20px;">
+                                    <a asp-action="index" style="border-radius:25px;background-color:#FF9900;padding:5px;" asp-controller="user">个人中心</a>
                                 </div>
-                                <div class="item">
+                                <div class="item"  style="display: inline-block;">
                                     <a asp-action="LoginOut" asp-controller="user">退出登录</a>
                                 </div>
-                            </div>
                         }
                     </li>
                 </ul>
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index f10e8f1..bb7921e 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -107,8 +107,8 @@
             <div class="side_kefu">
                 
                 <ul class="nav nav-tabs" role="tablist" style="padding-top: 10px;padding-left:10px">
-                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前&售后</a></li>
-                    @* <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li> *@
+                    <li role="presentation" class="active"><a href="#xx" aria-controls="xx" role="tab" data-toggle="tab" style="border-color:#ccc">售前</a></li>
+                    <li role="presentation"><a href="#qq" aria-controls="qq" role="tab" data-toggle="tab" style="border-color:#ccc">售后</a></li>
                     @*<li role="presentation"><a href="#ss" aria-controls="ss" role="tab" data-toggle="tab" style="border-color:#ccc">珊珊</a></li>
                     <li role="presentation"><a href="#tt" aria-controls="tt" role="tab" data-toggle="tab" style="border-color:#ccc">兔兔</a></li>*@
                 </ul>
@@ -167,15 +167,12 @@
                     <li><a href="/article/index">教程&咨询</a></li>
                     @* <li><a href="/article/taobao">淘宝充值活动</a></li> *@
                     <li>
-                        <img src="/img/account.png" onmouseover="$('.exitBox').show()">
-                        <div class="exitBox" onmouseleave="$('.exitBox').hide()">
-                            <div class="item">
-                                <a asp-action="index" asp-controller="user">个人中心</a>
-                            </div>
-                            <div class="item">
-                                <a asp-action="LoginOut" asp-controller="user">退出登录</a>
-                            </div>
-                        </div>
+                       <div class="item" style="display: inline-block;margin-right:20px;">
+                                    <a asp-action="index" style="border-radius:25px;background-color:#FF9900;padding:5px;" asp-controller="user">个人中心</a>
+                                </div>
+                                <div class="item"  style="display: inline-block;">
+                                    <a asp-action="LoginOut" asp-controller="user">退出登录</a>
+                                </div>
                     </li>
                 </ul>
             </div>
diff --git a/Host/Views/User/MyAccounts.cshtml b/Host/Views/User/MyAccounts.cshtml
index db01ed8..ca05899 100644
--- a/Host/Views/User/MyAccounts.cshtml
+++ b/Host/Views/User/MyAccounts.cshtml
@@ -303,7 +303,7 @@
         <div class="item" style="width:20%;">
             <div class="btn-group">
                 <select v-model="searchModel.ExpiredDay" @@change="search" style="height:35px;width:200%;">
-                    <option :value="-100">选择过期时间</option>
+                    <option disabled :value="0">选择过期时间</option>
                     <option :value="-100">全部</option>
                     <option :value="1">1天内到期</option>
                     <option :value="3">3天内到期</option>
@@ -444,6 +444,17 @@
 
 <script type="text/javascript">
 
+ function getQueryVariable(variable)
+    {
+       var query = window.location.search.substring(1);
+       var vars = query.split("&");
+       for (var i=0;i<vars.length;i++) {
+               var pair = vars[i].split("=");
+               if(pair[0] == variable){return pair[1];}
+       }
+       return(false);
+    }
+
     var reason = '';
 
         var app = new Vue({
@@ -460,7 +471,7 @@
             assign_pass:'',
             productId:'',
             searchModel: {
-                ExpiredDay:-100,
+                ExpiredDay:@this.Context.Request.GetInt("ExpiredDay"),
                 ProductId:@this.Context.Request.GetInt("ProductId"),
                 PackageId:'0', 
                 Keyword:'@this.Context.Request.Get("Keyword")',
@@ -511,6 +522,11 @@
                     }
              },
             getProducts() {
+                 if(decodeURIComponent(getQueryVariable('PackageId'))!='false'){
+                    this.searchModel.PackageId = decodeURIComponent(getQueryVariable('PackageId'))
+                } else {
+                    this.searchModel.PackageId = '0'
+                }
                 var that = this;
                 $.ajax({
                     type: 'GET',
@@ -525,11 +541,11 @@
             },
             search() {
                 var ps = [];
-                this.searchModel.BTime = $("#BTime").val();
-                this.searchModel.ETime = $("#ETime").val();
                 for (var item in this.searchModel) {
-                    var p = item + "=" + this.searchModel[item];
-                    ps.push(p);
+                     if (this.searchModel[item]!=0 && this.searchModel[item] != 'false' && this.searchModel[item]!=null){
+                        var p = item + "=" + this.searchModel[item];
+                        ps.push(p);
+                    }
                 }
                 window.location.href = "?" + ps.join("&");
             },