日常开发

app/Components/Yzy.php

@@ -8,12 +8,10 @@ use Log;
 
 class Yzy
 {
-    protected static $config;
     protected $accessToken;
 
     function __construct()
     {
-        self::$config = $this->systemConfig();
         $this->accessToken = $this->getAccessToken();
     }
 
@@ -29,9 +27,11 @@ class Yzy
             }
         }
 
-        $keys['kdt_id'] = self::$config['kdt_id'];
+        $config = $this->systemConfig();
 
-        $token = (new \Youzan\Open\Token(self::$config['youzan_client_id'], self::$config['youzan_client_secret']))->getToken('self', $keys);
+        $keys['kdt_id'] = $config['kdt_id'];
+
+        $token = (new \Youzan\Open\Token($config['youzan_client_id'], $config['youzan_client_secret']))->getToken('self', $keys);
 
         if (isset($token['error'])) {
             Log::info('获取有赞云支付access_token失败：' . $token['error_description']);

app/Http/Controllers/UserController.php

@@ -1180,6 +1180,7 @@ class UserController extends Controller
 
         // 管理员信息重新写入user
         Session::put('user', Session::get('admin'));
+        Session::forget('admin');
 
         return Response::json(['status' => 'success', 'data' => '', 'message' => "身份切换成功"]);
     }

resources/views/admin/editUser.blade.php

@@ -395,7 +395,7 @@
                 success: function (ret) {
                     layer.msg(ret.message, {time: 1000}, function () {
                         if (ret.status == 'success') {
-                            window.location.href = "/user";
+                            window.location.href = "/";
                         }
                     });
                 }

resources/views/user/buy.blade.php

@@ -131,7 +131,7 @@
                 type: "POST",
                 url: "{{url('payment/create')}}",
                 async: false,
-                data: {_token:'{{csrf_token()}}', id:goods_id, coupon_sn:coupon_sn},
+                data: {_token:'{{csrf_token()}}', goods_id:goods_id, coupon_sn:coupon_sn},
                 dataType: 'json',
                 beforeSend: function () {
                     index = layer.load(1, {

resources/views/user/index.blade.php

@@ -125,6 +125,8 @@
                         </div>
                     </div>
                 </div>
+
+                @if(!$nodeList->isEmpty())
                 <div class="row widget-row">
                     <div class="col-md-12">
                         <div class="portlet light bordered">
@@ -132,47 +134,45 @@
                                 <div class="tab-content">
                                     <div class="tab-pane active">
                                         <div class="mt-comments">
-                                            @if(!$nodeList->isEmpty())
-                                                @foreach($nodeList as $node)
-                                                    <div class="mt-comment">
-                                                        <div class="mt-comment-img" style="width:auto;">
-                                                            @if($node->country_code)
-                                                                <img src="{{asset('assets/images/country/' . $node->country_code . '.png')}}"/>
-                                                            @else
-                                                                <img src="{{asset('/assets/images/country/un.png')}}"/>
-                                                            @endif
+                                            @foreach($nodeList as $node)
+                                                <div class="mt-comment">
+                                                    <div class="mt-comment-img" style="width:auto;">
+                                                        @if($node->country_code)
+                                                            <img src="{{asset('assets/images/country/' . $node->country_code . '.png')}}"/>
+                                                        @else
+                                                            <img src="{{asset('/assets/images/country/un.png')}}"/>
+                                                        @endif
+                                                    </div>
+                                                    <div class="mt-comment-body">
+                                                        <div class="mt-comment-info">
+                                                            <span class="mt-comment-author">{{$node->name}} - {{$node->server ? $node->server : $node->ip}}</span>
+                                                            <span class="mt-comment-date">
+                                                                @if(!$node->online_status)
+                                                                    <span class="badge badge-danger">维护中</span>
+                                                                @endif
+                                                            </span>
                                                         </div>
-                                                        <div class="mt-comment-body">
-                                                            <div class="mt-comment-info">
-                                                                <span class="mt-comment-author">{{$node->name}} - {{$node->server ? $node->server : $node->ip}}</span>
-                                                                <span class="mt-comment-date">
-                                                                    @if(!$node->online_status)
-                                                                        <span class="badge badge-danger">维护中</span>
-                                                                    @endif
-                                                                </span>
-                                                            </div>
-                                                            <div class="mt-comment-text"> {{$node->desc}} </div>
-                                                            <div class="mt-comment-details">
-                                                                <span class="mt-comment-status mt-comment-status-pending">
-                                                                    @if($node->labels)
-                                                                        @foreach($node->labels as $vo)
-                                                                            <span class="badge badge-info">{{$vo->labelInfo->name}}</span>
-                                                                        @endforeach
-                                                                    @endif
-                                                                </span>
-                                                                <ul class="mt-comment-actions" style="display: block;">
-                                                                    <li>
-                                                                        <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#link_{{$node->id}}"> <i class="fa fa-paper-plane"></i> </a>
-                                                                    </li>
-                                                                    <li>
-                                                                        <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#qrcode_{{$node->id}}"> <i class="fa fa-qrcode"></i> </a>
-                                                                    </li>
-                                                                </ul>
-                                                            </div>
+                                                        <div class="mt-comment-text"> {{$node->desc}} </div>
+                                                        <div class="mt-comment-details">
+                                                            <span class="mt-comment-status mt-comment-status-pending">
+                                                                @if($node->labels)
+                                                                    @foreach($node->labels as $vo)
+                                                                        <span class="badge badge-info">{{$vo->labelInfo->name}}</span>
+                                                                    @endforeach
+                                                                @endif
+                                                            </span>
+                                                            <ul class="mt-comment-actions" style="display: block;">
+                                                                <li>
+                                                                    <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#link_{{$node->id}}"> <i class="fa fa-paper-plane"></i> </a>
+                                                                </li>
+                                                                <li>
+                                                                    <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#qrcode_{{$node->id}}"> <i class="fa fa-qrcode"></i> </a>
+                                                                </li>
+                                                            </ul>
                                                         </div>
                                                     </div>
-                                                @endforeach
-                                            @endif
+                                                </div>
+                                            @endforeach
                                         </div>
                                     </div>
                                 </div>
@@ -180,6 +180,7 @@
                         </div>
                     </div>
                 </div>
+                @endif
             </div>
             <div class="col-md-4" style="padding-left: 3px;">
                 <ul class="list-group">

resources/views/user/layouts.blade.php

@@ -117,7 +117,7 @@
                         <span class="selected"></span>
                     </a>
                 </li>
-                <li class="nav-item {{in_array(Request::path(), ['services', 'buy']) || Request::segment(1) == 'payment' ? 'active open' : ''}}">
+                <li class="nav-item {{in_array(Request::path(), ['services']) || in_array(Request::segment(1), ['buy', 'payment']) ? 'active open' : ''}}">
                     <a href="{{url('services')}}" class="nav-link nav-toggle">
                         <i class="icon-basket"></i>
                         <span class="title">{{trans('home.services')}}</span>

resources/views/user/replyTicket.blade.php

@@ -144,9 +144,9 @@
                 data: {_token:'{{csrf_token()}}', id:'{{$ticket->id}}'},
                 dataType: 'json',
                 success: function (ret) {
-                    layer.msg(ret.message, function() {
+                    layer.msg(ret.message, {time:1000}, function() {
                         if (ret.status == 'success') {
-                            window.location.href = '{{url('ticketList')}}';
+                            window.location.href = '{{url('tickets')}}';
                         }
                     });
                 }