admin 7 лет назад
Родитель
Сommit
fd5db0f43c

+ 34 - 25
resources/views/user/help.blade.php

@@ -8,31 +8,40 @@
         <div class="search-page search-content-1">
             <div class="row">
                 <div class="col-md-12">
-                    <div class="search-container bordered">
-                        @if($articleList->isEmpty())
-                            <p style="text-align:center;">{{trans('home.invoice_table_none')}} </p>
-                        @else
-                            <ul>
-                                @foreach($articleList as $key => $article)
-                                    <li class="search-item clearfix">
-                                        <a href="javascript:;">
-                                            @if($article->logo)
-                                                <img src="{{url($article->logo)}}" style="max-width: 100px; max-height: 75px;">
-                                            @else
-                                                <img src="{{asset('assets/images/noimage.png')}}">
-                                            @endif
-                                        </a>
-                                        <div class="search-content">
-                                            <h2 class="search-title">
-                                                <a href="{{url('article?id=') . $article->id}}">{{str_limit($article->title, 300)}}</a>
-                                            </h2>
-                                            <p class="search-desc" style="font-size: 16px;"> {{$article->summary}} </p>
-                                        </div>
-                                    </li>
-                                @endforeach
-                            </ul>
-                        @endif
-                        {{ $articleList->links() }}
+                    <div class="portlet light">
+                        <div class="portlet-title">
+                            <div class="caption">
+                                <span class="caption-subject font-dark bold">{{trans('home.help')}}</span>
+                            </div>
+                        </div>
+                        <div class="portlet-body">
+                            <div class="search-container bordered">
+                                @if($articleList->isEmpty())
+                                    <p style="text-align:center;">{{trans('home.invoice_table_none')}} </p>
+                                @else
+                                    <ul>
+                                        @foreach($articleList as $key => $article)
+                                            <li class="search-item clearfix">
+                                                <a href="javascript:;">
+                                                    @if($article->logo)
+                                                        <img src="{{url($article->logo)}}" style="max-width: 100px; max-height: 75px;">
+                                                    @else
+                                                        <img src="{{asset('assets/images/noimage.png')}}">
+                                                    @endif
+                                                </a>
+                                                <div class="search-content">
+                                                    <h2 class="search-title">
+                                                        <a href="{{url('article?id=') . $article->id}}">{{str_limit($article->title, 300)}}</a>
+                                                    </h2>
+                                                    <p class="search-desc" style="font-size: 16px;"> {{$article->summary}} </p>
+                                                </div>
+                                            </li>
+                                        @endforeach
+                                    </ul>
+                                @endif
+                                {{ $articleList->links() }}
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

+ 5 - 3
resources/views/user/index.blade.php

@@ -25,7 +25,9 @@
                             @if($notice)
                                 {!!$notice->content!!}
                             @else
-                                暂无公告
+                                <div style="text-align: center;">
+                                    <h3>暂无公告</h3>
+                                </div>
                             @endif
                         </div>
                     </div>
@@ -34,14 +36,14 @@
         </div>
 
         <div class="row">
-            <div class="col-md-6">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="portlet light bordered">
                     <div class="portlet-body">
                         <div id="chart2" style="width: auto;height:450px;"></div>
                     </div>
                 </div>
             </div>
-            <div class="col-md-6">
+            <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
                 <div class="portlet light bordered">
                     <div class="portlet-body">
                         <div id="chart1" style="width: auto;height:450px;"></div>

+ 198 - 175
resources/views/user/nodeList.blade.php

@@ -4,179 +4,204 @@
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
-        <div class="col-md-12">
-            <div class="row">
-                <div class="col-md-6">
-                    <div class="portlet light">
-                        <div class="portlet-title">
-                            <div class="caption">
-                                <span class="caption-subject font-blue bold">{{trans('home.subscribe_address')}}</span>
-                            </div>
-                            <div class="actions">
-                                <span class="caption-subject">
-                                    <span class="label label-info">{{trans('home.account_expire')}}:@if(date('Y-m-d') > Auth::user()->expire_time) {{trans('home.expired')}} @else {{Auth::user()->expire_time}} @endif </span>
-                                    &ensp;
-                                    <span class="label label-info">{{trans('home.account_bandwidth_usage')}}:{{flowAutoShow(Auth::user()->u + Auth::user()->d)}}({{flowAutoShow(Auth::user()->transfer_enable)}})</span>
-                                    &ensp;
-                                    @if(Auth::user()->traffic_reset_day) <span class="label label-info"> {{trans('home.account_reset_notice', ['reset_day' => Auth::user()->traffic_reset_day])}} </span> @endif
-                                </span>
-                            </div>
+        <div class="row">
+            <div class="col-md-12">
+                <div class="portlet light">
+                    <div class="portlet-body">
+                        <ul class="list-inline">
+                            <li>
+                                <h4>
+                                    <span class="font-blue">{{trans('home.account_expire')}}:</span>
+                                    <span class="font-red">@if(date('Y-m-d') > Auth::user()->expire_time) {{trans('home.expired')}} @else {{Auth::user()->expire_time}} @endif</span>
+                                </h4>
+                            </li>
+                            <li>
+                                <h4>
+                                    <span class="font-blue">{{trans('home.account_bandwidth_usage')}}:</span>
+                                    <span class="font-red">{{flowAutoShow(Auth::user()->u + Auth::user()->d)}}({{flowAutoShow(Auth::user()->transfer_enable)}})</span>
+                                </h4>
+                            </li>
+                            @if(Auth::user()->traffic_reset_day)
+                            <li>
+                                <h4>
+                                    <span class="font-blue"> {{trans('home.account_reset_notice', ['reset_day' => Auth::user()->traffic_reset_day])}} </span>
+                                </h4>
+                            </li>
+                            @endif
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="row">
+            <div class="col-md-12">
+                <div class="portlet light">
+                    <div class="portlet-title">
+                        <div class="caption">
+                            <span class="caption-subject font-blue bold">{{trans('home.subscribe_address')}}</span>
                         </div>
-                        <div class="portlet-body">
-                            <div class="mt-clipboard-container" style="padding-top:0px;">
-                                @if(Auth::user()->subscribe->status)
-                                    @if($nodeList->isEmpty())
-                                        <h2>请先<a href="{{url('services')}}">购买服务</a></h2>
-                                    @else
-                                        <input type="text" id="mt-target-1" class="form-control" value="{{$link}}" />
-                                        <a href="javascript:exchangeSubscribe();" class="btn green">
-                                            {{trans('home.exchange_subscribe')}}
-                                        </a>
-                                        <a href="javascript:;" class="btn blue mt-clipboard" data-clipboard-action="copy" data-clipboard-target="#mt-target-1">
-                                            {{trans('home.copy_subscribe_address')}}
-                                        </a>
-                                        <div class="tabbable-line">
-                                            <ul class="nav nav-tabs ">
-                                                <li class="active">
-                                                    <a href="#tools1" data-toggle="tab"> <i class="fa fa-apple"></i> Mac </a>
-                                                </li>
-                                                <li>
-                                                    <a href="#tools2" data-toggle="tab"> <i class="fa fa-windows"></i> Windows </a>
-                                                </li>
-                                                <li>
-                                                    <a href="#tools3" data-toggle="tab"> <i class="fa fa-linux"></i> Linux </a>
-                                                </li>
-                                                <li>
-                                                    <a href="#tools4" data-toggle="tab"> <i class="fa fa-apple"></i> iOS </a>
-                                                </li>
-                                                <li>
-                                                    <a href="#tools5" data-toggle="tab"> <i class="fa fa-android"></i> Android </a>
-                                                </li>
-                                                <li>
-                                                    <a href="#tools6" data-toggle="tab"> <i class="fa fa-gamepad"></i> Games </a>
-                                                </li>
-                                            </ul>
-                                            <div class="tab-content" style="font-size:16px;">
-                                                <div class="tab-pane active" id="tools1">
-                                                    <ol>
-                                                        <li> <a href="{{asset('clients/ShadowsocksX-NG-R8-1.4.4.dmg')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
-                                                        <li> 点击状态栏纸飞机 -> 服务器 -> 编辑订阅 </li>
-                                                        <li> 点击窗口左下角 “+”号 新增订阅,完整复制本页上方“订阅服务”处地址,将其粘贴至“订阅地址”栏,点击右下角“OK” </li>
-                                                        <li> 点击纸飞机 -> 服务器 -> 手动更新订阅 </li>
-                                                        <li> 点击纸飞机 -> 服务器,选定合适服务器 </li>
-                                                        <li> 点击纸飞机 -> 打开Shadowsocks </li>
-                                                        <li> 点击纸飞机 -> PAC自动模式 </li>
-                                                        <li> 点击纸飞机 -> 代理设置->从 GFW List 更新 PAC </li>
-                                                        <li> 打开系统偏好设置 -> 网络,在窗口左侧选定显示为“已连接”的网络,点击右下角“高级...” </li>
-                                                        <li> 切换至“代理”选项卡,勾选“自动代理配置”和“不包括简单主机名”,点击右下角“好”,再次点击右下角“应用” </li>
-                                                    </ol>
-                                                </div>
-                                                <div class="tab-pane" id="tools2">
-                                                    <ol>
-                                                        <li> <a href="{{asset('clients/ShadowsocksR-win.zip')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
-                                                        <li> 运行 ShadowsocksR 文件夹内的 ShadowsocksR.exe </li>
-                                                        <li> 右击桌面右下角状态栏(或系统托盘)纸飞机 -> 服务器订阅 -> SSR服务器订阅设置 </li>
-                                                        <li> 点击窗口左下角 “Add” 新增订阅,完整复制本页上方 “订阅服务” 处地址,将其粘贴至“网址”栏,点击“确定” </li>
-                                                        <li> 右击纸飞机 -> 服务器订阅 -> 更新SSR服务器订阅(不通过代理) </li>
-                                                        <li> 右击纸飞机 -> 服务器,选定合适服务器 </li>
-                                                        <li> 右击纸飞机 -> 系统代理模式 -> PAC模式 </li>
-                                                        <li> 右击纸飞机 -> PAC -> 更新PAC为GFWList </li>
-                                                        <li> 右击纸飞机 -> 代理规则 -> 绕过局域网和大陆 </li>
-                                                        <li> 右击纸飞机,取消勾选“服务器负载均衡” </li>
-                                                    </ol>
-                                                </div>
-                                                <div class="tab-pane" id="tools3">
-                                                    <ol>
-                                                        <li> <a href="{{asset('clients/Shadowsocks-qt5-3.0.1.zip')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
-                                                        <li> 单击状态栏小飞机,找到服务器 -> 编辑订阅,复制黏贴订阅地址 </li>
-                                                        <li> 更新订阅设置即可 </li>
-                                                    </ol>
-                                                </div>
-                                                <div class="tab-pane" id="tools4">
-                                                    <ol>
-                                                        @if(Agent::is('iPhone') || Agent::is('iPad'))
-                                                            @if(Agent::is('Safari'))
-                                                                <li> <a href="{{$ipa_list}}" target="_blank">点击此处在线安装</a></li>
-                                                            @else
-                                                                <li> <a href="javascript:onlineInstallWarning();">点击此处在线安装</a></li>
-                                                            @endif
-                                                            <li> 请从站长处获取 App Store 账号密码 </li>
-                                                            <li> 打开 Shadowrocket,点击右上角 “+”号 添加节点,类型选择 Subscribe </li>
-                                                            <li> 完整复制本页上方 “订阅服务” 处地址,将其粘贴至 “URL”栏,点击右上角 “完成” </li>
-                                                            <li> 左划新增的服务器订阅,点击 “更新” </li>
-                                                            <li> 选定合适服务器节点,点击右上角连接开关,屏幕上方状态栏出现“VPN”图标 </li>
-                                                            <li> 当进行海外游戏时请将 Shadowrocket “首页” 页面中的 “全局路由” 切换至 “代理”,并确保“设置”页面中的“UDP”已开启转发 </li>
+                        <div class="actions">
+
+                        </div>
+                    </div>
+                    @if(Auth::user()->subscribe->status)
+                        @if($nodeList->isEmpty())
+                            <h2>请先<a href="{{url('services')}}">购买服务</a></h2>
+                        @else
+                            <div class="portlet-body">
+                                <div class="mt-clipboard-container">
+                                    <input type="text" id="mt-target-1" class="form-control" value="{{$link}}" />
+                                    <a href="javascript:exchangeSubscribe();" class="btn green">
+                                        {{trans('home.exchange_subscribe')}}
+                                    </a>
+                                    <a href="javascript:;" class="btn blue mt-clipboard" data-clipboard-action="copy" data-clipboard-target="#mt-target-1">
+                                        {{trans('home.copy_subscribe_address')}}
+                                    </a>
+                                    <div class="tabbable-line">
+                                        <ul class="nav nav-tabs ">
+                                            <li class="active">
+                                                <a href="#tools1" data-toggle="tab"> <i class="fa fa-apple"></i> Mac </a>
+                                            </li>
+                                            <li>
+                                                <a href="#tools2" data-toggle="tab"> <i class="fa fa-windows"></i> Windows </a>
+                                            </li>
+                                            <li>
+                                                <a href="#tools3" data-toggle="tab"> <i class="fa fa-linux"></i> Linux </a>
+                                            </li>
+                                            <li>
+                                                <a href="#tools4" data-toggle="tab"> <i class="fa fa-apple"></i> iOS </a>
+                                            </li>
+                                            <li>
+                                                <a href="#tools5" data-toggle="tab"> <i class="fa fa-android"></i> Android </a>
+                                            </li>
+                                            <li>
+                                                <a href="#tools6" data-toggle="tab"> <i class="fa fa-gamepad"></i> Games </a>
+                                            </li>
+                                        </ul>
+                                        <div class="tab-content" style="font-size:16px;">
+                                            <div class="tab-pane active" id="tools1">
+                                                <ol>
+                                                    <li> <a href="{{asset('clients/ShadowsocksX-NG-R8-1.4.4.dmg')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
+                                                    <li> 点击状态栏纸飞机 -> 服务器 -> 编辑订阅 </li>
+                                                    <li> 点击窗口左下角 “+”号 新增订阅,完整复制本页上方“订阅服务”处地址,将其粘贴至“订阅地址”栏,点击右下角“OK” </li>
+                                                    <li> 点击纸飞机 -> 服务器 -> 手动更新订阅 </li>
+                                                    <li> 点击纸飞机 -> 服务器,选定合适服务器 </li>
+                                                    <li> 点击纸飞机 -> 打开Shadowsocks </li>
+                                                    <li> 点击纸飞机 -> PAC自动模式 </li>
+                                                    <li> 点击纸飞机 -> 代理设置->从 GFW List 更新 PAC </li>
+                                                    <li> 打开系统偏好设置 -> 网络,在窗口左侧选定显示为“已连接”的网络,点击右下角“高级...” </li>
+                                                    <li> 切换至“代理”选项卡,勾选“自动代理配置”和“不包括简单主机名”,点击右下角“好”,再次点击右下角“应用” </li>
+                                                </ol>
+                                            </div>
+                                            <div class="tab-pane" id="tools2">
+                                                <ol>
+                                                    <li> <a href="{{asset('clients/ShadowsocksR-win.zip')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
+                                                    <li> 运行 ShadowsocksR 文件夹内的 ShadowsocksR.exe </li>
+                                                    <li> 右击桌面右下角状态栏(或系统托盘)纸飞机 -> 服务器订阅 -> SSR服务器订阅设置 </li>
+                                                    <li> 点击窗口左下角 “Add” 新增订阅,完整复制本页上方 “订阅服务” 处地址,将其粘贴至“网址”栏,点击“确定” </li>
+                                                    <li> 右击纸飞机 -> 服务器订阅 -> 更新SSR服务器订阅(不通过代理) </li>
+                                                    <li> 右击纸飞机 -> 服务器,选定合适服务器 </li>
+                                                    <li> 右击纸飞机 -> 系统代理模式 -> PAC模式 </li>
+                                                    <li> 右击纸飞机 -> PAC -> 更新PAC为GFWList </li>
+                                                    <li> 右击纸飞机 -> 代理规则 -> 绕过局域网和大陆 </li>
+                                                    <li> 右击纸飞机,取消勾选“服务器负载均衡” </li>
+                                                </ol>
+                                            </div>
+                                            <div class="tab-pane" id="tools3">
+                                                <ol>
+                                                    <li> <a href="{{asset('clients/Shadowsocks-qt5-3.0.1.zip')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
+                                                    <li> 单击状态栏小飞机,找到服务器 -> 编辑订阅,复制黏贴订阅地址 </li>
+                                                    <li> 更新订阅设置即可 </li>
+                                                </ol>
+                                            </div>
+                                            <div class="tab-pane" id="tools4">
+                                                <ol>
+                                                    @if(Agent::is('iPhone') || Agent::is('iPad'))
+                                                        @if(Agent::is('Safari'))
+                                                            <li> <a href="{{$ipa_list}}" target="_blank">点击此处在线安装</a></li>
                                                         @else
-                                                            <li> 请使用 Safari浏览器 访问本页面 </li>
+                                                            <li> <a href="javascript:onlineInstallWarning();">点击此处在线安装</a></li>
                                                         @endif
-                                                    </ol>
-                                                </div>
-                                                <div class="tab-pane" id="tools5">
-                                                    <ol>
-                                                        <li> <a href="{{asset('clients/ShadowsocksRR-3.5.1.1.apk')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
-                                                        <li> 单击左上角的shadowsocksR进入配置文件页,点击右下角的“+”号,点击“添加/升级SSR订阅”,完整复制本页上方“订阅服务”处地址,填入订阅信息并保存 </li>
-                                                        <li> 选中任意一个节点,返回软件首页 </li>
-                                                        <li> 在软件首页处找到“路由”选项,并将其改为“绕过局域网及中国大陆地址” </li>
-                                                        <li> 点击右上角的小飞机图标进行连接,提示是否添加(或创建)VPN连接,点同意(或允许) </li>
-                                                    </ol>
-                                                </div>
-                                                <div class="tab-pane" id="tools6">
-                                                    <ol>
-                                                        <li> <a href="{{asset('clients/SSTap-beta-setup-1.0.9.7.zip')}}" target="_blank">点击此处</a>下载客户端并安装 </li>
-                                                        <li> 打开 SSTap,选择 <i class="fa fa-cog"></i> -> SSR订阅 -> SSR订阅管理,添加订阅地址 </li>
-                                                        <li> 添加完成后,再次选择 <i class="fa fa-cog"></i> - SSR订阅 - 手动更新SSR订阅,即可同步节点列表。</li>
-                                                        <li> 在代理模式中选择游戏或「不代理中国IP」,点击「连接」即可加速。</li>
-                                                        <li> 需要注意的是,一旦连接成功,客户端会自动缩小到任务栏,可在设置中关闭。</li>
-                                                    </ol>
-                                                </div>
+                                                        <li> 请从站长处获取 App Store 账号密码 </li>
+                                                        <li> 打开 Shadowrocket,点击右上角 “+”号 添加节点,类型选择 Subscribe </li>
+                                                        <li> 完整复制本页上方 “订阅服务” 处地址,将其粘贴至 “URL”栏,点击右上角 “完成” </li>
+                                                        <li> 左划新增的服务器订阅,点击 “更新” </li>
+                                                        <li> 选定合适服务器节点,点击右上角连接开关,屏幕上方状态栏出现“VPN”图标 </li>
+                                                        <li> 当进行海外游戏时请将 Shadowrocket “首页” 页面中的 “全局路由” 切换至 “代理”,并确保“设置”页面中的“UDP”已开启转发 </li>
+                                                    @else
+                                                        <li> 请使用 Safari浏览器 访问本页面 </li>
+                                                    @endif
+                                                </ol>
+                                            </div>
+                                            <div class="tab-pane" id="tools5">
+                                                <ol>
+                                                    <li> <a href="{{asset('clients/ShadowsocksRR-3.5.1.1.apk')}}" target="_blank">点击此处</a>下载客户端并启动 </li>
+                                                    <li> 单击左上角的shadowsocksR进入配置文件页,点击右下角的“+”号,点击“添加/升级SSR订阅”,完整复制本页上方“订阅服务”处地址,填入订阅信息并保存 </li>
+                                                    <li> 选中任意一个节点,返回软件首页 </li>
+                                                    <li> 在软件首页处找到“路由”选项,并将其改为“绕过局域网及中国大陆地址” </li>
+                                                    <li> 点击右上角的小飞机图标进行连接,提示是否添加(或创建)VPN连接,点同意(或允许) </li>
+                                                </ol>
+                                            </div>
+                                            <div class="tab-pane" id="tools6">
+                                                <ol>
+                                                    <li> <a href="{{asset('clients/SSTap-beta-setup-1.0.9.7.zip')}}" target="_blank">点击此处</a>下载客户端并安装 </li>
+                                                    <li> 打开 SSTap,选择 <i class="fa fa-cog"></i> -> SSR订阅 -> SSR订阅管理,添加订阅地址 </li>
+                                                    <li> 添加完成后,再次选择 <i class="fa fa-cog"></i> - SSR订阅 - 手动更新SSR订阅,即可同步节点列表。</li>
+                                                    <li> 在代理模式中选择游戏或「不代理中国IP」,点击「连接」即可加速。</li>
+                                                    <li> 需要注意的是,一旦连接成功,客户端会自动缩小到任务栏,可在设置中关闭。</li>
+                                                </ol>
                                             </div>
                                         </div>
-                                    @endif
-                                @else
-                                    <h3>{{trans('home.subscribe_baned')}}</h3>
-                                @endif
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
+                        @endif
+                    @else
+                        <h3>{{trans('home.subscribe_baned')}}</h3>
+                    @endif
                 </div>
+            </div>
+        </div>
 
+        <div class="row">
+            <div class="col-md-12">
                 @if(!$nodeList->isEmpty())
-                    <div class="col-md-6">
-                        <div class="portlet light">
-                            <div class="portlet-title">
-                                <div class="caption">
-                                    <span class="caption-subject font-blue bold">{{trans('home.my_node_list')}}</span>
-                                </div>
-                                <div class="actions">
-                                    <div class="btn-group btn-group-devided" data-toggle="buttons">
-                                        <button class="btn btn-info" id="copy_all_nodes" data-clipboard-text="{{$allNodes}}"> 复制所有节点 </button>
-                                    </div>
+                    <div class="portlet light">
+                        <div class="portlet-title">
+                            <div class="caption">
+                                <span class="caption-subject font-blue bold">{{trans('home.my_node_list')}}</span>
+                            </div>
+                            <div class="actions">
+                                <div class="btn-group btn-group-devided" data-toggle="buttons">
+                                    <button class="btn btn-info" id="copy_all_nodes" data-clipboard-text="{{$allNodes}}"> 复制所有节点 </button>
                                 </div>
                             </div>
-                            <div class="portlet-body">
-                                <div class="tab-content">
-                                    <div class="tab-pane active">
-                                        <div class="mt-comments">
-                                            @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}}</span>
-                                                            <span class="mt-comment-date">
+                        </div>
+                        <div class="portlet-body">
+                            <div class="tab-content">
+                                <div class="tab-pane active">
+                                    <div class="mt-comments">
+                                        @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}}</span>
+                                                        <span class="mt-comment-date">
                                                                 @if(!$node->online_status)
-                                                                    <span class="badge badge-danger">维护中</span>
-                                                                @endif
+                                                                <span class="badge badge-danger">维护中</span>
+                                                            @endif
                                                             </span>
-                                                        </div>
-                                                        <div class="mt-comment-text"> {{$node->desc}} </div>
-                                                        <div class="mt-comment-details">
+                                                    </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)
@@ -184,29 +209,27 @@
                                                                     @endforeach
                                                                 @endif
                                                             </span>
-                                                            <ul class="mt-comment-actions" style="display: block;">
-                                                                <li>
-                                                                    <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#txt_{{$node->id}}" > <i class="fa fa-reorder"></i> </a>
-                                                                </li>
-                                                                <li>
-                                                                    <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#link_{{$node->id}}"> @if($node->type == 1) <i class="fa fa-paper-plane"></i> @else <i class="fa fa-vimeo"></i> @endif </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>
+                                                        <ul class="mt-comment-actions" style="display: block;">
+                                                            <li>
+                                                                <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#txt_{{$node->id}}" > <i class="fa fa-reorder"></i> </a>
+                                                            </li>
+                                                            <li>
+                                                                <a class="btn btn-sm green btn-outline" data-toggle="modal" href="#link_{{$node->id}}"> @if($node->type == 1) <i class="fa fa-paper-plane"></i> @else <i class="fa fa-vimeo"></i> @endif </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
-                                        </div>
+                                            </div>
+                                        @endforeach
                                     </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 @endif
-
             </div>
         </div>
 

+ 21 - 10
resources/views/user/services.blade.php

@@ -15,14 +15,25 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="portlet light">
-                    <h4 class="">
-                        <span class="font-blue">账户等级:</span>
-                        <span class="font-red">{{Auth::user()->levelList->level_name}}</span>
-                        &ensp;&ensp;
-                        <span class="font-blue">账户余额:</span>
-                        <span class="font-red">{{Auth::user()->balance}}元</span>
-                        <a class="btn btn-sm red" href="#" data-toggle="modal" data-target="#charge_modal" style="color: #FFF;">{{trans('home.recharge')}}</a>
-                    </h4>
+                    <div class="portlet-body">
+                        <ul class="list-inline">
+                            <li>
+                                <h4>
+                                    <span class="font-blue">账户等级:</span>
+                                    <span class="font-red">{{Auth::user()->levelList->level_name}}</span>
+                                </h4>
+                            </li>
+                            <li>
+                                <h4>
+                                    <span class="font-blue">账户余额:</span>
+                                    <span class="font-red">{{Auth::user()->balance}}元</span>
+                                </h4>
+                            </li>
+                            <li>
+                                <a class="btn btn-sm red" href="#" data-toggle="modal" data-target="#charge_modal" style="color: #FFF;">{{trans('home.recharge')}}</a>
+                            </li>
+                        </ul>
+                    </div>
                 </div>
             </div>
         </div>
@@ -71,7 +82,7 @@
                                                 </div>
                                             @else
                                                 @foreach($packageList as $key => $goods)
-                                                    <div class="col-md-3">
+                                                    <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
                                                         <div class="price-column-container border-active" style="margin-bottom: 20px;">
                                                             <div class="price-table-head bg-{{$goods->color}}">
                                                                 <h2 class="no-margin">{{$goods->name}}</h2>
@@ -123,7 +134,7 @@
                                                 </div>
                                             @else
                                                 @foreach($trafficList as $key => $goods)
-                                                    <div class="col-md-3">
+                                                    <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
                                                         <div class="price-column-container border-active" style="margin-bottom: 20px;">
                                                             <div class="price-table-head bg-{{$goods->color}}">
                                                                 <h2 class="no-margin">{{$goods->name}}</h2>