1.页面显示优化

2.积分换流量

_config.yml

@@ -1 +0,0 @@
-theme: jekyll-theme-cayman

app/Http/Controllers/AdminController.php

@@ -70,6 +70,7 @@ class AdminController extends BaseController
         $qq = $request->get('qq');
         $port = $request->get('port');
         $pay_way = $request->get('pay_way');
+        $status = $request->get('status');
         $enable = $request->get('enable');
         $expireWarning = $request->get('expireWarning');
 
@@ -94,6 +95,10 @@ class AdminController extends BaseController
             $query->where('pay_way', intval($pay_way));
         }
 
+        if ($status != '') {
+            $query->where('status', intval($status));
+        }
+
         if ($enable != '') {
             $query->where('enable', intval($enable));
         }
@@ -381,7 +386,7 @@ class AdminController extends BaseController
             $name = $request->get('name');
             $server = $request->get('server');
             $method = $request->get('method');
-            $custom_method = $request->get('custom_method');
+            //$custom_method = $request->get('custom_method');
             $protocol = $request->get('protocol');
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
@@ -398,7 +403,7 @@ class AdminController extends BaseController
                 'name' => $name,
                 'server' => $server,
                 'method' => $method,
-                'custom_method' => $custom_method,
+                'custom_method' => $method,
                 'protocol' => $protocol,
                 'protocol_param' => $protocol_param,
                 'obfs' => $obfs,
@@ -439,7 +444,7 @@ class AdminController extends BaseController
             $name = $request->get('name');
             $server = $request->get('server');
             $method = $request->get('method');
-            $custom_method = $request->get('custom_method');
+            //$custom_method = $request->get('custom_method');
             $protocol = $request->get('protocol');
             $protocol_param = $request->get('protocol_param');
             $obfs = $request->get('obfs');
@@ -456,7 +461,7 @@ class AdminController extends BaseController
                 'name' => $name,
                 'server' => $server,
                 'method' => $method,
-                'custom_method' => $custom_method,
+                'custom_method' => $method,
                 'protocol' => $protocol,
                 'protocol_param' => $protocol_param,
                 'obfs' => $obfs,

app/Http/Controllers/UserController.php

@@ -15,6 +15,7 @@ use App\Http\Models\SsNodeOnlineLog;
 use App\Http\Models\Ticket;
 use App\Http\Models\TicketReply;
 use App\Http\Models\User;
+use App\Http\Models\UserScoreLog;
 use App\Http\Models\UserTrafficLog;
 use App\Http\Models\Verify;
 use App\Mail\activeUser;
@@ -764,4 +765,51 @@ TXT;
         }
     }
 
+    // 积分兑换流量
+    public function exchange(Request $request)
+    {
+        if (!$request->session()->has('user')) {
+            return Redirect::to('login');
+        }
+
+        $user = $request->session()->get('user');
+
+        // 积分满100才可以兑换
+        if ($user['score'] < 100) {
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '兑换失败：满100才可以兑换，请继续累计吧']);
+        }
+
+        DB::beginTransaction();
+        try {
+            // 写入积分操作日志
+            $userScoreLog = new UserScoreLog();
+            $userScoreLog->user_id = $user['id'];
+            $userScoreLog->before = $user['score'];
+            $userScoreLog->after = 0;
+            $userScoreLog->score = -1 * $user['score'];
+            $userScoreLog->desc = '积分兑换流量';
+            $userScoreLog->created_at = date('Y-m-d H:i:s');
+            $userScoreLog->save();
+
+            // 扣积分加流量
+            if ($userScoreLog->id) {
+                User::where('id', $user['id'])->update(['score' => 0]);
+                User::where('id', $user['id'])->increment('transfer_enable', $user['score'] * 1048576);
+            }
+
+            DB::commit();
+
+            // 更新session
+            $user = User::where('id', $user['id'])->first()->toArray();
+            $request->session()->remove('user');
+            $request->session()->put('user', $user);
+
+            return Response::json(['status' => 'success', 'data' => '', 'message' => '兑换成功']);
+        } catch (\Exception $e) {
+            DB::rollBack();
+
+            return Response::json(['status' => 'fail', 'data' => '', 'message' => '兑换失败：' . $e->getMessage()]);
+        }
+    }
+
 }

resources/views/admin/addArticle.blade.php

@@ -40,21 +40,22 @@
                         <form action="{{url('admin/addArticle')}}" method="post" enctype="multipart/form-data" class="form-horizontal form-bordered" onsubmit="return do_submit();">
                             <div class="form-body">
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">标题</label>
+                                    <label class="control-label col-md-1">标题</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="title" id="title" placeholder="" autofocus required>
                                         <input type="hidden" name="_token" value="{{csrf_token()}}">
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">排序</label>
+                                    <label class="control-label col-md-1">排序</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="sort" id="sort" value="0" required />
+                                        <span class="help-block"> 值越高显示时越靠前 </span>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">内容</label>
-                                    <div class="col-md-9">
+                                    <label class="control-label col-md-1">内容</label>
+                                    <div class="col-md-11">
                                         <script id="editor" type="text/plain" style="height:400px;"></script>
                                     </div>
                                 </div>

resources/views/admin/addNode.blade.php

@@ -61,16 +61,6 @@
                                                             </select>
                                                         </div>
                                                     </div>
-                                                    <div class="form-group">
-                                                        <label for="custom_method" class="col-md-3 control-label">自定义加密方式</label>
-                                                        <div class="col-md-8">
-                                                            <select class="form-control" name="custom_method" id="custom_method">
-                                                                @foreach ($method_list as $method)
-                                                                    <option value="{{$method->name}}" @if($method->is_default) selected @endif>{{$method->name}}</option>
-                                                                @endforeach
-                                                            </select>
-                                                        </div>
-                                                    </div>
                                                     <div class="form-group">
                                                         <label for="bandwidth" class="col-md-3 control-label">出口带宽</label>
                                                         <div class="col-md-8">

resources/views/admin/articleList.blade.php

@@ -69,10 +69,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$articleList->total()}} 篇文章</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $articleList->links() }}
                                 </div>

resources/views/admin/editArticle.blade.php

@@ -31,7 +31,7 @@
                 <div class="portlet light form-fit bordered">
                     <div class="portlet-title">
                         <div class="caption">
-                            <span class="caption-subject font-green sbold uppercase">添加文章</span>
+                            <span class="caption-subject font-green sbold uppercase">编辑文章</span>
                         </div>
                         <div class="actions"></div>
                     </div>
@@ -40,21 +40,22 @@
                         <form action="{{url('admin/editArticle')}}" method="post" enctype="multipart/form-data" class="form-horizontal form-bordered" onsubmit="return do_submit();">
                             <div class="form-body">
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">标题</label>
+                                    <label class="control-label col-md-1">标题</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="title" value="{{$article->title}}" id="title" placeholder="" autofocus required>
                                         <input type="hidden" name="_token" value="{{csrf_token()}}">
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">排序</label>
+                                    <label class="control-label col-md-1">排序</label>
                                     <div class="col-md-6">
                                         <input type="text" class="form-control" name="sort" value="{{$article->sort}}" id="sort" value="0" required />
+                                        <span class="help-block"> 值越高显示时越靠前 </span>
                                     </div>
                                 </div>
                                 <div class="form-group">
-                                    <label class="control-label col-md-3">内容</label>
-                                    <div class="col-md-9">
+                                    <label class="control-label col-md-1">内容</label>
+                                    <div class="col-md-11">
                                         <script id="editor" type="text/plain" style="height:400px;">{!! $article->content !!}</script>
                                     </div>
                                 </div>

resources/views/admin/editNode.blade.php

@@ -61,16 +61,6 @@
                                                             </select>
                                                         </div>
                                                     </div>
-                                                    <div class="form-group">
-                                                        <label for="custom_method" class="col-md-3 control-label">自定义加密方式</label>
-                                                        <div class="col-md-8">
-                                                            <select class="form-control" name="custom_method" id="custom_method">
-                                                                @foreach ($method_list as $method)
-                                                                    <option value="{{$method->name}}" @if($method->name == $node->method) selected @endif>{{$method->name}}</option>
-                                                                @endforeach
-                                                            </select>
-                                                        </div>
-                                                    </div>
                                                     <div class="form-group">
                                                         <label for="bandwidth" class="col-md-3 control-label">出口带宽</label>
                                                         <div class="col-md-8">

resources/views/admin/groupList.blade.php

@@ -70,10 +70,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$groupList->total()}} 个节点</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{$groupList->links()}}
                                 </div>

resources/views/admin/inviteList.blade.php

@@ -84,10 +84,10 @@
                                 </table>
                             </div>
                             <div class="row">
-                                <div class="col-md-5 col-sm-5">
+                                <div class="col-md-4 col-sm-4">
                                     <div class="dataTables_info" role="status" aria-live="polite">共 {{$inviteList->total()}} 个邀请码</div>
                                 </div>
-                                <div class="col-md-7 col-sm-7">
+                                <div class="col-md-8 col-sm-8">
                                     <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                         {{ $inviteList->links() }}
                                     </div>

resources/views/admin/nodeList.blade.php

@@ -63,7 +63,7 @@
                                         @foreach($nodeList as $node)
                                             <tr class="odd gradeX">
                                                 <td> {{$node->id}} </td>
-                                                <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容SS </span> @endif </td>
+                                                <td> {{$node->name}} @if ($node->compatible) <span class="label label-warning"> 兼容 </span> @endif </td>
                                                 <td> {{$node->bandwidth}}M </td>
                                                 <td> <span class="label label-danger"> {{$node->load}} </span> </td>
                                                 <td> <span class="label label-danger"> {{$node->online_users}} </span> </td>
@@ -82,10 +82,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$nodeList->total()}} 个节点</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $nodeList->links() }}
                                 </div>

resources/views/admin/trafficLog.blade.php

@@ -65,10 +65,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$trafficLogList->total()}} 条记录</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $trafficLogList->links() }}
                                 </div>

resources/views/admin/userList.blade.php

@@ -58,9 +58,17 @@
                                     <option value="3" @if(Request::get('pay_way') == '3') selected @endif>年付</option>
                                 </select>
                             </div>
+                            <div class="col-md-2 col-sm-2">
+                                <select class="form-control input-sm" name="status" id="status" onChange="do_search()">
+                                    <option value="" @if(empty(Request::get('status'))) selected @endif>状态</option>
+                                    <option value="-1" @if(Request::get('status') == '-1') selected @endif>禁用</option>
+                                    <option value="0" @if(Request::get('status') == '0') selected @endif>未激活</option>
+                                    <option value="1" @if(Request::get('status') == '1') selected @endif>正常</option>
+                                </select>
+                            </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="enable" id="enable" onChange="do_search()">
-                                    <option value="" @if(empty(Request::get('enable'))) selected @endif>状态</option>
+                                    <option value="" @if(empty(Request::get('enable'))) selected @endif>SS(R)状态</option>
                                     <option value="1" @if(Request::get('enable') == '1') selected @endif>启用</option>
                                     <option value="0" @if(Request::get('enable') == '0') selected @endif>禁用</option>
                                 </select>
@@ -136,10 +144,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
-                                <div class="dataTables_info" role="status" aria-live="polite">共 {{$userList->total()}} 个用户</div>
+                            <div class="col-md-4 col-sm-4">
+                                <div class="dataTables_info" role="status" aria-live="polite">共 {{$userList->total()}} 个账号</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $userList->links() }}
                                 </div>
@@ -207,9 +215,10 @@
             var qq = $("#qq").val();
             var port = $("#port").val();
             var pay_way = $("#pay_way option:checked").val();
+            var status = $("#status option:checked").val();
             var enable = $("#enable option:checked").val();
 
-            window.location.href = '{{url('admin/userList')}}' + '?username=' + username + '&wechat=' + wechat + '&qq=' + qq + '&port=' + port + '&pay_way=' + pay_way + '&enable=' + enable;
+            window.location.href = '{{url('admin/userList')}}' + '?username=' + username + '&wechat=' + wechat + '&qq=' + qq + '&port=' + port + '&pay_way=' + pay_way + '&status=' + status + '&enable=' + enable;
         }
 
         // 重置

resources/views/coupon/couponList.blade.php

@@ -99,10 +99,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$couponList->total()}} 张优惠券</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $couponList->links() }}
                                 </div>

resources/views/shop/goodsList.blade.php

@@ -80,10 +80,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$goodsList->total()}} 个商品</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $goodsList->links() }}
                                 </div>

resources/views/ticket/ticketList.blade.php

@@ -65,10 +65,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$ticketList->total()}} 个工单</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $ticketList->links() }}
                                 </div>

resources/views/user/goodsList.blade.php

@@ -71,10 +71,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$goodsList->total()}} 个流量包</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $goodsList->links() }}
                                 </div>

resources/views/user/index.blade.php

@@ -31,22 +31,22 @@
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content">
         <!-- BEGIN PAGE BASE CONTENT -->
+        @if(!$articleList->isEmpty())
         <div class="row">
             <div class="col-md-12">
                 <div class="ticker">
-                    @if(!$articleList->isEmpty())
-                        <ul>
-                            @foreach($articleList as $k => $article)
-                                <li>
-                                    <i class="fa fa-bell-o"></i>
-                                    <a href="{{url('user/article?id=') . $article->id}}" class="alert-link" target="_blank"> {{$article->title}} </a>
-                                </li>
-                            @endforeach
-                        </ul>
-                    @endif
+                    <ul>
+                        @foreach($articleList as $k => $article)
+                            <li>
+                                <i class="fa fa-bell-o"></i>
+                                <a href="{{url('user/article?id=') . $article->id}}" class="alert-link" target="_blank"> {{$article->title}} </a>
+                            </li>
+                        @endforeach
+                    </ul>
                 </div>
             </div>
         </div>
+        @endif
         @if (Session::has('successMsg'))
             <div class="alert alert-success">
                 <button class="close" data-close="alert"></button>
@@ -78,13 +78,15 @@
                                     </li>
                                     <li class="list-group-item">
                                         积分：{{$info['score']}}
-                                        <span class="badge badge-default"><a href="{{url('user/goodsList')}}">兑换</a></span>
+                                        <span class="badge badge-default">
+                                            <a href="javascript:;" data-toggle="modal" data-target="#excharge_modal">兑换流量</a>
+                                        </span>
                                     </li>
                                     <li class="list-group-item">
                                         剩余流量：{{$info['totalTransfer']}}
                                     </li>
                                     <li class="list-group-item">
-                                        账号到期：{{$info['expire_time']}}
+                                        账号到期：{{date('Y-m-d 0:0:0') > $info['expire_time'] ? '已过期' : $info['expire_time']}}
                                     </li>
                                     <li class="list-group-item">
                                         最后登录：{{empty($info['last_login']) ? '未登录' : date('Y-m-d H:i:s', $info['last_login'])}}
@@ -169,6 +171,23 @@
                 </div>
             </div>
         </div>
+        <div id="excharge_modal" class="modal fade" tabindex="-1" data-focus-on="input:first" data-keyboard="false">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-hidden="true"></button>
+                        <h4 class="modal-title"> 兑换流量 </h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="alert alert-info" id="msg">您有 {{$info['score']}} 积分，共计可兑换 {{$info['score']}}M 流量。</div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" data-dismiss="modal" class="btn dark btn-outline">取消</button>
+                        <button type="button" class="btn red btn-outline" onclick="return exchange();">立即兑换</button>
+                    </div>
+                </div>
+            </div>
+        </div>
         <!-- END PAGE BASE CONTENT -->
     </div>
     <!-- END CONTENT BODY -->
@@ -208,5 +227,27 @@
                 }
             }).data('easyTicker');
         });
+
+        // 积分兑换流量
+        function exchange() {
+            $.ajax({
+                type: "POST",
+                url: "{{url('user/exchange')}}",
+                async: false,
+                data: {_token:'{{csrf_token()}}'},
+                dataType: 'json',
+                success: function (ret) {
+                    if (ret.status == 'success') {
+                        bootbox.alert(ret.message, function () {
+                            window.location.reload();
+                        });
+                    } else {
+                        bootbox.alert(ret.message);
+                    }
+                }
+            });
+
+            return false;
+        }
     </script>
 @endsection

resources/views/user/invite.blade.php

@@ -82,10 +82,10 @@
                                 </table>
                             </div>
                             <div class="row">
-                                <div class="col-md-5 col-sm-5">
+                                <div class="col-md-4 col-sm-4">
                                     <div class="dataTables_info" role="status" aria-live="polite">共 {{$inviteList->total()}} 个邀请码</div>
                                 </div>
-                                <div class="col-md-7 col-sm-7">
+                                <div class="col-md-8 col-sm-8">
                                     <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                         {{ $inviteList->links() }}
                                     </div>

resources/views/user/layouts.blade.php

@@ -134,8 +134,8 @@
                 </li>
                 <li class="nav-item {{in_array(Request::getRequestUri(), ['/user/orderList']) ? 'active open' : ''}}">
                     <a href="{{url('user/orderList')}}" class="nav-link nav-toggle">
-                        <i class="icon-basket"></i>
-                        <span class="title">订单</span>
+                        <i class="icon-wallet"></i>
+                        <span class="title">消费记录</span>
                     </a>
                 </li>
                 <li class="nav-item {{Request::getRequestUri() == '/user/ticketList' ? 'active open' : ''}}">

resources/views/user/nodeList.blade.php

@@ -73,10 +73,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$nodeList->total()}} 个节点</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $nodeList->links() }}
                                 </div>

resources/views/user/orderList.blade.php

@@ -16,7 +16,7 @@
         <!-- BEGIN PAGE BREADCRUMB -->
         <ul class="page-breadcrumb breadcrumb">
             <li>
-                <a href="{{url('user/orderList')}}">订单</a>
+                <a href="{{url('user/orderList')}}">消费记录</a>
                 <i class="fa fa-circle"></i>
             </li>
         </ul>
@@ -28,8 +28,8 @@
                 <div class="portlet light bordered">
                     <div class="portlet-title">
                         <div class="caption font-dark">
-                            <i class="icon-basket font-dark"></i>
-                            <span class="caption-subject bold uppercase"> 订单列表 </span>
+                            <i class="icon-wallet font-dark"></i>
+                            <span class="caption-subject bold uppercase"> 消费记录 </span>
                         </div>
                     </div>
                     <div class="portlet-body">
@@ -37,9 +37,10 @@
                             <table class="table table-striped table-bordered table-hover table-checkable order-column" id="sample_1">
                                 <thead>
                                     <tr>
+                                        <th> ID </th>
                                         <th> 订单编号 </th>
                                         <th> 商品信息 </th>
-                                        <th> 状态 </th>
+                                        <th> 创建时间 </th>
                                     </tr>
                                 </thead>
                                 <tbody>
@@ -50,23 +51,14 @@
                                 @else
                                     @foreach($orderList as $key => $order)
                                         <tr class="odd gradeX">
+                                            <td> {{$key + 1}} </td>
                                             <td> {{$order->orderId}} </td>
                                             <td>
                                                 @foreach($order->goodsList as $goods)
-                                                    商品名称：{{$goods->goods_name}}（￥{{$goods->price}}
+                                                    {{$goods->goods_name}}（￥{{$goods->price}}）
                                                 @endforeach
                                             </td>
-                                            <td>
-                                                @if($order->status == -1)
-                                                    <span class="label label-default"> 已关闭 </span>
-                                                @elseif($order->status == 1)
-                                                    <span class="label label-danger"> 已支付待确认 </span>
-                                                @elseif($order->status == 2)
-                                                    <span class="label label-success"> 已完成 </span>
-                                                @else
-                                                    <span class="label label-info"> 待支付 </span>
-                                                @endif
-                                            </td>
+                                            <td>{{$order->created_at}}</td>
                                         </tr>
                                     @endforeach
                                 @endif

resources/views/user/ticketList.blade.php

@@ -68,10 +68,10 @@
                             </table>
                         </div>
                         <div class="row">
-                            <div class="col-md-5 col-sm-5">
+                            <div class="col-md-4 col-sm-4">
                                 <div class="dataTables_info" role="status" aria-live="polite">共 {{$ticketList->total()}} 个工单</div>
                             </div>
-                            <div class="col-md-7 col-sm-7">
+                            <div class="col-md-8 col-sm-8">
                                 <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
                                     {{ $ticketList->links() }}
                                 </div>

routes/web.php

@@ -68,6 +68,7 @@ Route::any('resetPassword', 'UserController@resetPassword'); // 重设密码
 Route::any('reset/{token}', 'UserController@reset'); // 重设密码
 Route::any('activeUser', 'UserController@activeUser'); // 激活账号
 Route::any('active/{token}', 'UserController@active'); // 激活账号
+Route::post('user/exchange', 'UserController@exchange'); // 积分兑换流量
 
 Route::any('shop/goodsList', 'ShopController@goodsList'); // 商品列表
 Route::any('shop/addGoods', 'ShopController@addGoods'); // 添加商品