admin před 7 roky
rodič
revize
22d32071e4
66 změnil soubory, kde provedl 167 přidání a 400 odebrání
  1. 2 2
      app/Http/Controllers/CouponController.php
  2. 0 4
      resources/views/admin/addArticle.blade.php
  3. 0 5
      resources/views/admin/addGroup.blade.php
  4. 0 5
      resources/views/admin/addLabel.blade.php
  5. 0 4
      resources/views/admin/addNode.blade.php
  6. 0 4
      resources/views/admin/addUser.blade.php
  7. 0 2
      resources/views/admin/analysis.blade.php
  8. 0 2
      resources/views/admin/applyDetail.blade.php
  9. 12 11
      resources/views/admin/applyList.blade.php
  10. 0 4
      resources/views/admin/articleList.blade.php
  11. 0 4
      resources/views/admin/config.blade.php
  12. 0 4
      resources/views/admin/convert.blade.php
  13. 0 4
      resources/views/admin/decompile.blade.php
  14. 0 4
      resources/views/admin/editArticle.blade.php
  15. 0 5
      resources/views/admin/editGroup.blade.php
  16. 0 5
      resources/views/admin/editLabel.blade.php
  17. 0 4
      resources/views/admin/editNode.blade.php
  18. 1 5
      resources/views/admin/editUser.blade.php
  19. 0 12
      resources/views/admin/emailLog.blade.php
  20. 0 2
      resources/views/admin/export.blade.php
  21. 0 4
      resources/views/admin/groupList.blade.php
  22. 0 2
      resources/views/admin/import.blade.php
  23. 2 2
      resources/views/admin/index.blade.php
  24. 0 4
      resources/views/admin/inviteList.blade.php
  25. 0 4
      resources/views/admin/labelList.blade.php
  26. 2 1
      resources/views/admin/layouts.blade.php
  27. 0 4
      resources/views/admin/nodeList.blade.php
  28. 1 4
      resources/views/admin/nodeMonitor.blade.php
  29. 18 17
      resources/views/admin/orderList.blade.php
  30. 0 3
      resources/views/admin/profile.blade.php
  31. 14 13
      resources/views/admin/subscribeLog.blade.php
  32. 1 5
      resources/views/admin/system.blade.php
  33. 14 11
      resources/views/admin/trafficLog.blade.php
  34. 10 7
      resources/views/admin/userBalanceLogList.blade.php
  35. 10 7
      resources/views/admin/userBanLogList.blade.php
  36. 23 24
      resources/views/admin/userList.blade.php
  37. 1 4
      resources/views/admin/userMonitor.blade.php
  38. 15 12
      resources/views/admin/userRebateList.blade.php
  39. 10 7
      resources/views/admin/userTrafficLogList.blade.php
  40. 15 20
      resources/views/coupon/addCoupon.blade.php
  41. 0 3
      resources/views/coupon/couponList.blade.php
  42. 0 3
      resources/views/marketing/emailList.blade.php
  43. 0 3
      resources/views/marketing/pushList.blade.php
  44. 0 12
      resources/views/payment/callbackList.blade.php
  45. 0 4
      resources/views/payment/detail.blade.php
  46. 0 5
      resources/views/sensitiveWords/addSensitiveWords.blade.php
  47. 0 11
      resources/views/sensitiveWords/sensitiveWordsList.blade.php
  48. 2 16
      resources/views/shop/addGoods.blade.php
  49. 2 15
      resources/views/shop/editGoods.blade.php
  50. 0 2
      resources/views/shop/goodsList.blade.php
  51. 0 4
      resources/views/ticket/replyTicket.blade.php
  52. 0 2
      resources/views/ticket/ticketList.blade.php
  53. 2 5
      resources/views/user/article.blade.php
  54. 1 5
      resources/views/user/buy.blade.php
  55. 0 4
      resources/views/user/help.blade.php
  56. 3 3
      resources/views/user/index.blade.php
  57. 0 4
      resources/views/user/invite.blade.php
  58. 0 7
      resources/views/user/invoiceDetail.blade.php
  59. 0 12
      resources/views/user/invoices.blade.php
  60. 3 3
      resources/views/user/layouts.blade.php
  61. 0 5
      resources/views/user/profile.blade.php
  62. 0 10
      resources/views/user/referral.blade.php
  63. 1 4
      resources/views/user/replyTicket.blade.php
  64. 1 3
      resources/views/user/services.blade.php
  65. 0 4
      resources/views/user/ticketList.blade.php
  66. 1 4
      resources/views/user/trafficLog.blade.php

+ 2 - 2
app/Http/Controllers/CouponController.php

@@ -48,7 +48,7 @@ class CouponController extends Controller
                 return Redirect::back()->withInput();
             }
 
-            if (strtotime($available_start) >= strtotime($available_end)) {
+            if (strtotime($available_start) > strtotime($available_end)) {
                 Session::flash('errorMsg', '有效期范围错误');
 
                 return Redirect::back()->withInput();
@@ -83,7 +83,7 @@ class CouponController extends Controller
                     $obj->usage = $usage;
                     $obj->amount = empty($amount) ? 0 : $amount;
                     $obj->discount = empty($discount) ? 0 : $discount;
-                    $obj->available_start = strtotime(date('Y-m-d 0:0:0', strtotime($available_start)));
+                    $obj->available_start = strtotime(date('Y-m-d 00:00:00', strtotime($available_start)));
                     $obj->available_end = strtotime(date('Y-m-d 23:59:59', strtotime($available_end)));
                     $obj->status = 0;
                     $obj->save();

+ 0 - 4
resources/views/admin/addArticle.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -91,7 +88,6 @@
 @section('script')
     <script src="/js/ueditor/ueditor.config.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/ueditor/ueditor.all.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 百度富文本编辑器

+ 0 - 5
resources/views/admin/addGroup.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -68,8 +65,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // ajax同步提交
         function do_submit() {

+ 0 - 5
resources/views/admin/addLabel.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -55,8 +52,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // ajax同步提交
         function doSubmit() {

+ 0 - 4
resources/views/admin/addNode.blade.php

@@ -1,11 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -433,7 +430,6 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 用户标签选择器

+ 0 - 4
resources/views/admin/addUser.blade.php

@@ -1,11 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -337,7 +334,6 @@
 @section('script')
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/laydate/laydate.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 用户标签选择器

+ 0 - 2
resources/views/admin/analysis.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 0 - 2
resources/views/admin/applyDetail.blade.php

@@ -1,8 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 12 - 11
resources/views/admin/applyList.blade.php

@@ -1,8 +1,11 @@
 @extends('admin.layouts')
-
 @section('css')
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -17,11 +20,11 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row" style="padding-bottom:5px;">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="申请账号" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="申请账号" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="do_search()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="do_search()">
                                     <option value="" @if(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>
@@ -29,9 +32,9 @@
                                     <option value="2" @if(Request::get('status') == '2') selected @endif>已打款</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="do_search();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="do_reset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="do_search();">查询</button>
+                                <button type="button" class="btn grey" onclick="do_reset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">
@@ -103,8 +106,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 审核
         function doAudit(id) {

+ 0 - 4
resources/views/admin/articleList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -83,8 +81,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 添加文章
         function addArticle() {

+ 0 - 4
resources/views/admin/config.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -347,8 +345,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // modal关闭时刷新页面
         $(".modal").on("hidden.bs.modal", function () {

+ 0 - 4
resources/views/admin/convert.blade.php

@@ -1,8 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -91,8 +89,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 转换
         function doConvert() {

+ 0 - 4
resources/views/admin/decompile.blade.php

@@ -1,8 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -43,8 +41,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 转换
         function doDecompile() {

+ 0 - 4
resources/views/admin/editArticle.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -97,7 +94,6 @@
 @section('script')
     <script src="/js/ueditor/ueditor.config.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/ueditor/ueditor.all.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 百度富文本编辑器

+ 0 - 5
resources/views/admin/editGroup.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -68,8 +65,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // ajax同步提交
         function do_submit() {

+ 0 - 5
resources/views/admin/editLabel.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -62,8 +59,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // ajax同步提交
         function doSubmit() {

+ 0 - 4
resources/views/admin/editNode.blade.php

@@ -1,11 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -432,7 +429,6 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 用户标签选择器

+ 1 - 5
resources/views/admin/editUser.blade.php

@@ -1,11 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -412,7 +409,6 @@
 @section('script')
     <script src="/assets/global/plugins/laydate/laydate.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 用户标签选择器
@@ -605,4 +601,4 @@
             });
         }
     </script>
-@endsection
+@endsection

+ 0 - 12
resources/views/admin/emailLog.blade.php

@@ -1,15 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
-    <style>
-        .fancybox > img {
-            width: 75px;
-            height: 75px;
-        }
-    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -78,7 +69,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 0 - 2
resources/views/admin/export.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 0 - 4
resources/views/admin/groupList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -79,8 +77,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 添加节点分组
         function addGroup() {

+ 0 - 2
resources/views/admin/import.blade.php

@@ -1,9 +1,7 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 2 - 2
resources/views/admin/index.blade.php

@@ -1,6 +1,6 @@
 @extends('admin.layouts')
-
-@section('title', '控制面板')
+@section('css')
+@endsection
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 0 - 4
resources/views/admin/inviteList.blade.php

@@ -1,8 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -108,8 +106,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 生成邀请码
         function makeInvite() {

+ 0 - 4
resources/views/admin/labelList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -84,8 +82,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 添加标签
         function addLabel() {

+ 2 - 1
resources/views/admin/layouts.blade.php

@@ -7,7 +7,7 @@
 
 <head>
     <meta charset="utf-8" />
-    <title>@yield('title')</title>
+    <title>{{\App\Components\Helpers::systemConfig()['website_name']}}</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1" name="viewport" />
     <meta content="" name="description" />
@@ -362,6 +362,7 @@
 <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>
+<script src="/js/layer/layer.js" type="text/javascript"></script>
 <!-- END CORE PLUGINS -->
 <!-- BEGIN PAGE LEVEL PLUGINS -->
 @yield('script')

+ 0 - 4
resources/views/admin/nodeList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -109,8 +107,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 添加节点
         function addNode() {

+ 1 - 4
resources/views/admin/nodeMonitor.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -134,4 +131,4 @@
 
         myChart.setOption(option);
     </script>
-@endsection
+@endsection

+ 18 - 17
resources/views/admin/orderList.blade.php

@@ -1,8 +1,11 @@
 @extends('admin.layouts')
-
 @section('css')
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -17,32 +20,32 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="is_expire" id="is_expire" onchange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="is_expire" id="is_expire" onchange="doSearch()">
                                     <option value="" @if(Request::get('is_expire') == '') selected @endif>过期</option>
                                     <option value="0" @if(Request::get('is_expire') == '0') selected @endif>否</option>
                                     <option value="1" @if(Request::get('is_expire') == '1') selected @endif>是</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="is_coupon" id="is_coupon" onchange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="is_coupon" id="is_coupon" onchange="doSearch()">
                                     <option value="" @if(Request::get('is_coupon') == '') selected @endif>使用优惠券</option>
                                     <option value="0" @if(Request::get('is_coupon') == '0') selected @endif>否</option>
                                     <option value="1" @if(Request::get('is_coupon') == '1') selected @endif>是</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="pay_way" id="pay_way" onchange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="pay_way" id="pay_way" onchange="doSearch()">
                                     <option value="" @if(Request::get('pay_way') == '') selected @endif>支付方式</option>
                                     <option value="1" @if(Request::get('pay_way') == '1') selected @endif>余额支付</option>
                                     <option value="2" @if(Request::get('pay_way') == '2') selected @endif>有赞云支付</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onchange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onchange="doSearch()">
                                     <option value="" @if(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>
@@ -50,9 +53,9 @@
                                     <option value="2" @if(Request::get('status') == '2') selected @endif>已完成</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">
@@ -132,8 +135,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 搜索
         function doSearch() {

+ 0 - 3
resources/views/admin/profile.blade.php

@@ -1,9 +1,7 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/pages/css/profile.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -102,5 +100,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-
 @endsection

+ 14 - 13
resources/views/admin/subscribeLog.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,22 +23,22 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="user_id" value="{{Request::get('user_id')}}" id="user_id" placeholder="用户ID" onkeydown="if(event.keyCode==13){doSearch();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="user_id" value="{{Request::get('user_id')}}" id="user_id" placeholder="用户ID" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){doSearch();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="doSearch()">
                                     <option value="" @if(Request::get('status') == '') 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">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">
@@ -101,8 +104,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 搜索
         function doSearch() {

+ 1 - 5
resources/views/admin/system.blade.php

@@ -1,5 +1,4 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
@@ -7,8 +6,6 @@
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -865,7 +862,6 @@
     <script src="/assets/global/plugins/bootstrap-switch/js/bootstrap-switch.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 注册的默认标签
@@ -1868,4 +1864,4 @@
             });
         }
     </script>
-@endsection
+@endsection

+ 14 - 11
resources/views/admin/trafficLog.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,18 +23,18 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="port" value="{{Request::get('port')}}" id="port" placeholder="端口" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="port" value="{{Request::get('port')}}" id="port" placeholder="端口" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="user_id" value="{{Request::get('user_id')}}" id="user_id" placeholder="用户ID" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="user_id" value="{{Request::get('user_id')}}" id="user_id" placeholder="用户ID" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="do_search();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="do_reset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="do_search();">查询</button>
+                                <button type="button" class="btn grey" onclick="do_reset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">

+ 10 - 7
resources/views/admin/userBalanceLogList.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,12 +23,12 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="do_search();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="do_reset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="do_search();">查询</button>
+                                <button type="button" class="btn grey" onclick="do_reset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">

+ 10 - 7
resources/views/admin/userBanLogList.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,12 +23,12 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">

+ 23 - 24
resources/views/admin/userList.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -26,23 +29,21 @@
                         </div>
                     </div>
                     <div class="portlet-body">
-                        <div class="row" style="padding-bottom:5px;">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){doSearch();}">
+                        <div class="row">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 col-sm-4 col-xs-12 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="wechat" value="{{Request::get('wechat')}}" id="wechat" placeholder="微信" onkeydown="if(event.keyCode==13){doSearch();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 col-sm-4 col-xs-12 form-control" name="wechat" value="{{Request::get('wechat')}}" id="wechat" placeholder="微信" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="qq" value="{{Request::get('qq')}}" id="qq" placeholder="QQ" onkeydown="if(event.keyCode==13){doSearch();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 col-sm-4 col-xs-12 form-control" name="qq" value="{{Request::get('qq')}}" id="qq" placeholder="QQ" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                        </div>
-                        <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="port" value="{{Request::get('port')}}" id="port" placeholder="端口" onkeydown="if(event.keyCode==13){doSearch();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="port" value="{{Request::get('port')}}" id="port" placeholder="端口" onkeydown="if(event.keyCode==13){doSearch();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="pay_way" id="pay_way" onChange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="pay_way" id="pay_way" onChange="doSearch()">
                                     <option value="" @if(Request::get('pay_way') == '') selected @endif>付费方式</option>
                                     <option value="0" @if(Request::get('pay_way') == '0') selected @endif>免费</option>
                                     <option value="1" @if(Request::get('pay_way') == '1') selected @endif>月付</option>
@@ -51,24 +52,24 @@
                                     <option value="4" @if(Request::get('pay_way') == '4') selected @endif>年付</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="doSearch()">
                                     <option value="" @if(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="doSearch()">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="enable" id="enable" onChange="doSearch()">
                                     <option value="" @if(Request::get('enable') == '') selected @endif>代理状态</option>
                                     <option value="1" @if(Request::get('enable') == '1') selected @endif>启用</option>
                                     <option value="0" @if(Request::get('enable') == '0') selected @endif>禁用</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="doSearch();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="doReset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="doSearch();">查询</button>
+                                <button type="button" class="btn grey" onclick="doReset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">
@@ -173,8 +174,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 导出原版json配置
         function exportSSJson() {

+ 1 - 4
resources/views/admin/userMonitor.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
 @endsection
-
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -138,4 +135,4 @@
 
         myChart.setOption(option);
     </script>
-@endsection
+@endsection

+ 15 - 12
resources/views/admin/userRebateList.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css"/>
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css"/>
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,23 +23,23 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="消费者" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="消费者" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="ref_username" value="{{Request::get('ref_username')}}" id="ref_username" placeholder="邀请人" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="ref_username" value="{{Request::get('ref_username')}}" id="ref_username" placeholder="邀请人" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-			                <div class="col-md-2 col-sm-2">
-                                <select class="form-control input-sm" name="status" id="status" onChange="doSearch()">
+			                <div class="col-md-3 col-sm-4 col-xs-12">
+                                <select class="form-control" name="status" id="status" onChange="doSearch()">
                                     <option value="" @if(Request::get('status') == '') 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>
                                     <option value="2" @if(Request::get('status') == '2') selected @endif>已提现</option>
                                 </select>
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="do_search();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="do_reset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="do_search();">查询</button>
+                                <button type="button" class="btn grey" onclick="do_reset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">
@@ -110,7 +113,7 @@
         function do_search() {
             var username = $("#username").val();
             var ref_username = $("#ref_username").val();
-	    var status = $("#status option:checked").val();
+	        var status = $("#status option:checked").val();
 
             window.location.href = '{{url('admin/userRebateList')}}' + '?username=' + username + '&ref_username=' + ref_username + '&status=' + status;
         }

+ 10 - 7
resources/views/admin/userTrafficLogList.blade.php

@@ -1,10 +1,13 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
+    <style type="text/css">
+        input,select {
+            margin-bottom: 5px;
+        }
+    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -20,12 +23,12 @@
                     </div>
                     <div class="portlet-body">
                         <div class="row">
-                            <div class="col-md-2 col-sm-2">
-                                <input type="text" class="col-md-4 form-control input-sm" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <input type="text" class="col-md-4 form-control" name="username" value="{{Request::get('username')}}" id="username" placeholder="用户名" onkeydown="if(event.keyCode==13){do_search();}">
                             </div>
-                            <div class="col-md-2 col-sm-2">
-                                <button type="button" class="btn btn-sm blue" onclick="do_search();">查询</button>
-                                <button type="button" class="btn btn-sm grey" onclick="do_reset();">重置</button>
+                            <div class="col-md-3 col-sm-4 col-xs-12">
+                                <button type="button" class="btn blue" onclick="do_search();">查询</button>
+                                <button type="button" class="btn grey" onclick="do_reset();">重置</button>
                             </div>
                         </div>
                         <div class="table-scrollable table-scrollable-borderless">

+ 15 - 20
resources/views/coupon/addCoupon.blade.php

@@ -1,10 +1,7 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.css" rel="stylesheet" type="text/css" />
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -38,7 +35,7 @@
                                 <div class="form-group">
                                     <label class="control-label col-md-3">卡券名称</label>
                                     <div class="col-md-4">
-                                        <input type="text" class="form-control" name="name" value="" id="name" placeholder="" required>
+                                        <input type="text" class="form-control" name="name" value="" id="name" autocomplete="off" required>
                                         <input type="hidden" name="_token" value="{{csrf_token()}}" />
                                     </div>
                                 </div>
@@ -99,7 +96,7 @@
                                     <label class="control-label col-md-3">数量</label>
                                     <div class="col-md-4">
                                         <div class="input-group">
-                                            <input type="text" class="form-control" name="num" value="{{Request::old('num')}}" id="num" placeholder="" required>
+                                            <input type="text" class="form-control" name="num" value="{{Request::old('num')}}" id="num" autocomplete="off" required>
                                             <span class="input-group-addon">张</span>
                                         </div>
                                     </div>
@@ -108,7 +105,7 @@
                                     <label class="control-label col-md-3">金额</label>
                                     <div class="col-md-4">
                                         <div class="input-group">
-                                            <input type="text" class="form-control" name="amount" value="{{Request::old('amount')}}" id="amount" placeholder="" required>
+                                            <input type="text" class="form-control" name="amount" value="{{Request::old('amount')}}" id="amount" autocomplete="off" required>
                                             <span class="input-group-addon">元</span>
                                         </div>
                                     </div>
@@ -117,7 +114,7 @@
                                     <label class="control-label col-md-3">折扣</label>
                                     <div class="col-md-4">
                                         <div class="input-group">
-                                            <input type="text" class="form-control" name="discount" value="{{Request::old('discount')}}" id="discount" placeholder="">
+                                            <input type="text" class="form-control" name="discount" value="{{Request::old('discount')}}" id="discount" autocomplete="off" placeholder="">
                                             <span class="input-group-addon">折</span>
                                         </div>
                                     </div>
@@ -126,9 +123,9 @@
                                     <label class="control-label col-md-3">有效期</label>
                                     <div class="col-md-4">
                                         <div class="input-group input-large input-daterange">
-                                            <input type="text" class="form-control" name="available_start" value="{{Request::old('available_start')}}" id="available_start" required>
+                                            <input type="text" class="form-control" name="available_start" value="{{Request::old('available_start')}}" id="available_start" autocomplete="off" required>
                                             <span class="input-group-addon"> 至 </span>
-                                            <input type="text" class="form-control" name="available_end" value="{{Request::old('available_end')}}" id="available_end" required>
+                                            <input type="text" class="form-control" name="available_end" value="{{Request::old('available_end')}}" id="available_end" autocomplete="off" required>
                                         </div>
                                     </div>
                                 </div>
@@ -152,20 +149,18 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootbox/bootbox.min.js" type="text/javascript"></script>
+    <script src="/assets/global/plugins/laydate/laydate.js" type="text/javascript"></script>
 
     <script type="text/javascript">
-        // 有效期
-        $('.input-daterange input').each(function() {
-            $(this).datepicker({
-                language: 'zh-CN',
-                autoclose: true,
-                todayHighlight: true,
-                format: 'yyyy-mm-dd'
-            });
+        // 有效期-开始
+        laydate.render({
+            elem: '#available_start'
+        });
+
+        // 有效期-结束
+        laydate.render({
+            elem: '#available_end'
         });
 
         // 根据类型显示

+ 0 - 3
resources/views/coupon/couponList.blade.php

@@ -1,5 +1,4 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
     <style>
@@ -9,7 +8,6 @@
         }
     </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -119,7 +117,6 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/fancybox/source/jquery.fancybox.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 批量导出卡券

+ 0 - 3
resources/views/marketing/emailList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -90,7 +88,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript">
         // 发送邮件
         function send() {

+ 0 - 3
resources/views/marketing/pushList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -131,7 +129,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript">
         // 发送通道消息
         function send() {

+ 0 - 12
resources/views/payment/callbackList.blade.php

@@ -1,15 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
-    <style>
-        .fancybox > img {
-            width: 75px;
-            height: 75px;
-        }
-    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -92,7 +83,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 0 - 4
resources/views/payment/detail.blade.php

@@ -1,9 +1,6 @@
 @extends('user.layouts')
-
 @section('css')
-
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -54,7 +51,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript">
         // 每800毫秒查询一次订单状态
         $(document).ready(function(){

+ 0 - 5
resources/views/sensitiveWords/addSensitiveWords.blade.php

@@ -1,9 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -73,8 +70,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // ajax同步提交
         function do_submit() {

+ 0 - 11
resources/views/sensitiveWords/sensitiveWordsList.blade.php

@@ -1,15 +1,6 @@
 @extends('admin.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
-    <style>
-        .fancybox > img {
-            width: 75px;
-            height: 75px;
-        }
-    </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -96,8 +87,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 添加敏感词
         function addSensitiveWords()

+ 2 - 16
resources/views/shop/addGoods.blade.php

@@ -1,12 +1,9 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.css" rel="stylesheet" type="text/css" />
-    <link href="/assets/global/plugins/bootstrap-datepicker/css/bootstrap-datepicker3.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -228,9 +225,8 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         // 用户标签选择器
         $('#labels').select2({
@@ -240,16 +236,6 @@
             width:'100%'
         });
 
-        // 有效期
-        $('.input-daterange input').each(function() {
-            $(this).datepicker({
-                language: 'zh-CN',
-                autoclose: true,
-                todayHighlight: true,
-                format: 'yyyy-mm-dd'
-            });
-        });
-
         // 选择商品类型
         $("input[name='type']").change(function(){
             var type = $(this).val();
@@ -260,4 +246,4 @@
             }
         });
     </script>
-@endsection
+@endsection

+ 2 - 15
resources/views/shop/editGoods.blade.php

@@ -1,11 +1,9 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -233,9 +231,8 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/bootstrap-fileinput/bootstrap-fileinput.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootstrap-datepicker/js/bootstrap-datepicker.min.js" type="text/javascript"></script>
-    <script src="/assets/global/plugins/bootstrap-datepicker/locales/bootstrap-datepicker.zh-CN.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/select2/js/select2.full.min.js" type="text/javascript"></script>
+
     <script type="text/javascript">
         // 用户标签选择器
         $('#labels').select2({
@@ -244,15 +241,5 @@
             allowClear: true,
             width:'100%'
         });
-
-        // 有效期
-        $('.input-daterange input').each(function() {
-            $(this).datepicker({
-                language: 'zh-CN',
-                autoclose: true,
-                todayHighlight: true,
-                format: 'yyyy-mm-dd'
-            });
-        });
     </script>
-@endsection
+@endsection

+ 0 - 2
resources/views/shop/goodsList.blade.php

@@ -9,7 +9,6 @@
         }
     </style>
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -123,7 +122,6 @@
 @endsection
 @section('script')
     <script src="/assets/global/plugins/fancybox/source/jquery.fancybox.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         function addGoods() {

+ 0 - 4
resources/views/ticket/replyTicket.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -117,10 +115,8 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/assets/global/plugins/bootbox/bootbox.min.js" type="text/javascript"></script>
     <script src="/js/ueditor/ueditor.config.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/ueditor/ueditor.all.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         @if($ticket->status != 2)

+ 0 - 2
resources/views/ticket/ticketList.blade.php

@@ -1,10 +1,8 @@
 @extends('admin.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', '控制面板')
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">

+ 2 - 5
resources/views/user/article.blade.php

@@ -1,6 +1,6 @@
 @extends('user.layouts')
-
-@section('title', trans('home.panel'))
+@section('css')
+@endsection
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -26,7 +26,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 1 - 5
resources/views/user/buy.blade.php

@@ -1,9 +1,7 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/pages/css/invoice-2.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -91,8 +89,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 校验优惠券是否可用
         function redeemCoupon() {
@@ -207,4 +203,4 @@
             });
         }
     </script>
-@endsection
+@endsection

+ 0 - 4
resources/views/user/help.blade.php

@@ -2,7 +2,6 @@
 @section('css')
     <link href="/assets/pages/css/search.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top: 0;">
@@ -44,7 +43,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

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

@@ -1,5 +1,6 @@
 @extends('user.layouts')
-@section('title', trans('home.panel'))
+@section('css')
+@endsection
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -367,7 +368,7 @@
             </div>
         </div>
 
-        @foreach ($nodeList as $node)
+        @foreach($nodeList as $node)
             <!-- 配置文本 -->
             <div class="modal fade draggable-modal" id="txt_{{$node->id}}" tabindex="-1" role="basic" aria-hidden="true">
                 <div class="modal-dialog">
@@ -453,7 +454,6 @@
     <script src="/assets/pages/scripts/components-clipboard.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/jquery-qrcode/jquery.qrcode.min.js" type="text/javascript"></script>
     <script src="/assets/global/plugins/jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 切换充值方式

+ 0 - 4
resources/views/user/invite.blade.php

@@ -1,8 +1,6 @@
 @extends('user.layouts')
-
 @section('css')
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -100,8 +98,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 生成邀请码
         function makeInvite() {

+ 0 - 7
resources/views/user/invoiceDetail.blade.php

@@ -1,9 +1,7 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/pages/css/invoice-2.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -95,9 +93,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 0 - 12
resources/views/user/invoices.blade.php

@@ -1,15 +1,6 @@
 @extends('user.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
-    <style>
-        .fancybox > img {
-            width: 75px;
-            height: 75px;
-        }
-    </style>
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top: 0;">
@@ -91,7 +82,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 3 - 3
resources/views/user/layouts.blade.php

@@ -7,7 +7,7 @@
 
 <head>
     <meta charset="utf-8" />
-    <title>@yield('title')</title>
+    <title>{{\App\Components\Helpers::systemConfig()['website_name']}}</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content="width=device-width, initial-scale=1" name="viewport" />
     <meta content="" name="description" />
@@ -202,12 +202,12 @@
 <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>
+<script src="/js/layer/layer.js" type="text/javascript"></script>
 <!-- END CORE PLUGINS -->
 <!-- BEGIN PAGE LEVEL PLUGINS -->
 @yield('script')
 
 @if(Session::get("admin"))
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
     <script type="text/javascript">
         $("#return_to_admin").click(function () {
             $.ajax({
@@ -255,4 +255,4 @@
 {!! \App\Components\Helpers::systemConfig()['website_customer_service'] !!}
 </body>
 
-</html>
+</html>

+ 0 - 5
resources/views/user/profile.blade.php

@@ -1,9 +1,7 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/pages/css/profile.min.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top: 0px; min-height: 354px;">
@@ -116,7 +114,4 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script type="text/javascript">
-        //
-    </script>
 @endsection

+ 0 - 10
resources/views/user/referral.blade.php

@@ -1,15 +1,6 @@
 @extends('user.layouts')
-
 @section('css')
-    <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
-    <style>
-        .fancybox > img {
-            width: 75px;
-            height: 75px;
-        }
-    </style>
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -213,7 +204,6 @@
 @section('script')
     <script src="/assets/global/plugins/clipboardjs/clipboard.min.js" type="text/javascript"></script>
     <script src="/assets/pages/scripts/components-clipboard.min.js" type="text/javascript"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         // 申请提现

+ 1 - 4
resources/views/user/replyTicket.blade.php

@@ -1,10 +1,8 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -119,7 +117,6 @@
 @section('script')
     <script src="/js/ueditor/ueditor.config.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/ueditor/ueditor.all.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
 
     <script type="text/javascript">
         @if($ticket->status != 2)
@@ -174,4 +171,4 @@
             });
         }         
     </script>
-@endsection
+@endsection

+ 1 - 3
resources/views/user/services.blade.php

@@ -1,5 +1,4 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/pages/css/pricing.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/fancybox/source/jquery.fancybox.css" rel="stylesheet" type="text/css" />
@@ -10,7 +9,6 @@
         }
     </style>
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -90,7 +88,7 @@
             window.location.href = '/buy/' + goods_id;
         }
 
-        // 编辑商品
+        // 积分兑换商品
         function exchange(id) {
             //
         }

+ 0 - 4
resources/views/user/ticketList.blade.php

@@ -1,10 +1,8 @@
 @extends('user.layouts')
-
 @section('css')
     <link href="/assets/global/plugins/datatables/datatables.min.css" rel="stylesheet" type="text/css" />
     <link href="/assets/global/plugins/datatables/plugins/bootstrap/datatables.bootstrap.css" rel="stylesheet" type="text/css" />
 @endsection
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -93,8 +91,6 @@
     <!-- END CONTENT BODY -->
 @endsection
 @section('script')
-    <script src="/js/layer/layer.js" type="text/javascript"></script>
-
     <script type="text/javascript">
         // 发起工单
         function addTicket() {

+ 1 - 4
resources/views/user/trafficLog.blade.php

@@ -1,9 +1,6 @@
 @extends('user.layouts')
-
 @section('css')
 @endsection
-
-@section('title', trans('home.panel'))
 @section('content')
     <!-- BEGIN CONTENT BODY -->
     <div class="page-content" style="padding-top:0;">
@@ -132,4 +129,4 @@
 
         myChart.setOption(option);
     </script>
-@endsection
+@endsection