1.用户界面改进

2.优惠券已使用的沉底

app/Http/Controllers/CouponController.php

@@ -20,7 +20,7 @@ class CouponController extends Controller
     // 优惠券列表
     public function couponList(Request $request)
     {
-        $couponList = Coupon::query()->where('is_del', 0)->orderBy('id', 'desc')->paginate(10);
+        $couponList = Coupon::query()->where('is_del', 0)->orderBy('status', 'asc')->orderBy('id', 'desc')->paginate(10);
         foreach ($couponList as $coupon) {
             $coupon->amount = $coupon->amount / 100;
         }

app/Http/Controllers/SubscribeController.php

@@ -91,7 +91,7 @@ class SubscribeController extends Controller
             $ssr_str .= ($node->server ? $node->server : $node->ip) . ':' . ($node->single ? $node->single_port : $user->port);
             $ssr_str .= ':' . ($node->single ? $node->single_protocol : $user->protocol) . ':' . ($node->single ? $node->single_method : $user->method);
             $ssr_str .= ':' . ($node->single ? $node->single_obfs : $user->obfs) . ':' . ($node->single ? base64url_encode($node->single_passwd) : base64url_encode($user->passwd));
-            $ssr_str .= '/?obfsparam=' . ($node->single ? '' : base64url_encode($obfs_param));
+            $ssr_str .= '/?obfsparam=' . base64url_encode($obfs_param);
             $ssr_str .= '&protoparam=' . ($node->single ? base64url_encode($user->port . ':' . $user->passwd) : base64url_encode($protocol_param));
             $ssr_str .= '&remarks=' . base64url_encode($node->name);
             $ssr_str .= '&group=' . base64url_encode(empty($group) ? '' : $group->name);

app/Http/Controllers/UserController.php

@@ -14,6 +14,7 @@ use App\Http\Models\ReferralApply;
 use App\Http\Models\ReferralLog;
 use App\Http\Models\SsConfig;
 use App\Http\Models\SsGroup;
+use App\Http\Models\SsNodeInfo;
 use App\Http\Models\Ticket;
 use App\Http\Models\TicketReply;
 use App\Http\Models\User;
@@ -26,7 +27,6 @@ use App\Http\Models\UserTrafficHourly;
 use App\Http\Models\Verify;
 use App\Mail\activeUser;
 use App\Mail\newTicket;
-use App\Mail\closeTicket;
 use App\Mail\replyTicket;
 use App\Mail\resetPassword;
 use Illuminate\Http\Request;
@@ -131,6 +131,10 @@ class UserController extends Controller
             $node->txt = $txt;
             $node->ssr_scheme = $ssr_scheme;
             $node->ss_scheme = $node->compatible ? $ss_scheme : ''; // 节点兼容原版才显示
+
+            // 节点在线状态
+            $nodeInfo = SsNodeInfo::query()->where('node_id', $node->id)->where('log_time', '>=', strtotime("-10 minutes"))->orderBy('id', 'desc')->first();
+            $node->online_status = empty($nodeInfo) || empty($nodeInfo->load) ? '0' : '1';
         }
 
         $view['nodeList'] = $nodeList;

resources/lang/zh-CN/home.php

@@ -19,8 +19,8 @@ return [
     'no_need_invite_codes' => '系统开放注册中，无需邀请码',
 
     // 首页
-    'ratio_tips' => '结算比例：0.1表示用100M结算10M，5表示用100M结算500M。',
-    'subscribe_button' => '订阅节点',
+    'ratio_tips' => '节点订阅服务：客户端可自动同步更新节点信息。',
+    'subscribe_button' => '点此显示订阅地址',
     'account_info' => '账号信息',
     'account_level' => '等级',
     'account_balance' => '账户余额',

resources/views/user/index.blade.php

@@ -33,7 +33,7 @@
             <div class="col-md-8">
                 <div class="well" style="background-color: #FFF;">
                     {{trans('home.ratio_tips')}}
-                    <button class="btn btn-sm red" onclick="subscribe()"> {{trans('home.subscribe_button')}} </button>
+                    <button class="btn btn-sm blue" onclick="subscribe()"> {{trans('home.subscribe_button')}} </button>
                 </div>
                 <div class="row widget-row">
                     @if(!$nodeList->isEmpty())
@@ -52,9 +52,13 @@
                                         <div class="widget-thumb-body">
                                             <span class="widget-thumb-subtitle"><a data-toggle="modal" href="#txt_{{$node->id}}">{{$node->server ? $node->server : $node->ip}}</a></span>
                                             <span class="widget-thumb-body-stat">
+                                                @if($node->online_status)
+                                                    <a class="btn btn-sm green">正常</a>
+                                                @else
+                                                    <a class="btn btn-sm red">宕机</a>
+                                                @endif
                                                 <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#link_{{$node->id}}"> <i class="fa fa-paper-plane"></i> </a>
                                                 <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#qrcode_{{$node->id}}"> <i class="fa fa-qrcode"></i> </a>
-                                                <a class="btn btn-sm green btn-outline" href="javascript:show('结算比例：{{$node->traffic_rate}}');"> <i class="fa fa-exchange"></i> </a>
                                             </span>
                                         </div>
                                     </div>
@@ -102,20 +106,13 @@
                     </li>
                 </ul>
 
-                <div class="panel panel-default">
-                    <div class="panel-heading">
-                        <h3 class="panel-title">{{trans('home.article_title')}}</h3>
-                    </div>
-                    <div class="panel-body" style="font-size:1.0em; color: #333;">
-                        @if($notice)
-                            <span style="font-size:1.15em">[公告]<a href="{{url('user/article?id=') . $notice->id}}" class="alert-link" target="_blank"> {{$notice->title}} </a></span>
-                            <br>
-                        @endif
-                        @foreach($articleList as $k => $article)
-                            <span>[{{date('m/d', strtotime($article->created_at))}}] <a href="{{url('user/article?id=') . $article->id}}" target="_blank"> {{str_limit($article->title, 50)}} </a></span>
-                            <br>
-                        @endforeach
-                    </div>
+                <div class="list-group">
+                    @if($notice)
+                        <a href="{{url('user/article?id=') . $notice->id}}" class="list-group-item"> [公告] {{$notice->title}} </a>
+                    @endif
+                    @foreach($articleList as $k => $article)
+                        <a href="{{url('user/article?id=') . $article->id}}" class="list-group-item"> [{{date('m/d', strtotime($article->created_at))}}] {{str_limit($article->title, 50)}}</a>
+                    @endforeach
                 </div>
             </div>
         </div>