From 5643a945ebb3491e3bebc19aeed3a235e724e655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Thu, 22 Oct 2020 03:57:55 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20#66=20=E6=9C=AA=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=94=AF=E4=BB=98=EF=BC=8C=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E5=88=B8=E6=97=A0=E6=B3=95=E5=85=85=E5=80=BC=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/upgradeUserResetTime.php |  3 +--
 resources/views/user/index.blade.php          |  2 +-
 resources/views/user/services.blade.php       | 13 ++++++-------
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/Console/Commands/upgradeUserResetTime.php b/app/Console/Commands/upgradeUserResetTime.php
index ad8ba980..78b97cdd 100644
--- a/app/Console/Commands/upgradeUserResetTime.php
+++ b/app/Console/Commands/upgradeUserResetTime.php
@@ -50,8 +50,7 @@ class upgradeUserResetTime extends Command
                 $user->update(['reset_time' => $reset_time]);
             }
 
-            Log::info('---用户[ID：'.$user->id.' - '.$user->username.' ('.$user->email.')]的新重置日期为'.($reset_time !== null ? '【'.$reset_time.'】' :
-                    '【无】').'---');
+            Log::info('---用户[ID：'.$user->id.' - '.$user->username.' ('.$user->email.')]的新重置日期为'.($reset_time !== null ? '【'.$reset_time.'】' : '【无】').'---');
         }
 
         Log::info('----------------------------【升级用户重置日期】结束----------------------------');
diff --git a/resources/views/user/index.blade.php b/resources/views/user/index.blade.php
index ee196752..da4cf593 100644
--- a/resources/views/user/index.blade.php
+++ b/resources/views/user/index.blade.php
@@ -27,7 +27,7 @@
                                 <p class="ml-15 mt-15 text-left">更长使用<code>时间</code></p>
                                 <p class="text-center">更多<code>流量</code></p>
                                 <p class="mb-15 mr-15 text-right">更多优质<code>线路</code></p>
-                                <a href="/services" class="btn btn-block btn-danger">快 来 购 买 服 务 吧！</a>
+                                <a href="{{route('shop')}}" class="btn btn-block btn-danger">快 来 购 买 服 务 吧！</a>
                             @elseif(Auth::getUser()->enable)
                                 <i class="wb-check green-400 font-size-40 mr-10"></i>
                                 <span class="font-size-40 font-weight-100">{{trans('home.enabled')}}</span>
diff --git a/resources/views/user/services.blade.php b/resources/views/user/services.blade.php
index d840980b..9519650b 100644
--- a/resources/views/user/services.blade.php
+++ b/resources/views/user/services.blade.php
@@ -103,7 +103,7 @@
                 <div class="modal-body">
                     <div class="alert alert-danger" id="charge_msg" style="display: none;"></div>
                     <form action="#" method="post">
-                        @if(sysConfig('is_onlinePay'))
+                        @if(sysConfig('is_onlinePay') || sysConfig('alipay_qrcode') || sysConfig('wechat_qrcode'))
                             <div class="mb-15 w-p50">
                                 <select class="form-control" name="charge_type" id="charge_type">
                                     @if(sysConfig('is_onlinePay'))
@@ -164,7 +164,8 @@
             </div>
         </div>
     </div>
-@endsection @section('script')
+@endsection
+@section('script')
     <script src="assets/global/vendor/ionrangeslider/ion.rangeSlider.min.js"></script>
     <script src="assets/global/js/Plugin/ionrangeslider.js"></script>
     <script type="text/javascript">
@@ -190,16 +191,14 @@
         }
 
         $(document).ready(function() {
-            itemControl(parseInt($('#charge_type').val()));
-            let which_selected;
+            let which_selected = 3;
             @if(sysConfig('is_onlinePay'))
                 which_selected = 1;
             @elseif(sysConfig('alipay_qrcode') || sysConfig('wechat_qrcode'))
                 which_selected = 2;
-            @else
-                which_selected = 3;
             @endif
 
+            itemControl(which_selected);
             $('charge_type').val(which_selected);
         });
 
@@ -238,7 +237,7 @@
 
         // 充值
         function pay(method, pay_type) {
-            const paymentType = parseInt($('#charge_type').val());
+            const paymentType = parseInt($('#charge_type').val() ?? 3);
             const charge_coupon = $('#charge_coupon').val().trim();
             const amount = parseInt($('#amount').val());
             if (paymentType === 1) {