From 7c5a57226b3803b8a520d0e76de724a1987f13c5 Mon Sep 17 00:00:00 2001
From: wanyongkang <937888580@qq.com>
Date: Wed, 21 Oct 2020 21:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Views.Mobile/User/Index.cshtml          |  2 +-
 Host/Views.Mobile/User/IndexInfo.cshtml      | 12 +++++++++++-
 Host/Views/Shared/_UserLayout.cshtml         |  4 ++--
 Host/Views/User/Index.cshtml                 | 15 ++++++++++++---
 Services/Hncore.Pass.BaseInfo/Domain/Enum.cs |  5 +++++
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml
index e427f93..d5e246b 100644
--- a/Host/Views.Mobile/User/Index.cshtml
+++ b/Host/Views.Mobile/User/Index.cshtml
@@ -15,6 +15,6 @@
     <li><img src="~/m/img/p2.png"><a asp-action="myrefundorders" asp-controller="user">退货订单<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p3.png"><a asp-action="myaccounts" asp-controller="user">PPTP账号管理<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券<img src="~/m/img/arrow.png"></a></li>
-    @* <li><img src="~/m/img/p4.png"></span><a asp-action="cashout" asp-controller="user">提现管理<img src="~/m/img/arrow.png"></a></li> *@
+    <li><img src="~/m/img/p4.png"></span><a asp-action="cashout" asp-controller="user">提现管理<img src="~/m/img/arrow.png"></a></li>
 </ul>
 
diff --git a/Host/Views.Mobile/User/IndexInfo.cshtml b/Host/Views.Mobile/User/IndexInfo.cshtml
index d711297..97d37e5 100644
--- a/Host/Views.Mobile/User/IndexInfo.cshtml
+++ b/Host/Views.Mobile/User/IndexInfo.cshtml
@@ -112,7 +112,7 @@
     <div class="accout_tit">
         <span class="lineBar"></span>余额  
         <button class="btnXq" onclick="$('#chargeBox').show()">充值</button>
-        @* <button class="btnXq" onclick="$('#cash-out').show()">提现</button> *@
+        <button class="btnXq" onclick="$('#cash-out').show()">提现</button>
     </div>
     <div class="model">
         <div class="item">
@@ -284,6 +284,10 @@
                 <td>提现支付宝账号：</td>
                 <td><input type="number" id="alipay-account" class="inputBox" placeholder="请输入支付宝账号"/></td>
             </tr>
+            <tr>
+                <td>支付宝真实姓名</td>
+                <td><input type="number" id="alipay-account" class="inputBox" placeholder="请输入与支付宝关联的真实姓名"/></td>
+            </tr>
         </table>
 
         <div class="" style="text-align:center;">
@@ -385,6 +389,7 @@
     function cash_out() {
         let cash_out_money = $('#cash-out-money').val(),
             reason = $('#cash-out-reason').val(),
+            real_name = $('#real-name').val(),
             alipay_account = $('#alipay-account').val();
         if(cash_out_money > @Model.UserModel.RestAmount){
             alert("抱歉！您提现的额度大于余额，请重新输入提现金额！");
@@ -394,6 +399,10 @@
             alert("抱歉！请重新输入提现金额！");
             return;
         }
+        if(real_name.length <= 0){
+            alert("抱歉！请重新输入姓名！");
+            return;
+        }
         // 
         let reg = /^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/;
         if(alipay_account.length <= 0 || alipay_account.match(reg) == null){
@@ -405,6 +414,7 @@
             cash_out_money: cash_out_money,
             reason: reason,
             alipay_account: alipay_account,
+            real_name: real_name,
             cookie:document.cookie
         }
         $.ajax({
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index 30adb2c..f6c50e1 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -76,9 +76,9 @@
                 <div class="item @(currentPath=="/user/mycoupons"?"active_b":"")">
                     <img src="~/img/p5.png"><a href="/user/mycoupons">我的优惠券</a>
                 </div>
-                @* <div class="item @(currentPath=="/user/cashout"?"active_b":"")">
+                <div class="item @(currentPath=="/user/cashout"?"active_b":"")">
                     <span class="glyphicon glyphicon-jpy" style="padding: 10px;"></span><a href="/user/cashout">提现管理</a>
-                </div> *@
+                </div>
             </div>
         </div>
         <div class="col-lg-10 rightCon">
diff --git a/Host/Views/User/Index.cshtml b/Host/Views/User/Index.cshtml
index 64289ec..ed543c8 100644
--- a/Host/Views/User/Index.cshtml
+++ b/Host/Views/User/Index.cshtml
@@ -102,7 +102,7 @@
     .cash-out {
         position: fixed;
         width: 400px;
-        height: 320px;
+        height: 400px;
         left: 50%;
         top: 50%;
         margin-left: -200px;
@@ -207,6 +207,10 @@
             <label>提现支付宝账号(目前仅支持支付宝)：</label>
             <input type="text" id="alipay-account" class="form-control" placeholder="请输入支付宝账号" >
         </div>
+        <div class="form-group">
+            <label>支付宝真实姓名</label>
+            <input type="text" id="real-name" class="form-control" placeholder="请输入与支付宝关联的真实姓名" >
+        </div>
 
         <p class="text-center">
             <button type="button" class="btn btn-primary" onclick="cash_out()">确认提现</button>
@@ -268,7 +272,7 @@
     <div class="col-lg-3">
         <div class="zhanghu">
             <div class="accout_tit"><span class="lineBar"></span>余额</div>
-            @* <p class="charge"  onclick="$('.cash-out').show()"  style="float:left;font-size:25px;"><a>提现</a></p> *@
+            <p class="charge"  onclick="$('.cash-out').show()"  style="float:left;font-size:25px;"><a>提现</a></p>
             <p class="charge"  onclick="$('.chargeList').show()"  style="font-size:25px;"><a>充值</a></p>
             <div class="money" style="padding: 20px 30px;">¥<span>@Model.UserModel.RestAmount</span></div>
             <p class="grayText text-center">可通过淘宝充值，或联系管理员充值</p>
@@ -472,6 +476,7 @@
     function cash_out() {
         let cash_out_money = $('#cash-out-money').val(),
             reason = $('#cash-out-reason').val(),
+            real_name = $('#real-name').val(),
             alipay_account = $('#alipay-account').val();
         if(cash_out_money > @Model.UserModel.RestAmount){
             alert("抱歉！您提现的额度大于余额，请重新输入提现金额！");
@@ -481,6 +486,10 @@
             alert("抱歉！请重新输入提现金额！");
             return;
         }
+        if(real_name.length <= 0){
+            alert("抱歉！请重新输入姓名！");
+            return;
+        }
         // 
         let reg = /^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/;
         if(alipay_account.length <= 0 || alipay_account.match(reg) == null){
@@ -492,6 +501,7 @@
             cash_out_money: cash_out_money,
             reason: reason,
             alipay_account: alipay_account,
+            real_name: real_name,
             cookie:document.cookie
         }
         $.ajax({
@@ -505,7 +515,6 @@
             },
             crossDomain: true,
             success: function (res) {
-                console.log(res);
                 if (res.Code == 10000) {
                     $('.cash-out').hide();
                     alert('提现请求发送成功，我们会在一到两个工作日进行处理，请注意查看资金明细。');
diff --git a/Services/Hncore.Pass.BaseInfo/Domain/Enum.cs b/Services/Hncore.Pass.BaseInfo/Domain/Enum.cs
index 1511689..723271a 100644
--- a/Services/Hncore.Pass.BaseInfo/Domain/Enum.cs
+++ b/Services/Hncore.Pass.BaseInfo/Domain/Enum.cs
@@ -63,6 +63,11 @@ namespace Hncore.Pass.BaseInfo.Models
 
         [Display(Name = "用户充值")]
         UserCharge = 7,
+
+        [Display(Name = "用户提现扣除")]
+        UserCashOut = 8,
+        [Display(Name = "提现被拒退还")]
+        ReturnMoney = 9,
     }
 
     public enum UPayChannel