From 1aaf2c374b4f2bd8b60a171b9fe5ff8ab11c2ff6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwanyongkang=E2=80=9D?= <“937888580@qq.com”>
Date: Thu, 31 Mar 2022 15:15:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Host/Controllers/UserController.cs            |   8 ++
 Host/Views.Mobile/Home/Index.cshtml           |   2 +-
 Host/Views.Mobile/Product/buy.cshtml          |  22 +++
 Host/Views.Mobile/Shared/_Layout.cshtml       |  14 +-
 Host/Views.Mobile/User/Index.cshtml           |   1 +
 Host/Views.Mobile/User/MyMoney.cshtml         | 125 ++++++++++++++++++
 Host/Views/Home/Index.cshtml                  |  16 +--
 Host/Views/Product/Index.cshtml               |  81 +++++++-----
 Host/Views/Product/buy.cshtml                 |  29 +++-
 Host/Views/Shared/_Layout.cshtml              |  16 +--
 Host/Views/Shared/_UserLayout.cshtml          |  18 ++-
 Host/Views/User/MyMoney.cshtml                | 125 ++++++++++++++++++
 .../Service/ProductOrderService.cs            |   2 +-
 13 files changed, 393 insertions(+), 66 deletions(-)
 create mode 100644 Host/Views.Mobile/User/MyMoney.cshtml
 create mode 100644 Host/Views/User/MyMoney.cshtml

diff --git a/Host/Controllers/UserController.cs b/Host/Controllers/UserController.cs
index ba7ece5..9e93373 100644
--- a/Host/Controllers/UserController.cs
+++ b/Host/Controllers/UserController.cs
@@ -577,6 +577,14 @@ namespace Home.Controllers
             return View();
         }
 
+        [HttpGet]
+        [UserAuth]
+        public IActionResult MyMoney()
+        {
+            var userId =this.Request.GetUserInfo().UserId;           
+            return View();
+        }
+
         /// <summary>
         /// 发送手机验证码
         /// </summary>
diff --git a/Host/Views.Mobile/Home/Index.cshtml b/Host/Views.Mobile/Home/Index.cshtml
index 4da26e1..51043aa 100644
--- a/Host/Views.Mobile/Home/Index.cshtml
+++ b/Host/Views.Mobile/Home/Index.cshtml
@@ -306,7 +306,7 @@
                     <img width="300px" src="~/img/kf_sq.jpg?123"><br>
             <p>客服微信-售后：</p>
                     <img width="300px" src="~/img/kf_sh.jpg?1231">
-            <p>工作时间：周一到周日8:30-23:30</p>
+            <p>工作时间：周一到周日8:30-23:00</p>
         </div>
         <div class="item">
             <p>大客户/商务合作</p>
diff --git a/Host/Views.Mobile/Product/buy.cshtml b/Host/Views.Mobile/Product/buy.cshtml
index 0d9b797..8199319 100644
--- a/Host/Views.Mobile/Product/buy.cshtml
+++ b/Host/Views.Mobile/Product/buy.cshtml
@@ -496,7 +496,12 @@
             },
             watch: {
             'OneBuyModel.CouponId': {    //加引号监听对象里的属性
+            
                     handler: function (newValue, oldValue) {
+                        
+                    if( this.OneBuyModel.CouponId == 10000000){
+                        return;
+                    }
                     var totalAmount = this.OneBuyModel.Price * this.OneBuyModel.ConnectCount;
                     for (var i = 0; i < this.Coupons.length; i++) {
                         var item = this.Coupons[i];
@@ -525,6 +530,10 @@
                 },
                 'MoreBuyModel.CouponId': {    //加引号监听对象里的属性
                     handler: function (newValue, oldValue) {
+                        
+                    if( this.MoreBuyModel.CouponId == 10000000){
+                        return;
+                    }
                     var totalAmount = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount;
                     for (var i = 0; i < this.Coupons.length; i++) {
                         var item = this.Coupons[i];
@@ -571,6 +580,10 @@
                 immediate: true
             }
         },
+            created () {
+                this.OneBuyModel.CouponId = 10000000
+                this.MoreBuyModel.CouponId = 10000000
+            },
             mounted: function () {
                 if (isWeiXin()) {
                     this.OneBuyModel.PayChannel = 20;
@@ -599,6 +612,15 @@
                         success: function (res) {
                             console.log(res);
                             if (res.Code == 10000) {
+                                if(@(Model.Package.Id) == 64||@(Model.Package.Id) == 1004){
+                                    var coupon_json = {
+                                        "Coupon":{
+                                            "Id":10000000,
+                                            "Name":"极客-西瓜-满减劵",
+                                        }
+                                    }
+                                    res.Data.push(coupon_json);
+                                }
                                 that.Coupons = res.Data.map(m => m.Coupon);
                             }
                         }
diff --git a/Host/Views.Mobile/Shared/_Layout.cshtml b/Host/Views.Mobile/Shared/_Layout.cshtml
index 2fe1238..1a29a44 100644
--- a/Host/Views.Mobile/Shared/_Layout.cshtml
+++ b/Host/Views.Mobile/Shared/_Layout.cshtml
@@ -132,7 +132,7 @@
             <img src="~/img/qq.png" class="on_q"><div class="kefu_tit">QQ</div>
 
             <div class="side_q" style="width: 200px;">
-                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:15px 0;">在线时间8:30-23:30</h4>
+                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:15px 0;">在线时间8:30-23:00</h4>
                 <div class="item" style="padding-left:20%;width:80%;">
                     <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
                         <div class="ileft">
@@ -159,19 +159,19 @@
                 <div class="tab-content" style="margin-top: 60px;">
                     <div role="tabpanel" class="tab-pane active" id="xx">
                         <img src="~/img/kf_sq.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="qq">
                         <img src="~/img/kf_sh.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     @*<div role="tabpanel" class="tab-pane" id="ss">
                         <img src="~/img/w3.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tt">
                         <img src="~/img/w4.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>*@
                 </div>
             </div>
@@ -180,7 +180,7 @@
             <img src="~/img/gzh.png" class="on_gzh"><div class="kefu_tit">公众号</div>
             <div class="side_gzh">
                 <p><img src="~/img/ewm.png"></p>
-                <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                 <p style="color:#f90">关注公众号可获取免费的到期提醒服务</p>
             </div>
 
@@ -190,7 +190,7 @@
             <div class="side_tel">
                 <p><b>400 800 9925</b></p>
                 <p>实时接通</p>
-                <p>电话值班时间 8:30-23:30</p>
+                <p>电话值班时间 8:30-23:00</p>
             </div>
         </div>
         <div class="item">
diff --git a/Host/Views.Mobile/User/Index.cshtml b/Host/Views.Mobile/User/Index.cshtml
index f01930f..eacc38f 100644
--- a/Host/Views.Mobile/User/Index.cshtml
+++ b/Host/Views.Mobile/User/Index.cshtml
@@ -12,6 +12,7 @@
 <ul class="plist">
     <li><img src="~/m/img/p1.png"><a asp-action="indexInfo" 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">IP账号管理<img src="~/m/img/arrow.png"></a></li>
+    <li><img src="~/m/img/p3.png"><a asp-action="mymoney" asp-controller="user">资金明细<img src="~/m/img/arrow.png"></a></li>
     <li><img src="~/m/img/p1.png"><a asp-action="myorders" asp-controller="user">我的订单<img src="~/m/img/arrow.png"></a></li>
     <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/p4.png"><a asp-action="mycoupons" asp-controller="user">我的优惠券&nbsp;<span style="background-color: red;font-size:25px;" class="badge" id="coupon_num"></span><img src="~/m/img/arrow.png"></a></li>
diff --git a/Host/Views.Mobile/User/MyMoney.cshtml b/Host/Views.Mobile/User/MyMoney.cshtml
new file mode 100644
index 0000000..d4213ac
--- /dev/null
+++ b/Host/Views.Mobile/User/MyMoney.cshtml
@@ -0,0 +1,125 @@
+
+@{
+    Layout = "_UserLayout";
+}
+<div id="app">
+    <table class="table">
+    <caption>余额资金明细</caption>
+    <thead>
+        <tr>
+            <th>用户</th>
+            <th>资金去向</th>
+            <th>金额</th>
+            <th>操作前余额</th>
+            <th>操作后余额</th>
+            <th>备注</th>
+            <th>购买时间</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr v-for="info in tableData">
+            <td>{{info.UserName}}</td>
+            <td>{{info.ScoreTypeName}}</td>
+            <td>{{info.ScoreValue}}</td>
+            <td>{{info.RestAmount1}}</td>
+            <td>{{info.RestAmount2}}</td>
+            <td>{{info.Remark}}</td>
+            <td>{{info.CreateTime}}</td>
+        </tr>
+    </tbody>
+    </table>
+    <ul class="pager">
+        <li v-on:click="previous"><a>上一页</a></li>
+        <li v-on:click="next"><a>下一页</a></li>
+    </ul>
+</div>
+<script>
+   var vm = new Vue({
+	    el:'#app',
+	    data:{
+	        tableData: [],
+            page:1
+	    },
+        created:function(){
+            this.post();
+        },
+	    methods:{
+            post:function(){
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+	        },
+            previous(){
+                this.page--;
+                if (this.page<1) {
+                    this.page = 1;
+                }
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie,
+                    page:this.page
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+            },
+            next(){
+                this.page++;
+                if (this.page<1) {
+                    this.page = 1;
+                }
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie,
+                    page:this.page
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+            },
+	    }
+	});
+</script>
\ No newline at end of file
diff --git a/Host/Views/Home/Index.cshtml b/Host/Views/Home/Index.cshtml
index e4ec368..a692933 100644
--- a/Host/Views/Home/Index.cshtml
+++ b/Host/Views/Home/Index.cshtml
@@ -323,7 +323,7 @@
             <img src="~/img/qq.png" class="on_q"> <div class="kefu_tit">QQ</div>
 
             <div class="side_q" style="width: 200px;">
-                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:30</h4>
+                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:00</h4>
                 <div class="item" style="padding-left:20%;width:80%;">
                     <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
                         <div class="ileft">
@@ -349,19 +349,19 @@
                 <div class="tab-content" style="margin-top: 60px;">
                     <div role="tabpanel" class="tab-pane active" id="xx">
                         <img src="~/img/kf_sq.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="qq">
                         <img src="~/img/kf_sh.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     @*<div role="tabpanel" class="tab-pane" id="ss">
                         <img src="~/img/w3.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tt">
                         <img src="~/img/w4.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>*@
                 </div>
             </div>
@@ -370,7 +370,7 @@
             <img src="~/img/gzh.png" class="on_gzh"><div class="kefu_tit">公众号</div>
             <div class="side_gzh">
                 <p><img src="~/img/ewm.png"></p>
-                <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                 <p style="color:#f90">关注公众号可获取免费的到期提醒服务</p>
             </div>
 
@@ -380,7 +380,7 @@
             <div class="side_tel">
                 <p><b>400 800 9925</b></p>
                 <p>实时接通</p>
-                <p>电话值班时间 8:30-23:30</p>
+                <p>电话值班时间 8:30-23:00</p>
             </div>
         </div>
         <div class="item">
@@ -666,7 +666,7 @@
                     <img width="100px" src="~/img/kf_sq.jpg?123"><br>
                     <li>客服微信-售后：</li><br>
                     <img width="100px" src="~/img/kf_sh.jpg?123">
-                    <li>工作时间： 8:30-23:30</li>
+                    <li>工作时间： 8:30-23:00</li>
                 </ul>
             </div>
             <div class="col-lg-3">
diff --git a/Host/Views/Product/Index.cshtml b/Host/Views/Product/Index.cshtml
index c01893b..ca509cc 100644
--- a/Host/Views/Product/Index.cshtml
+++ b/Host/Views/Product/Index.cshtml
@@ -397,10 +397,10 @@
                         </button>
                         <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2">
                             <li role="presentation">
-                                <a role="menuitem" tabindex="-1" onclick="wjdxgd()" style="color: #FF9900;">高端版</a>
+                                <a role="menuitem" tabindex="-1" onclick="wjdxphone()" style="color: #FF9900;">安卓/苹果</a>
                             </li>
                             <li role="presentation">
-                                <a role="menuitem" tabindex="-1" onclick="wjdxpt()"  style="color: #FFCC00;">普通版</a>
+                                <a role="menuitem" tabindex="-1" onclick="wjdxpc()"  style="color: #FFCC00;">电脑</a>
                             </li>
                         </ul>
                     </div>
@@ -513,9 +513,6 @@
 " style="color: #000000;">查看详细地区 </span>
                     </div> *@
                     }
-                    @if(item.Product.Id == 6){
-                       <p class="youhuiNew">本产品目前所有地区都屏蔽QQ微信</p>
-                    }
                     @if(item.Product.Id == 5){
                         <p class="youhuiNew">购买须知：本产品目前所有地区都屏蔽QQ微信</p>
                     }
@@ -544,8 +541,8 @@
                     @if(item.Product.Id == 20){
                         <div style="padding-top:10px;">
                             <ul class="nav nav-tabs nav-justified" style="margin-top:0;">
-                                <li class="active"><a style="width: 500px;"  onclick="wjdxphone()">安卓-苹果</a></li>
-                                <li><a style="width: 500px;" onclick="wjdxpc()">电脑PC</a></li>
+                                <li class="active"><a style="width: 500px;"  onclick="wjdxpt()">普通版</a></li>
+                                <li><a style="width: 500px;" onclick="wjdxgj()">高端版</a></li>
                             </ul>
                         </div>
                     }
@@ -865,8 +862,10 @@
             }
         }
 
+        //1 安卓、苹果 2 pc
         var wjdxtype = 1;
-        function wjdxgd() {
+        function wjdxphone() {
+            wjdxtype = 1;
             for (var i=1048;i<1051;i++){
                 $("#pkg"+i).show();
             }
@@ -875,7 +874,8 @@
             }
         }
         
-        function wjdxpt() {
+        function wjdxpc() {
+            wjdxtype = 2;
             for (var i=1048;i<1054;i++){
                 $("#pkg"+i).hide();
             }
@@ -886,32 +886,46 @@
                 $("#pkg"+i).show();
             }
         }
-         function wjdxphone() {
-            for (var i=1052;i<1054;i++){
-                $("#pkg"+i).hide();
-            }
-            for (var i=1057;i<1060;i++){
-                $("#pkg"+i).hide();
-            }
-            for (var i=1054;i<1057;i++){
-                $("#pkg"+i).show();
-            }
-            for (var i=1048;i<1051;i++){
-                $("#pkg"+i).show();
+        function wjdxpt() {
+            if (wjdxtype == 1) {
+                for (var i=1051;i<1060;i++){
+                    $("#pkg"+i).hide();
+                }
+                for (var i=1048;i<1051;i++){
+                    $("#pkg"+i).show();
+                }
+            } else if (wjdxtype == 2) {
+                for (var i=1048;i<1054;i++){
+                    $("#pkg"+i).hide();
+                }
+                for (var i=1054;i<1057;i++){
+                    $("#pkg"+i).show();
+                }
+                
+                for (var i=1057;i<1060;i++){
+                    $("#pkg"+i).hide();
+                }
             }
         }
-         function wjdxpc() {
-            for (var i=1052;i<1054;i++){
-                $("#pkg"+i).show();
-            }
-            for (var i=1057;i<1060;i++){
-                $("#pkg"+i).show();
-            }
-            for (var i=1054;i<1057;i++){
-                $("#pkg"+i).dide();
-            }
-            for (var i=1048;i<1051;i++){
-                $("#pkg"+i).dide();
+        function wjdxgj() {
+            if (wjdxtype == 1) {
+                for (var i=1048;i<1051;i++){
+                    $("#pkg"+i).hide();
+                }
+                for (var i=1051;i<1054;i++){
+                    $("#pkg"+i).show();
+                }
+                
+                for (var i=1054;i<1060;i++){
+                    $("#pkg"+i).hide();
+                }
+            } else if (wjdxtype == 2) {
+                for (var i=1048;i<1057;i++){
+                    $("#pkg"+i).hide();
+                }
+                for (var i=1057;i<1060;i++){
+                    $("#pkg"+i).show();
+                }
             }
         }
     $(function () {
@@ -947,6 +961,7 @@
                 }
             } else {
                 $("#p14").removeClass("on");
+                $("#p20").removeClass("on");
             }
             select(pid);
         });
diff --git a/Host/Views/Product/buy.cshtml b/Host/Views/Product/buy.cshtml
index 762dcf4..9099b02 100644
--- a/Host/Views/Product/buy.cshtml
+++ b/Host/Views/Product/buy.cshtml
@@ -27,6 +27,13 @@
 
     var randomAccountMutil = ValidateCodeHelper.MakeCharCode(3).ToLower();
 
+    var product_id = Model.Product.Id;
+    if (product_id == 20) {
+        randomAccount1 = ValidateCodeHelper.MakeCharCode(2).ToLower() + ValidateCodeHelper.MakeNumCode(5).ToLower();
+        randomAccountMutil = ValidateCodeHelper.MakeCharCode(6).ToLower();
+        randomPwd = ValidateCodeHelper.MakeNumCode(6).ToLower();
+    }
+
     @* while (m_AccountService.Exist(m =>m.Account.StartsWith(randomAccountMutil)))
     {
         randomAccountMutil = ValidateCodeHelper.MakeCharCode(3).ToLower();
@@ -582,7 +589,7 @@
                 },
                 'MoreBuyModel.CouponId': {    //加引号监听对象里的属性
                     handler: function (newValue, oldValue) {
-                        if( this.OneBuyModel.CouponId == 10000000){
+                        if( this.MoreBuyModel.CouponId == 10000000){
                             return;
                         }
                         var totalAmount = this.MoreBuyModel.Price * this.MoreBuyModel.ConnectCount;
@@ -675,6 +682,16 @@
                     } 
                 },
                 checkOneAccount() {
+                    if (productId == 20) {
+                        if (this.OneBuyModel.Account.length > 10 || this.OneBuyModel.Account.length < 7 || !this.hasNumAndChar(this.OneBuyModel.Account)) {
+                            alert("此产品账号必须大于6位");
+                            this.OneChecker.AccountOk = false;
+                            return false;
+                        }
+                        
+                        this.OneChecker.AccountOk = true;
+                        return true;
+                    }
                     if (this.OneBuyModel.Account.length > 10 || this.OneBuyModel.Account.length < 4 || !this.hasNumAndChar(this.OneBuyModel.Account)) {
                         this.OneChecker.AccountOk = false;
                         return false;
@@ -691,6 +708,16 @@
                     return true;
                 },
                 checkMoreAccount() {
+                    if (productId == 20) {
+                        if (this.MoreBuyModel.Account.length < 6 || this.MoreBuyModel.Account.length > 8 || !this.hasNumAndChar(this.MoreBuyModel.Account)) {
+                            alert("此产品账号必须大于6位");
+                            this.MoreChecker.AccountOk = false;
+                            return false;
+                        }
+                        
+                        this.MoreChecker.AccountOk = true;
+                        return true;
+                    }
                     if (this.MoreBuyModel.Account.length < 2 || this.MoreBuyModel.Account.length > 8 || !this.hasNumAndChar(this.MoreBuyModel.Account)) {
                         this.MoreChecker.AccountOk = false;
                         return false;
diff --git a/Host/Views/Shared/_Layout.cshtml b/Host/Views/Shared/_Layout.cshtml
index abc4ca9..39c6014 100644
--- a/Host/Views/Shared/_Layout.cshtml
+++ b/Host/Views/Shared/_Layout.cshtml
@@ -135,7 +135,7 @@
             <img src="~/img/qq.png" class="on_q">  <div class="kefu_tit">QQ</div>
 
             <div class="side_q"  style="width: 200px;">
-                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:30</h4>
+                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:00</h4>
                 <div class="item" style="padding-left:20%;width:80%;">
                     <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
                         <div class="ileft">
@@ -162,19 +162,19 @@
                 <div class="tab-content" style="margin-top: 60px;">
                     <div role="tabpanel" class="tab-pane active" id="xx">
                         <img src="~/img/kf_sq.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="qq">
                         <img src="~/img/kf_sh.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     @*<div role="tabpanel" class="tab-pane" id="ss">
                         <img src="~/img/w3.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tt">
                         <img src="~/img/w4.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>*@
                 </div>
             </div>
@@ -183,7 +183,7 @@
             <img src="~/img/gzh.png" class="on_gzh"><div class="kefu_tit">公众号</div>
             <div class="side_gzh">
                 <p><img src="~/img/ewm.png"></p>
-                <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                 <p style="color:#f90">关注公众号可获取免费的到期提醒服务</p>
             </div>
 
@@ -193,7 +193,7 @@
             <div class="side_tel">
                 <p><b>400 800 9925</b></p>
                 <p>实时接通</p>
-                <p>电话值班时间 8:30-23:30</p>
+                <p>电话值班时间 8:30-23:00</p>
             </div>
         </div>
         <div class="item">
@@ -258,7 +258,7 @@
                     <img width="100px" src="~/img/kf_sq.jpg?123"><br>
                     <li>客服微信-售后：</li><br>
                     <img width="100px" src="~/img/kf_sh.jpg?123">
-                    <li>工作时间： 8:30-23:30</li>
+                    <li>工作时间： 8:30-23:00</li>
                 </ul>
             </div>
             <div class="col-lg-3">
diff --git a/Host/Views/Shared/_UserLayout.cshtml b/Host/Views/Shared/_UserLayout.cshtml
index 8e32122..44b2b61 100644
--- a/Host/Views/Shared/_UserLayout.cshtml
+++ b/Host/Views/Shared/_UserLayout.cshtml
@@ -79,7 +79,7 @@
             <img src="~/img/qq.png" class="on_q">  <div class="kefu_tit">QQ</div>
 
             <div class="side_q"  style="width: 200px;">
-                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:30</h4>
+                <h4 style="border-bottom:1px solid #ccc;text-align:center;width:100%;padding:5px;">在线时间8:30-23:00</h4>
                 <div class="item" style="padding-left:20%;width:80%;">
                     <a href="https://admin.qidian.qq.com/template/blue/mp/menu/qr-code-jump.html?linkType=0&env=ol&kfuin=2852138148&fid=299&key=f377ec024ca45115a03a7632c7bda230&cate=1&source=&isLBS=&isCustomEntry=&type=16&ftype=1&_type=wpa&qidian=true" target="_blank">
                         <div class="ileft">
@@ -105,19 +105,19 @@
                 <div class="tab-content" style="margin-top: 60px;">
                     <div role="tabpanel" class="tab-pane active" id="xx">
                         <img src="~/img/kf_sq.jpg?123">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="qq">
                         <img src="~/img/kf_sh.jpg?1231">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     @*<div role="tabpanel" class="tab-pane" id="ss">
                         <img src="~/img/w3.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>
                     <div role="tabpanel" class="tab-pane" id="tt">
                         <img src="~/img/w4.png">
-                        <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                        <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                     </div>*@
                 </div>
             </div>
@@ -126,7 +126,7 @@
             <img src="~/img/gzh.png" class="on_gzh"><div class="kefu_tit">公众号</div>
             <div class="side_gzh">
                 <p><img src="~/img/ewm.png"></p>
-                <p style="color:#f90">实时响应 在线时间 8:30-23:30</p>
+                <p style="color:#f90">实时响应 在线时间 8:30-23:00</p>
                 <p style="color:#f90">关注公众号可获取免费的到期提醒服务</p>
             </div>
 
@@ -136,7 +136,7 @@
             <div class="side_tel">
                 <p><b>400 800 9925</b></p>
                 <p>实时接通</p>
-                <p>电话值班时间 8:30-23:30</p>
+                <p>电话值班时间 8:30-23:00</p>
             </div>
         </div>
         <div class="item">
@@ -181,6 +181,10 @@
                 <div class="item @(currentPath=="/user/myaccounts"?"active_b":"")">
                     <img src="~/img/p4.png"><a href="/user/myaccounts">IP账号管理</a>
                 </div>
+                
+                <div class="item @(currentPath=="/user/myaccounts"?"active_b":"")">
+                    <img src="~/img/p3.png"><a href="/user/mymoney">资金明细</a>
+                </div>
                 <div class="item @(currentPath=="/user/rosorder"?"active_b":"")">                   
                     <img src="~/img/p2.png"><a href="/user/rosorder">软路由订单</a>
                 </div>
diff --git a/Host/Views/User/MyMoney.cshtml b/Host/Views/User/MyMoney.cshtml
new file mode 100644
index 0000000..7c22166
--- /dev/null
+++ b/Host/Views/User/MyMoney.cshtml
@@ -0,0 +1,125 @@
+
+@{
+    Layout = "_UserLayout";
+}
+<div id="app">
+    <table class="table">
+    <caption>余额资金明细</caption>
+    <thead>
+        <tr>
+            <th>用户</th>
+            <th>资金去向</th>
+            <th>金额</th>
+            <th>操作前余额</th>
+            <th>操作后余额</th>
+            <th>备注</th>
+            <th>购买时间</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr v-for="info in tableData">
+            <td>{{info.UserName}}</td>
+            <td>{{info.ScoreTypeName}}</td>
+            <td>{{info.ScoreValue}}</td>
+            <td>{{info.RestAmount1}}</td>
+            <td>{{info.RestAmount2}}</td>
+            <td>{{info.Remark}}</td>
+            <td>{{info.CreateTime}}</td>
+        </tr>
+    </tbody>
+    </table>
+    <ul class="pager">
+        <li v-on:click="previous"><a>上一页</a></li>
+        <li v-on:click="next"><a>下一页</a></li>
+    </ul>
+</div>
+<script>
+   var vm = new Vue({
+	    el:'#app',
+	    data:{
+	        tableData: [],
+            page:1
+	    },
+        created:function(){
+            this.post();
+        },
+	    methods:{
+            post:function(){
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+	        },
+            previous(){
+                this.page--;
+                if (this.page<1) {
+                    this.page = 1;
+                }
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie,
+                    page:this.page
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+            },
+            next(){
+                this.page++;
+                if (this.page<1) {
+                    this.page = 1;
+                }
+                var param = [];
+                let cashOutData = {
+                    cookie:document.cookie,
+                    page:this.page
+                }
+                $.ajax({
+                    type: 'post',
+                    async:false,
+                    url: 'http://php-api.juip.com/user/UserScore/getList',
+                    dataType: "json",
+                    contentType: "application/json",
+                    data: JSON.stringify(cashOutData),
+                    beforeSend: function(xhr) {
+                        xhr.withCredentials = true;
+                    },
+                    crossDomain: true,
+                    success: function (res) {
+                        param = res;
+                    }
+                });
+                this.tableData = param;
+            },
+	    }
+	});
+</script>
\ No newline at end of file
diff --git a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
index 808460d..d4dce11 100644
--- a/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
+++ b/Services/Hncore.Pass.Vpn/Service/ProductOrderService.cs
@@ -483,7 +483,7 @@ FROM product_order where {where}  GROUP BY Channel,ProductName order by Channel,
                     AttchInfo = order.OrderNo,
                     OperateUserName = order.UserName,
                 };
-                var ret = await m_BaseUserService.UpdateAmount(amountInfo);
+                var ret = await m_BaseUserService.UpdateAmount(amountInfo,order.ProductName,order.PackageName,order.Accounts);
                 if (ret.Code != ResultCode.C_SUCCESS)
                 {
                     order.OtherPayAmount = order.PaymentAmount;