免费邀请码列表

访问方式 http://xxxxx.com/free

app/Http/Controllers/UserController.php

@@ -381,6 +381,15 @@ class UserController extends Controller
         return Response::view('user/invite', $view);
     }
 
+    // 公开的邀请码列表
+    public function free(Request $request)
+    {
+        $view['is_invite_register'] = self::$config['is_invite_register'];
+        $view['inviteList'] = Invite::query()->where('uid', 1)->where('status', 0)->paginate();
+
+        return Response::view('user/free', $view);
+    }
+
     // 生成邀请码
     public function makeInvite(Request $request)
     {
@@ -833,6 +842,7 @@ class UserController extends Controller
             $goods->price = $goods->price / 100;
             $goods->traffic = $this->flowAutoShow($goods->traffic * 1048576);
             $view['goods'] = $goods;
+            $view['paypal_status'] = self::$config['paypal_status'];
 
             return Response::view('user/addOrder', $view);
         }

resources/lang/en/home.php

@@ -14,6 +14,8 @@ return [
     'invoices' => 'Invoices',
     'tickets' => 'Tickets',
     'referrals' => 'Referrals',
+    'free_invite_codes_title' => 'Invite Codes',
+    'no_need_invite_codes' => 'In the open registration system, no invitation code is required',
 
     // 首页
     'ratio_tips' => 'Settlement Ratio: 1 means to settle 100M with 100M, 0.1 means to settle 10M with 100M, and 5 to express 500M with 100M.',

resources/lang/zh-CN/home.php

@@ -14,6 +14,8 @@ return [
     'invoices' => '消费记录',
     'tickets' => '我的工单',
     'referrals' => '推广返利',
+    'free_invite_codes_title' => '邀请码',
+    'no_need_invite_codes' => '系统开放注册中，无需邀请码',
 
     // 首页
     'ratio_tips' => '结算比例： 1表示用100M就结算100M，0.1表示用100M结算10M，5表示用100M结算500M。',
@@ -38,7 +40,7 @@ return [
     'service_quantity' => '数量',
     'service_subtotal_price' => '小计',
     'service_total_price' => '合计',
-    'service_pay_button' => '支付',
+    'service_pay_button' => '余额支付',
     'services_none' => '暂无可用服务',
     'service_traffic' => '内含流量',
     'service_days' => '有效期',

resources/views/admin/addUser.blade.php

@@ -152,7 +152,7 @@
                                     <div class="portlet light bordered">
                                         <div class="portlet-title">
                                             <div class="caption">
-                                                <span class="caption-subject font-dark bold">SS(R)信息</span>
+                                                <span class="caption-subject font-dark bold">SSR(R)信息</span>
                                             </div>
                                         </div>
                                         <div class="portlet-body">

resources/views/admin/config.blade.php

@@ -49,8 +49,8 @@
                                     <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                         <thead>
                                             <tr>
-                                                <th> 名称 </th>
-                                                <th> 操作 </th>
+                                                <th style="width: 50%;"> 名称 </th>
+                                                <th style="width: 50%;"> 操作 </th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -65,7 +65,9 @@
                                                     <td>
                                                         @if(!$method->is_default)
                                                             <button type="button" class="btn btn-sm blue btn-outline" onclick="setDefault('1', '{{$method->id}}')">默认</button>
-                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('1', '{{$method->id}}')">删除</button>
+                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('1', '{{$method->id}}')">
+                                                                <i class="fa fa-trash"></i>
+                                                            </button>
                                                         @endif
                                                     </td>
                                                 </tr>
@@ -85,8 +87,8 @@
                                     <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                         <thead>
                                             <tr>
-                                                <th> 名称 </th>
-                                                <th> 操作 </th>
+                                                <th style="width: 50%;"> 名称 </th>
+                                                <th style="width: 50%;"> 操作 </th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -101,7 +103,9 @@
                                                     <td>
                                                         @if(!$protocol->is_default)
                                                             <button type="button" class="btn btn-sm blue btn-outline" onclick="setDefault('2', '{{$protocol->id}}')">默认</button>
-                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('2', '{{$protocol->id}}')">删除</button>
+                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('2', '{{$protocol->id}}')">
+                                                                <i class="fa fa-trash"></i>
+                                                            </button>
                                                         @endif
                                                     </td>
                                                 </tr>
@@ -121,8 +125,8 @@
                                     <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                         <thead>
                                         <tr>
-                                            <th> 名称 </th>
-                                            <th> 操作 </th>
+                                            <th style="width: 50%;"> 名称 </th>
+                                            <th style="width: 50%;"> 操作 </th>
                                         </tr>
                                         </thead>
                                         <tbody>
@@ -137,7 +141,9 @@
                                                     <td>
                                                         @if(!$obfs->is_default)
                                                             <button type="button" class="btn btn-sm blue btn-outline" onclick="setDefault('3', '{{$obfs->id}}')">默认</button>
-                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('3', '{{$obfs->id}}')">删除</button>
+                                                            <button type="button" class="btn btn-sm red btn-outline" onclick="delConfig('3', '{{$obfs->id}}')">
+                                                                <i class="fa fa-trash"></i>
+                                                            </button>
                                                         @endif
                                                     </td>
                                                 </tr>
@@ -157,9 +163,9 @@
                                     <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                         <thead>
                                             <tr>
-                                                <th> 等级 </th>
-                                                <th> 名称 </th>
-                                                <th> 操作 </th>
+                                                <th style="width: 35%;"> 等级 </th>
+                                                <th style="width: 35%;"> 名称 </th>
+                                                <th style="width: 30%;"> 操作 </th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -174,7 +180,9 @@
                                                     <td> <input id="level_name_{{$level->id}}" name="level_name" value="{{$level->level_name}}" type="text" class="form-control"></td>
                                                     <td>
                                                         <button type="button" class="btn btn-sm blue btn-outline" onclick="updateLevel('4', '{{$level->id}}')">修改</button>
-                                                        <button type="button" class="btn btn-sm red btn-outline" onclick="delLevel('4', '{{$level->id}}')">删除</button>
+                                                        <button type="button" class="btn btn-sm red btn-outline" onclick="delLevel('4', '{{$level->id}}')">
+                                                            <i class="fa fa-trash"></i>
+                                                        </button>
                                                     </td>
                                                 </tr>
                                             @endforeach
@@ -193,9 +201,9 @@
                                     <table class="table table-striped table-bordered table-hover table-checkable order-column">
                                         <thead>
                                             <tr>
-                                                <th> 国家/地区名称 </th>
-                                                <th> 代码 </th>
-                                                <th> 操作 </th>
+                                                <th style="width: 35%;"> 国家/地区名称 </th>
+                                                <th style="width: 35%;"> 代码 </th>
+                                                <th style="width: 30%;"> 操作 </th>
                                             </tr>
                                         </thead>
                                         <tbody>
@@ -210,7 +218,9 @@
                                                     <td> <input id="country_code_{{$country->id}}" name="country_code" value="{{$country->country_code}}" type="text" class="form-control"></td>
                                                     <td>
                                                         <button type="button" class="btn btn-sm blue btn-outline" onclick="updateCountry('5', '{{$country->id}}')">修改</button>
-                                                        <button type="button" class="btn btn-sm red btn-outline" onclick="delCountry('5', '{{$country->id}}')">删除</button>
+                                                        <button type="button" class="btn btn-sm red btn-outline" onclick="delCountry('5', '{{$country->id}}')">
+                                                            <i class="fa fa-trash"></i>
+                                                        </button>
                                                     </td>
                                                 </tr>
                                             @endforeach

resources/views/admin/convert.blade.php

@@ -15,7 +15,7 @@
                         <div class="caption font-dark">
                             <i class="icon-refresh font-dark"></i>
                             <span class="caption-subject bold uppercase"> 格式转换 </span>
-                            <small>SS转SSR</small>
+                            <small>SS转SSR(R)</small>
                         </div>
                     </div>
                     <div class="portlet-body">

resources/views/admin/editUser.blade.php

@@ -192,7 +192,7 @@
                                     <div class="portlet light bordered">
                                         <div class="portlet-title">
                                             <div class="caption">
-                                                <span class="caption-subject font-dark bold">SS(R)信息</span>
+                                                <span class="caption-subject font-dark bold">SSR(R)信息</span>
                                             </div>
                                         </div>
                                         <div class="portlet-body">

resources/views/admin/index.blade.php

@@ -101,7 +101,7 @@
                     <div class="display">
                         <div class="number">
                             <h3 class="font-red">
-                                ￥<span data-counter="counterup" data-value="{{$totalBalance}}"></span>
+                                $<span data-counter="counterup" data-value="{{$totalBalance}}"></span>
                             </h3>
                             <small>总余额</small>
                         </div>
@@ -118,7 +118,7 @@
                     <div class="display">
                         <div class="number">
                             <h3 class="font-green">
-                                ￥<span data-counter="counterup" data-value="{{$totalWaitRefAmount}}"></span>
+                                $<span data-counter="counterup" data-value="{{$totalWaitRefAmount}}"></span>
                             </h3>
                             <small>待提现佣金</small>
                         </div>
@@ -133,7 +133,7 @@
                     <div class="display">
                         <div class="number">
                             <h3 class="font-green">
-                                ￥<span data-counter="counterup" data-value="{{$totalRefAmount}}"></span>
+                                $<span data-counter="counterup" data-value="{{$totalRefAmount}}"></span>
                             </h3>
                             <small>已支出佣金</small>
                         </div>

resources/views/admin/nodeList.blade.php

@@ -12,8 +12,8 @@
         <div class="row">
             <div class="col-md-12">
                 <div class="note note-info">
-                    <p>如果负载显示宕机，可能是节点服务器宕机或者节点上的SSR服务挂掉了，请重启节点服务器或者SSR服务。</p>
-                    <p>宕机是因为节点服务器IDC母鸡超售过载导致，SSR挂掉是因为节点服务器配置太渣。<a href="https://github.com/ssrpanel/ssrpanel/wiki/VPS%E6%8E%A8%E8%8D%90&%E8%B4%AD%E4%B9%B0%E7%BB%8F%E9%AA%8C" target="_blank" style="color:red;">[VPS推荐]</a></p>
+                    <p>如果负载显示宕机，可能是节点服务器宕机或者节点上的SSR(R)服务挂掉了，请重启节点服务器或者SSR(R)服务。</p>
+                    <p>宕机是因为节点服务器IDC母鸡超售过载导致，SSR(R)挂掉是因为节点服务器配置太渣。<a href="https://github.com/ssrpanel/ssrpanel/wiki/VPS%E6%8E%A8%E8%8D%90&%E8%B4%AD%E4%B9%B0%E7%BB%8F%E9%AA%8C" target="_blank" style="color:red;">[VPS推荐]</a></p>
                     <p>如果还是无法解决，请检查各节点服务器的时间是否同步。<a href="https://github.com/ssrpanel/SSRPanel/wiki/%E5%8D%95%E7%AB%AF%E5%8F%A3%E5%A4%9A%E7%94%A8%E6%88%B7%E7%9A%84%E5%9D%91" target="_blank" style="color:red;">[时间校准]</a></p>
                 </div>
             </div>

resources/views/admin/profile.blade.php

@@ -28,7 +28,7 @@
                     <div class="portlet light profile-sidebar-portlet bordered">
                         <!-- SIDEBAR USERPIC -->
                         <div class="profile-userpic">
-                            <img src="/assets/images/avatar.jpg" class="img-responsive" alt=""> </div>
+                            <img src="/assets/images/avatar.png" class="img-responsive" alt=""> </div>
                         <!-- END SIDEBAR USERPIC -->
                         <!-- SIDEBAR USER TITLE -->
                         <div class="profile-usertitle">

resources/views/admin/system.blade.php

@@ -37,9 +37,11 @@
                                         <li>
                                             <a href="#tab_6" data-toggle="tab"> 自动化任务 </a>
                                         </li>
+                                        <!--
                                         <li>
                                             <a href="#tab_7" data-toggle="tab"> 充值二维码设置 </a>
                                         </li>
+                                        -->
                                         <li>
                                             <a href="#tab_8" data-toggle="tab"> PayPal接口设置 </a>
                                         </li>
@@ -508,6 +510,7 @@
                                                 </div>
                                             </form>
                                         </div>
+                                        <!--
                                         <div class="tab-pane" id="tab_7">
                                             <form action="{{url('admin/setQrcode')}}" method="post" enctype="multipart/form-data" class="form-horizontal">
                                                 <div class="form-body">
@@ -572,6 +575,7 @@
                                                 </div>
                                             </form>
                                         </div>
+                                        -->
                                         <div class="tab-pane" id="tab_8">
                                             <form action="#" method="post" class="form-horizontal">
                                                 <div class="portlet-body">

resources/views/admin/userList.blade.php

@@ -62,7 +62,7 @@
                             </div>
                             <div class="col-md-2 col-sm-2">
                                 <select class="form-control input-sm" name="enable" id="enable" onChange="doSearch()">
-                                    <option value="" @if(Request::get('enable') == '') selected @endif>SS(R)状态</option>
+                                    <option value="" @if(Request::get('enable') == '') selected @endif>SSR(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>
@@ -84,7 +84,7 @@
                                     <th> 最后使用 </th>
                                     <th> 有效期 </th>
                                     <th> 状态 </th>
-                                    <th> SS(R) </th>
+                                    <th> SSR(R) </th>
                                     <th> 操作 </th>
                                 </tr>
                                 </thead>

resources/views/admin/userOrderList.blade.php

@@ -53,7 +53,7 @@
                                     <th> 原价 </th>
                                     <th> 实付 </th>
                                     <th> 优惠券 </th>
-                                    <th> 过期 </th>
+                                    <th> 过期时间 </th>
                                     <th> 操作时间 </th>
                                 </tr>
                                 </thead>
@@ -71,7 +71,7 @@
                                                 <td> {{$vo->totalOriginalPrice}} </td>
                                                 <td> {{$vo->totalPrice}} </td>
                                                 <td> {{empty($vo->coupon) ? '' : $vo->coupon->name . ' - ' . $vo->coupon->sn}} </td>
-                                                <td> {{$vo->is_expire ? '是' : $vo->expire_at}} </td>
+                                                <td> {{$vo->is_expire ? '已过期' : $vo->expire_at}} </td>
                                                 <td> {{$vo->created_at}} </td>
                                             </tr>
                                         @endforeach

resources/views/login.blade.php

@@ -110,6 +110,64 @@
 <script src="/assets/global/plugins/jquery-validation/js/jquery.validate.min.js" type="text/javascript"></script>
 <script src="/assets/global/plugins/jquery-validation/js/additional-methods.min.js" type="text/javascript"></script>
 <script src="/assets/global/plugins/jquery-validation/js/localization/messages_zh.min.js" type="text/javascript"></script>
+<script type="text/javascript">
+    // 雪花特效
+    (function () {
+        var style = document.createElement("style");
+        style.innerText = "body .snow{position: fixed;color: #fff;line-height: 1;text-shadow: 0 0 .2em #ffffff;z-index: 2;}";
+        document.getElementsByTagName("head")[0].appendChild(style);
+
+        var dpr = ~~document.documentElement.getAttribute("data-dpr") || 1;
+        var wWidth = window.innerWidth;
+        var wHeight = window.innerHeight;
+        var maxNum = wWidth / 50;
+        var snowArr = [];
+        function createSnow (r) {
+            var size = Math.random() + .8;
+            var left = wWidth * Math.random();
+            var speed = (Math.random() * .5 + .6) * size * dpr;
+            var snow = document.createElement("div");
+            snow.innerText = "❅";
+            snow.className = "snow";
+            var text = "";
+            text += "font-size:";
+            text += size;
+            text += "em;left:";
+            text += left;
+            text += "px;bottom:100%;";
+            snow.style.cssText = text;
+            document.body.appendChild(snow);
+            var top = r ? wHeight * Math.random() : (-snow.offsetHeight);
+            snow.style.top = top + "px";
+            snow.style.bottom = "auto";
+            return {
+                snow: snow,
+                speed: speed,
+                top: top
+            }
+        }
+        function draw () {
+            for (var i = 0; i < maxNum; i++) {
+                if (!snowArr[i]) {
+                    if (typeof snowArr[i] == "undefined") {
+                        snowArr[i] = createSnow(true);
+                    } else {
+                        snowArr[i] = createSnow();
+                    }
+                }
+                var data = snowArr[i];
+                data.top += data.speed;
+                data.snow.style.top = data.top + "px";
+                if (data.top > wHeight) {
+                    document.body.removeChild(data.snow);
+                    snowArr[i] = null;
+                }
+            }
+            requestAnimationFrame(draw);
+        }
+        draw();
+    })();
+</script>
 <!-- END PAGE LEVEL PLUGINS -->
 <!-- BEGIN THEME GLOBAL SCRIPTS -->
 <script src="/assets/global/scripts/app.min.js" type="text/javascript"></script>

resources/views/shop/addGoods.blade.php

@@ -24,7 +24,7 @@
                     </div>
                 @endif
                 <div class="note note-warning">
-                    <p>警告：购买新套餐则会覆盖所有已购但未过期的旧套餐并删除对应的流量，所以设置商品时请务必注意类型和有效期。</p>
+                    <p>警告：购买新套餐则会覆盖所有已购但未过期的旧套餐并删除这些旧套餐对应的流量，所以设置商品时请务必注意类型和有效期。</p>
                 </div>
                 <!-- BEGIN PORTLET-->
                 <div class="portlet light bordered">

resources/views/shop/editGoods.blade.php

@@ -22,6 +22,9 @@
                         <strong>错误：</strong> {{Session::get('errorMsg')}}
                     </div>
                 @endif
+                <div class="note note-warning">
+                    <p>警告：购买新套餐则会覆盖所有已购但未过期的旧套餐并删除这些旧套餐对应的流量，所以设置商品时请务必注意类型和有效期。</p>
+                </div>
                 <!-- BEGIN PORTLET-->
                 <div class="portlet light bordered">
                     <div class="portlet-title">

resources/views/user/free.blade.php

@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<!--[if IE 8]> <html lang="{{app()->getLocale()}}" class="ie8 no-js"> <![endif]-->
+<!--[if IE 9]> <html lang="{{app()->getLocale()}}" class="ie9 no-js"> <![endif]-->
+<!--[if !IE]><!-->
+<html lang="{{app()->getLocale()}}">
+<!--<![endif]-->
+
+<head>
+    <meta charset="utf-8" />
+    <title>@yield('title')</title>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta content="width=device-width, initial-scale=1" name="viewport" />
+    <meta content="" name="description" />
+    <meta content="" name="author" />
+    <!-- BEGIN GLOBAL MANDATORY STYLES -->
+    <link href="/assets/global/plugins/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
+    <link href="/assets/global/plugins/simple-line-icons/simple-line-icons.min.css" rel="stylesheet" type="text/css" />
+    <link href="/assets/global/plugins/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+    <link href="/assets/global/plugins/bootstrap-switch/css/bootstrap-switch.min.css" rel="stylesheet" type="text/css" />
+    <!-- END GLOBAL MANDATORY STYLES -->
+    <!-- BEGIN PAGE LEVEL PLUGINS -->
+@yield('css')
+<!-- END PAGE LEVEL PLUGINS -->
+    <!-- BEGIN THEME GLOBAL STYLES -->
+    <link href="/assets/global/css/components-rounded.min.css" rel="stylesheet" id="style_components" type="text/css" />
+    <link href="/assets/global/css/plugins.min.css" rel="stylesheet" type="text/css" />
+    <!-- END THEME GLOBAL STYLES -->
+    <!-- BEGIN THEME LAYOUT STYLES -->
+    <link href="/assets/layouts/layout4/css/layout.min.css" rel="stylesheet" type="text/css" />
+    <link href="/assets/layouts/layout4/css/themes/default.min.css" rel="stylesheet" type="text/css" id="style_color" />
+    <link href="/assets/layouts/layout4/css/custom.min.css" rel="stylesheet" type="text/css" />
+    <!-- END THEME LAYOUT STYLES -->
+    <link rel="shortcut icon" href="{{asset('favicon.ico')}}" />
+</head>
+
+<body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo">
+<!-- BEGIN HEADER -->
+<div class="page-header navbar navbar-fixed-top">
+    <!-- BEGIN HEADER INNER -->
+    <div class="page-header-inner ">
+        <!-- BEGIN LOGO -->
+        <div class="page-logo">
+            <a href="{{url('/')}}">
+                <img src="/assets/images/logo.png" alt="logo" class="logo-default" />
+            </a>
+        </div>
+        <!-- END LOGO -->
+    </div>
+    <!-- END HEADER INNER -->
+</div>
+<!-- END HEADER -->
+<!-- BEGIN HEADER & CONTENT DIVIDER -->
+<div class="clearfix"> </div>
+<!-- END HEADER & CONTENT DIVIDER -->
+<!-- BEGIN CONTAINER -->
+<div class="page-container">
+
+    <!-- BEGIN CONTENT BODY -->
+    <div class="page-content" style="padding-top:0;">
+        <!-- BEGIN PAGE BASE CONTENT -->
+        <div class="row">
+            <div class="col-md-12">
+                <div class="tab-pane active">
+                    <div class="portlet light bordered">
+                        <div class="portlet-title">
+                            <div class="caption">
+                                <span class="caption-subject font-dark bold">{{trans('home.free_invite_codes_title')}}</span>
+                            </div>
+                        </div>
+                        <div class="portlet-body">
+                            <div class="table-scrollable table-scrollable-borderless">
+                                <table class="table table-hover table-light">
+                                    @if($is_invite_register)
+                                        <thead>
+                                            <tr>
+                                                <th style="text-align: center;"> {{trans('home.invite_code_table_name')}} </th>
+                                                <th style="text-align: center;"> {{trans('home.invite_code_table_date')}} </th>
+                                            </tr>
+                                        </thead>
+                                        <tbody>
+                                            @if($inviteList->isEmpty())
+                                                <tr>
+                                                    <td colspan="2" style="text-align: center;">{{trans('home.invite_code_table_none_codes')}}</td>
+                                                </tr>
+                                            @else
+                                                @foreach($inviteList as $key => $invite)
+                                                    <tr>
+                                                        <td style="width: 50%; text-align: center;"> <a href="{{url('register?aff='.Session::get('user')['id'].'&code='.$invite->code)}}" target="_blank">{{$invite->code}}</a> </td>
+                                                        <td style="width: 50%; text-align: center;"> {{$invite->dateline}} </td>
+                                                    </tr>
+                                                @endforeach
+                                            @endif
+                                        </tbody>
+                                    @else
+                                        <tbody>
+                                            <tr>
+                                                <td colspan="2" style="text-align: center;">{{trans('home.no_need_invite_codes')}}</td>
+                                            </tr>
+                                        </tbody>
+                                    @endif
+                                </table>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-12 col-sm-12">
+                                    <div class="dataTables_paginate paging_bootstrap_full_number pull-right">
+                                        {{ $inviteList->links() }}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- END PAGE BASE CONTENT -->
+    </div>
+    <!-- END CONTENT BODY -->
+
+<!-- END CONTENT -->
+</div>
+<!-- END CONTAINER -->
+<!--[if lt IE 9]>
+<script src="/assets/global/plugins/respond.min.js"></script>
+<script src="/assets/global/plugins/excanvas.min.js"></script>
+<script src="/assets/global/plugins/ie8.fix.min.js"></script>
+<![endif]-->
+<!-- BEGIN CORE PLUGINS -->
+<script src="/assets/global/plugins/jquery.min.js" type="text/javascript"></script>
+<script src="/assets/global/plugins/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
+<script src="/assets/global/plugins/js.cookie.min.js" type="text/javascript"></script>
+<script src="/assets/global/plugins/jquery-slimscroll/jquery.slimscroll.min.js" type="text/javascript"></script>
+<script src="/assets/global/plugins/jquery.blockui.min.js" type="text/javascript"></script>
+<script src="/assets/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
+<!-- END CORE PLUGINS -->
+<!-- BEGIN PAGE LEVEL PLUGINS -->
+<!-- END PAGE LEVEL PLUGINS -->
+<!-- BEGIN THEME GLOBAL SCRIPTS -->
+<script src="/assets/global/scripts/app.min.js" type="text/javascript"></script>
+<!-- END THEME GLOBAL SCRIPTS -->
+<!-- BEGIN THEME LAYOUT SCRIPTS -->
+<script src="/assets/layouts/layout4/scripts/layout.min.js" type="text/javascript"></script>
+<!-- END THEME LAYOUT SCRIPTS -->
+</body>
+
+</html>

resources/views/user/goodsList.blade.php

@@ -49,7 +49,7 @@
                                                 <br>
                                                 {{trans('home.service_days')}}：{{$goods->days}} {{trans('home.day')}}
                                             </td>
-                                            <td style="text-align: center;"> ￥{{$goods->price}} </td>
+                                            <td style="text-align: center;"> $ {{$goods->price}} </td>
                                             <td style="text-align: center;">
                                                 <button type="button" class="btn btn-sm blue" onclick="buy('{{$goods->id}}')">{{trans('home.service_buy_button')}}</button>
                                                 <!--<button type="button" class="btn btn-sm blue btn-outline" onclick="exchange('{{$goods->id}}')">兑换</button>-->

resources/views/user/index.blade.php

@@ -145,7 +145,6 @@
                                     <div class="col-md-6">
                                         <select class="form-control" name="charge_type" id="charge_type">
                                             <option value="1" selected>卡券</option>
-                                            <option value="2">PayPal在线充值</option>
                                         </select>
                                     </div>
                                 </div>
@@ -249,11 +248,6 @@
                 return false;
             }
 
-            if (charge_type == '2') {
-                $("#charge_msg").show().html("暂不支持");
-                return false;
-            }
-
             $.ajax({
                 url:'{{url('user/charge')}}',
                 type:"POST",

resources/views/user/orderList.blade.php

@@ -46,7 +46,7 @@
                                         <tr class="odd gradeX">
                                             <td>{{$order->orderId}}</td>
                                             <td>{{empty($order->goods) ? '【商品已删除】' : $order->goods->name}}</td>
-                                            <td>￥{{$order->totalPrice}}</td>
+                                            <td>${{$order->totalPrice}}</td>
                                             <td>{{date('Y-m-d', strtotime($order->created_at))}}</td>
                                             <td>
                                                 @if(!$order->is_expire)

routes/web.php

@@ -10,6 +10,7 @@ Route::get('active/{token}', 'UserController@active'); // 激活账号
 Route::get('subscribe/{code}', 'SubscribeController@index'); // 节点订阅地址
 Route::get('article', 'ArticleController@index'); // 定位文章详情
 Route::post('locate', 'LocateController@locate'); // 上报文章打开时的定位
+Route::get('free', 'UserController@free'); // 免费邀请码
 
 Route::group(['middleware' => ['user', 'admin']], function() {
     Route::get('admin', 'AdminController@index'); // 后台首页