代码优化

app/Http/Controllers/LoginController.php

@@ -108,13 +108,7 @@ class LoginController extends Controller
                 }
             }
 
-            $view['is_captcha'] = self::$systemConfig['is_captcha'];
-            $view['is_register'] = self::$systemConfig['is_register'];
-            $view['website_home_logo'] = self::$systemConfig['website_home_logo'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
-            return Response::view('login', $view);
+            return Response::view('login');
         }
     }
 

app/Http/Controllers/RegisterController.php

@@ -234,15 +234,7 @@ class RegisterController extends Controller
         } else {
             Session::put('register_token', makeRandStr(16));
 
-            $view['is_captcha'] = self::$systemConfig['is_captcha'];
-            $view['is_register'] = self::$systemConfig['is_register'];
-            $view['website_home_logo'] = self::$systemConfig['website_home_logo'];
-            $view['is_invite_register'] = self::$systemConfig['is_invite_register'];
-            $view['is_free_code'] = self::$systemConfig['is_free_code'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
-            return Response::view('register', $view);
+            return Response::view('register');
         }
     }
 

app/Http/Controllers/UserController.php

@@ -60,16 +60,9 @@ class UserController extends Controller
 
         $view['info'] = $user->toArray();
         $view['notice'] = Article::query()->where('type', 2)->where('is_del', 0)->orderBy('id', 'desc')->first();
-        $view['wechat_qrcode'] = self::$systemConfig['wechat_qrcode'];
-        $view['alipay_qrcode'] = self::$systemConfig['alipay_qrcode'];
-        $view['login_add_score'] = self::$systemConfig['login_add_score'];
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-        $view['is_push_bear'] = self::$systemConfig['is_push_bear'];
-        $view['push_bear_qrcode'] = self::$systemConfig['push_bear_qrcode'];
         $view['ipa_list'] = 'itms-services://?action=download-manifest&url=' . self::$systemConfig['website_url'] . '/clients/ipa.plist';
         $view['goodsList'] = Goods::query()->where('type', 3)->where('status', 1)->where('is_del', 0)->orderBy('sort', 'desc')->orderBy('price', 'asc')->limit(10)->get(); // 余额充值商品，只取10个
+        $view['userLoginLog'] = UserLoginLog::query()->where('user_id', Auth::user()->id)->orderBy('id', 'desc')->limit(10)->get(); // 近期登录日志
 
         // 推广返利是否可见
         if (!Session::has('referral_status')) {
@@ -93,9 +86,6 @@ class UserController extends Controller
         $view['subscribe_status'] = !$subscribe ? 1 : $subscribe->status;
         $view['link'] = self::$systemConfig['subscribe_domain'] ? self::$systemConfig['subscribe_domain'] . '/s/' . $code : self::$systemConfig['website_url'] . '/s/' . $code;
 
-        // 近期登录日志
-        $view['userLoginLog'] = UserLoginLog::query()->where('user_id', Auth::user()->id)->orderBy('id', 'desc')->limit(10)->get();
-
         // 节点列表
         $userLabelIds = UserLabel::query()->where('user_id', Auth::user()->id)->pluck('label_id');
         if (empty($userLabelIds)) {
@@ -215,10 +205,6 @@ class UserController extends Controller
             return Redirect::to('/');
         }
 
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
         return Response::view('user.article', $view);
     }
 
@@ -333,9 +319,6 @@ class UserController extends Controller
             $view['protocol_list'] = Helpers::protocolList();
             $view['obfs_list'] = Helpers::obfsList();
             $view['info'] = User::query()->where('id', Auth::user()->id)->first();
-            $view['website_logo'] = self::$systemConfig['website_logo'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
 
             return Response::view('user.profile', $view);
         }
@@ -381,10 +364,6 @@ class UserController extends Controller
         $view['trafficHourly'] = "'" . implode("','", $hourlyData) . "'";
         $view['monthDays'] = "'" . implode("','", $monthDays) . "'";
 
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
         return Response::view('user.trafficLog', $view);
     }
 
@@ -392,9 +371,6 @@ class UserController extends Controller
     public function goodsList(Request $request)
     {
         $view['goodsList'] = Goods::query()->where('status', 1)->where('is_del', 0)->where('type', '<=', '2')->orderBy('type', 'desc')->orderBy('sort', 'desc')->paginate(10)->appends($request->except('page'));
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
 
         return Response::view('user.goodsList', $view);
     }
@@ -402,10 +378,6 @@ class UserController extends Controller
     // 工单
     public function ticketList(Request $request)
     {
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
         $view['ticketList'] = Ticket::query()->where('user_id', Auth::user()->id)->orderBy('id', 'desc')->paginate(10)->appends($request->except('page'));
 
         return Response::view('user.ticketList', $view);
@@ -415,9 +387,6 @@ class UserController extends Controller
     public function orderList(Request $request)
     {
         $view['orderList'] = Order::query()->with(['user', 'goods', 'coupon', 'payment'])->where('user_id', Auth::user()->id)->orderBy('oid', 'desc')->paginate(10)->appends($request->except('page'));
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
 
         return Response::view('user.orderList', $view);
     }
@@ -425,9 +394,6 @@ class UserController extends Controller
     // 订单明细
     public function orderDetail(Request $request, $sn)
     {
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
         $view['order'] = Order::query()->with(['goods', 'coupon', 'payment'])->where('order_sn', $sn)->firstOrFail();
 
         return Response::view('user.orderDetail', $view);
@@ -534,10 +500,6 @@ class UserController extends Controller
             $view['ticket'] = $ticket;
             $view['replyList'] = TicketReply::query()->where('ticket_id', $id)->with('user')->orderBy('id', 'asc')->get();
 
-            $view['website_logo'] = self::$systemConfig['website_logo'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-
             return Response::view('user.replyTicket', $view);
         }
     }
@@ -561,9 +523,6 @@ class UserController extends Controller
         // 已生成的邀请码数量
         $num = Invite::query()->where('uid', Auth::user()->id)->count();
 
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
         $view['num'] = self::$systemConfig['invite_num'] - $num <= 0 ? 0 : self::$systemConfig['invite_num'] - $num; // 还可以生成的邀请码数量
         $view['inviteList'] = Invite::query()->where('uid', Auth::user()->id)->with(['generator', 'user'])->paginate(10); // 邀请码列表
         $view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * 1048576);
@@ -575,11 +534,6 @@ class UserController extends Controller
     // 公开的邀请码列表
     public function free(Request $request)
     {
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-        $view['is_invite_register'] = self::$systemConfig['is_invite_register'];
-        $view['is_free_code'] = self::$systemConfig['is_free_code'];
         $view['inviteList'] = Invite::query()->where('uid', 0)->where('status', 0)->paginate();
 
         return Response::view('user.free', $view);
@@ -671,9 +625,7 @@ class UserController extends Controller
 
             return Redirect::back();
         } else {
-            $view['is_active_register'] = self::$systemConfig['is_active_register'];
-
-            return Response::view('user.activeUser', $view);
+            return Response::view('user.activeUser');
         }
     }
 
@@ -792,12 +744,7 @@ class UserController extends Controller
 
             return Redirect::back();
         } else {
-            $view['website_home_logo'] = self::$systemConfig['website_home_logo'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
-            $view['is_reset_password'] = self::$systemConfig['is_reset_password'];
-
-            return Response::view('user.resetPassword', $view);
+            return Response::view('user.resetPassword');
         }
     }
 
@@ -874,7 +821,6 @@ class UserController extends Controller
                 return Response::view('user.reset', $view);
             }
 
-            $view['website_home_logo'] = self::$systemConfig['website_home_logo'];
             $view['verify'] = $verify;
 
             return Response::view('user.reset', $view);
@@ -1120,9 +1066,6 @@ class UserController extends Controller
 
             $view['goods'] = $goods;
             $view['is_youzan'] = self::$systemConfig['is_youzan'];
-            $view['website_logo'] = self::$systemConfig['website_logo'];
-            $view['website_analytics'] = self::$systemConfig['website_analytics'];
-            $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
 
             return Response::view('user.buy', $view);
         }
@@ -1170,9 +1113,6 @@ class UserController extends Controller
     // 推广返利
     public function referral(Request $request)
     {
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
         $view['referral_traffic'] = flowAutoShow(self::$systemConfig['referral_traffic'] * 1048576);
         $view['referral_percent'] = self::$systemConfig['referral_percent'];
         $view['referral_money'] = self::$systemConfig['referral_money'];
@@ -1230,9 +1170,6 @@ class UserController extends Controller
     // 帮助中心
     public function help(Request $request)
     {
-        $view['website_logo'] = self::$systemConfig['website_logo'];
-        $view['website_analytics'] = self::$systemConfig['website_analytics'];
-        $view['website_customer_service'] = self::$systemConfig['website_customer_service'];
         $view['articleList'] = Article::query()->where('type', 1)->where('is_del', 0)->orderBy('sort', 'desc')->orderBy('id', 'desc')->limit(10)->paginate(15);
 
         return Response::view('user.help', $view);

resources/views/login.blade.php

@@ -32,8 +32,8 @@
 <body class=" login">
 <!-- BEGIN LOGO -->
 <div class="logo">
-    @if($website_home_logo)
-        <a href="javascript:;"> <img src="{{$website_home_logo}}" alt="" style="width:300px; height:90px;"/> </a>
+    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
     @else
         <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
     @endif
@@ -97,7 +97,7 @@
             <input class="form-control form-control-solid placeholder-no-fix" type="password" autocomplete="off" placeholder="{{trans('login.password')}}" name="password" value="{{Request::old('password')}}" />
             <input type="hidden" name="_token" value="{{csrf_token()}}" />
         </div>
-        @if($is_captcha)
+        @if(\App\Components\Helpers::systemConfig()['is_captcha'])
             <div class="form-group" style="margin-bottom:65px;">
                 <label class="control-label visible-ie8 visible-ie9">{{trans('login.captcha')}}</label>
                 <input class="form-control form-control-solid placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('login.captcha')}}" name="captcha" value="" />
@@ -118,7 +118,7 @@
         <div class="form-actions">
             <button type="submit" class="btn red btn-block uppercase">{{trans('login.login')}}</button>
         </div>
-        @if($is_register)
+        @if(\App\Components\Helpers::systemConfig()['is_register'])
             <div class="create-account">
                 <p>
                     <a href="{{url('register')}}" class="btn-primary btn">{{trans('login.register')}}</a>
@@ -154,9 +154,9 @@
 </script>
 
 <!-- 统计 -->
-{!! $website_analytics !!}
+{!! \App\Components\Helpers::systemConfig()['website_analytics'] !!}
 <!-- 客服 -->
-{!! $website_customer_service !!}
+{!! \App\Components\Helpers::systemConfig()['website_customer_service'] !!}
 </body>
 
 </html>

resources/views/register.blade.php

@@ -32,8 +32,8 @@
 <body class=" login">
 <!-- BEGIN LOGO -->
 <div class="logo">
-    @if($website_home_logo)
-        <a href="javascript:;"> <img src="{{$website_home_logo}}" alt="" style="width:300px; height:90px;"/> </a>
+    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
     @else
         <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
     @endif
@@ -72,7 +72,7 @@
     </nav>
     <!-- BEGIN REGISTRATION FORM -->
     <form class="register-form" action="{{url('register')}}" method="post" style="display: block;">
-        @if($is_register)
+        @if(\App\Components\Helpers::systemConfig()['is_register'])
             @if(Session::get('errorMsg'))
                 <div class="alert alert-danger">
                     <button class="close" data-close="alert"></button>
@@ -94,16 +94,16 @@
                 <label class="control-label visible-ie8 visible-ie9">{{trans('register.retype_password')}}</label>
                 <input class="form-control placeholder-no-fix" type="password" autocomplete="off" placeholder="{{trans('register.retype_password')}}" name="repassword" value="{{Request::old('repassword')}}" required />
             </div>
-            @if($is_invite_register)
+            @if(\App\Components\Helpers::systemConfig()['is_invite_register'])
                 <div class="form-group">
                     <label class="control-label visible-ie8 visible-ie9">{{trans('register.code')}}</label>
-                    <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="{{trans('register.code')}}" name="code" value="{{Request::old('code') ? Request::old('code') : Request::get('code')}}" @if($is_invite_register == 2) required @endif />
+                    <input class="form-control placeholder-no-fix" type="text" autocomplete="off" placeholder="{{trans('register.code')}}" name="code" value="{{Request::old('code') ? Request::old('code') : Request::get('code')}}" @if(\App\Components\Helpers::systemConfig()['is_invite_register'] == 2) required @endif />
                 </div>
-                @if($is_free_code)
+                @if(\App\Components\Helpers::systemConfig()['is_free_code'])
                     <p class="hint"> <a href="{{url('free')}}" target="_blank">{{trans('register.get_free_code')}}</a> </p>
                 @endif
             @endif
-            @if($is_captcha)
+            @if(\App\Components\Helpers::systemConfig()['is_captcha'])
                 <div class="form-group" style="margin-bottom:75px;">
                     <label class="control-label visible-ie8 visible-ie9">{{trans('register.captcha')}}</label>
                     <input class="form-control placeholder-no-fix" style="width:60%;float:left;" type="text" autocomplete="off" placeholder="{{trans('register.captcha')}}" name="captcha" value="" required />
@@ -124,7 +124,7 @@
         @endif
         <div class="form-actions">
             <button type="button" class="btn btn-default" onclick="login()">{{trans('register.back')}}</button>
-            @if($is_register)
+            @if(\App\Components\Helpers::systemConfig()['is_register'])
                 <button type="submit" class="btn red uppercase pull-right">{{trans('register.submit')}}</button>
             @endif
         </div>
@@ -185,9 +185,9 @@
 
 
 <!-- 统计 -->
-{!! $website_analytics !!}
+{!! \App\Components\Helpers::systemConfig()['website_analytics'] !!}
 <!-- 客服 -->
-{!! $website_customer_service !!}
+{!! \App\Components\Helpers::systemConfig()['website_customer_service'] !!}
 </body>
 
 </html>

resources/views/user/active.blade.php

@@ -32,7 +32,11 @@
 <body class="login">
 <!-- BEGIN LOGO -->
 <div class="logo">
-    <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
+    @else
+        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+    @endif
 </div>
 <!-- END LOGO -->
 <!-- BEGIN LOGIN -->

resources/views/user/activeUser.blade.php

@@ -32,7 +32,11 @@
 <body class=" login">
 <!-- BEGIN LOGO -->
 <div class="logo">
-    <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+    @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+        <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
+    @else
+        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+    @endif
 </div>
 <!-- END LOGO -->
 <!-- BEGIN LOGIN -->
@@ -80,7 +84,7 @@
     @endif
     <!-- BEGIN FORGOT PASSWORD FORM -->
     <form class="forget-form" action="{{url('activeUser')}}" method="post" style="display: block;">
-        @if($is_active_register)
+        @if(\App\Components\Helpers::systemConfig()['is_active_register'])
             <div class="form-title">
                 <span class="form-title">{{trans('active.title')}}</span>
             </div>
@@ -95,7 +99,7 @@
         @endif
         <div class="form-actions">
             <button type="button" class="btn btn-default" onclick="login()">{{trans('active.back')}}</button>
-            @if($is_active_register)
+            @if(\App\Components\Helpers::systemConfig()['is_active_register'])
                 <button type="submit" class="btn red uppercase pull-right">{{trans('active.submit')}}</button>
             @endif
         </div>

resources/views/user/free.blade.php

@@ -76,8 +76,8 @@
                         <div class="portlet-body">
                             <div class="table-scrollable table-scrollable-borderless">
                                 <table class="table table-hover table-light">
-                                    @if($is_invite_register)
-                                        @if($is_free_code)
+                                    @if(\App\Components\Helpers::systemConfig()['is_invite_register'])
+                                        @if(\App\Components\Helpers::systemConfig()['is_free_code'])
                                             <thead>
                                                 <tr>
                                                     <th style="text-align: center;"> {{trans('home.invite_code_table_name')}} </th>
@@ -114,7 +114,7 @@
                                     @endif
                                 </table>
                             </div>
-                            @if($is_invite_register && $is_free_code)
+                            @if(\App\Components\Helpers::systemConfig()['is_invite_register'] && \App\Components\Helpers::systemConfig()['is_free_code'])
                                 <div class="row">
                                     <div class="col-md-12 col-sm-12">
                                         <div class="dataTables_paginate paging_bootstrap_full_number pull-right">

resources/views/user/index.blade.php

@@ -201,7 +201,7 @@
                             {{trans('home.account_status')}}：{{trans('home.disabled')}}
                     </li>
                     @endif
-                    @if($login_add_score)
+                    @if(\App\Components\Helpers::systemConfig()['login_add_score'])
                         <li class="list-group-item">
                             {{trans('home.account_score')}}：{{$info['score']}}
                             <span class="badge badge-info">
@@ -240,7 +240,7 @@
                     </li>
                 </ul>
 
-                @if($is_push_bear && $push_bear_qrcode)
+                @if(\App\Components\Helpers::systemConfig()['is_push_bear'] && \App\Components\Helpers::systemConfig()['push_bear_qrcode'])
                     <ul class="list-group" style="border-radius: 4px;">
                         <li class="list-group-item">
                             <div style="text-align: center">
@@ -534,8 +534,8 @@
         }
 
         // 生成消息通道订阅二维码
-        @if($is_push_bear && $push_bear_qrcode)
-            $('#subscribe_qrcode').qrcode({render:"canvas", text:"{{$push_bear_qrcode}}", width:170, height:170});
+        @if(\App\Components\Helpers::systemConfig()['push_bear_qrcode'])
+            $('#subscribe_qrcode').qrcode({render:"canvas", text:"{{\App\Components\Helpers::systemConfig()['push_bear_qrcode']}}", width:170, height:170});
         @endif
 
         // 更换订阅地址

resources/views/user/layouts.blade.php

@@ -40,8 +40,8 @@
     <div class="page-header-inner ">
         <!-- BEGIN LOGO -->
         <div class="page-logo">
-            @if($website_logo)
-                <a href="{{url('/')}}"><img src="{{$website_logo}}" alt="logo" class="logo-default" style="width:150px; height:30px;"/> </a>
+            @if(\App\Components\Helpers::systemConfig()['website_logo'])
+                <a href="{{url('/')}}"><img src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" alt="logo" class="logo-default" style="width:150px; height:30px;"/> </a>
             @else
                 <a href="{{url('/')}}"><img src="/assets/images/logo.png" alt="logo" class="logo-default" /> </a>
             @endif
@@ -250,9 +250,9 @@
 </script>
 
 <!-- 统计 -->
-{!! $website_analytics !!}
+{!! \App\Components\Helpers::systemConfig()['website_analytics'] !!}
 <!-- 客服 -->
-{!! $website_customer_service !!}
+{!! \App\Components\Helpers::systemConfig()['website_customer_service'] !!}
 </body>
 
 </html>

resources/views/user/reset.blade.php

@@ -32,7 +32,11 @@
 <body class=" login">
     <!-- BEGIN LOGO -->
     <div class="logo">
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+        @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+            <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
+        @else
+            <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+        @endif
     </div>
     <!-- END LOGO -->
     <!-- BEGIN LOGIN -->

resources/views/user/resetPassword.blade.php

@@ -32,7 +32,11 @@
 <body class=" login">
     <!-- BEGIN LOGO -->
     <div class="logo">
-        <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+        @if(\App\Components\Helpers::systemConfig()['website_home_logo'])
+            <a href="javascript:;"> <img src="{{\App\Components\Helpers::systemConfig()['website_home_logo']}}" alt="" style="width:300px; height:90px;"/> </a>
+        @else
+            <a href="javascript:;"> <img src="/assets/images/home_logo.png" alt="" /> </a>
+        @endif
     </div>
     <!-- END LOGO -->
     <!-- BEGIN LOGIN -->
@@ -80,7 +84,7 @@
         @endif
         <!-- BEGIN FORGOT PASSWORD FORM -->
         <form class="forget-form" action="{{url('resetPassword')}}" method="post" style="display: block;">
-            @if($is_reset_password)
+            @if(\App\Components\Helpers::systemConfig()['is_reset_password'])
                 <div class="form-title">
                     <span class="form-title">{{trans('home.reset_password_title')}}</span>
                 </div>
@@ -95,7 +99,7 @@
             @endif
             <div class="form-actions">
                 <button type="button" class="btn btn-default" onclick="login()">{{trans('register.back')}}</button>
-                @if($is_reset_password)
+                @if(\App\Components\Helpers::systemConfig()['is_reset_password'])
                     <button type="submit" class="btn red uppercase pull-right">{{trans('register.submit')}}</button>
                 @endif
             </div>
@@ -118,9 +122,9 @@
         }
     </script>
     <!-- 统计 -->
-    {!! $website_analytics !!}
+    {!! \App\Components\Helpers::systemConfig()['website_analytics'] !!}
     <!-- 客服 -->
-    {!! $website_customer_service !!}
+    {!! \App\Components\Helpers::systemConfig()['website_customer_service'] !!}
 </body>
 
 </html>