兔姬桑 4 жил өмнө
parent
commit
1cd7d07a04
47 өөрчлөгдсөн 696 нэмэгдсэн , 405 устгасан
  1. 19 0
      app/View/Components/Alert.php
  2. 19 0
      app/View/Components/ChatUnit.php
  3. 247 0
      config/ide-helper.php
  4. 1 2
      resources/lang/en/home.php
  5. 1 2
      resources/lang/ja/home.php
  6. 1 2
      resources/lang/ko/home.php
  7. 1 2
      resources/lang/zh-CN/home.php
  8. 1 2
      resources/lang/zh-tw/home.php
  9. 2 1
      resources/views/admin/affiliate/affiliateDetail.blade.php
  10. 1 5
      resources/views/admin/article/addArticle.blade.php
  11. 2 10
      resources/views/admin/article/editArticle.blade.php
  12. 8 3
      resources/views/admin/config/config.blade.php
  13. 2 10
      resources/views/admin/config/profile.blade.php
  14. 261 95
      resources/views/admin/config/system.blade.php
  15. 2 10
      resources/views/admin/coupon/addCoupon.blade.php
  16. 5 8
      resources/views/admin/inviteList.blade.php
  17. 2 2
      resources/views/admin/layouts.blade.php
  18. 2 2
      resources/views/admin/marketing/pushList.blade.php
  19. 3 2
      resources/views/admin/node/authList.blade.php
  20. 9 4
      resources/views/admin/node/nodeInfo.blade.php
  21. 2 14
      resources/views/admin/rule/group/assign.blade.php
  22. 2 14
      resources/views/admin/rule/group/info.blade.php
  23. 5 19
      resources/views/admin/shop/info.blade.php
  24. 2 2
      resources/views/admin/ticket/replyTicket.blade.php
  25. 1 6
      resources/views/admin/tools/analysis.blade.php
  26. 1 6
      resources/views/admin/tools/import.blade.php
  27. 2 14
      resources/views/admin/user/group/info.blade.php
  28. 2 1
      resources/views/admin/user/userInfo.blade.php
  29. 2 6
      resources/views/auth/active.blade.php
  30. 3 11
      resources/views/auth/activeUser.blade.php
  31. 2 2
      resources/views/auth/error.blade.php
  32. 2 2
      resources/views/auth/layouts.blade.php
  33. 2 9
      resources/views/auth/login.blade.php
  34. 2 2
      resources/views/auth/maintenance.blade.php
  35. 2 8
      resources/views/auth/register.blade.php
  36. 3 9
      resources/views/auth/reset.blade.php
  37. 3 9
      resources/views/auth/resetPassword.blade.php
  38. 6 0
      resources/views/components/alert.blade.php
  39. 2 2
      resources/views/components/chat-unit.blade.php
  40. 8 8
      resources/views/emails/resetPassword.blade.php
  41. 29 47
      resources/views/user/help.blade.php
  42. 4 14
      resources/views/user/index.blade.php
  43. 6 14
      resources/views/user/invite.blade.php
  44. 4 4
      resources/views/user/layouts.blade.php
  45. 7 13
      resources/views/user/profile.blade.php
  46. 1 5
      resources/views/user/referral.blade.php
  47. 2 2
      resources/views/user/replyTicket.blade.php

+ 19 - 0
app/View/Components/Alert.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+
+class Alert extends Component {
+	public $type;
+	public $message;
+
+	public function __construct($type, $message) {
+		$this->type = $type;
+		$this->message = $message;
+	}
+
+	public function render() {
+		return view('components.alert');
+	}
+}

+ 19 - 0
app/View/Components/ChatUnit.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\View\Components;
+
+use Illuminate\View\Component;
+
+class ChatUnit extends Component {
+	public $user;
+	public $ticket;
+
+	public function __construct($user, $ticket) {
+		$this->user = $user;
+		$this->ticket = $ticket;
+	}
+	
+	public function render() {
+		return view('components.chat-unit');
+	}
+}

+ 247 - 0
config/ide-helper.php

@@ -0,0 +1,247 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Filename & Format
+    |--------------------------------------------------------------------------
+    |
+    | The default filename (without extension) and the format (php or json)
+    |
+    */
+
+    'filename'  => '_ide_helper',
+    'format'    => 'php',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Where to write the PhpStorm specific meta file
+    |--------------------------------------------------------------------------
+    |
+    | PhpStorm also supports the directory `.phpstorm.meta.php/` with arbitrary
+    | files in it, should you need additional files for your project; e.g.
+    | `.phpstorm.meta.php/laravel_ide_Helper.php'.
+    |
+    */
+    'meta_filename' => '.phpstorm.meta.php',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Fluent helpers
+    |--------------------------------------------------------------------------
+    |
+    | Set to true to generate commonly used Fluent methods
+    |
+    */
+
+    'include_fluent' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Factory Builders
+    |--------------------------------------------------------------------------
+    |
+    | Set to true to generate factory generators for better factory()
+    | method auto-completion.
+    |
+    */
+
+    'include_factory_builders' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Write Model Magic methods
+    |--------------------------------------------------------------------------
+    |
+    | Set to false to disable write magic methods of model
+    |
+    */
+
+    'write_model_magic_where' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Write Model relation count properties
+    |--------------------------------------------------------------------------
+    |
+    | Set to false to disable writing of relation count properties to model DocBlocks.
+    |
+    */
+
+    'write_model_relation_count_properties' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Write Eloquent Model Mixins
+    |--------------------------------------------------------------------------
+    |
+    | This will add the necessary DocBlock mixins to the model class
+    | contained in the Laravel Framework. This helps the IDE with
+    | auto-completion.
+    |
+    | Please be aware that this setting changes a file within the /vendor directory.
+    |
+    */
+
+    'write_eloquent_model_mixins' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Helper files to include
+    |--------------------------------------------------------------------------
+    |
+    | Include helper files. By default not included, but can be toggled with the
+    | -- helpers (-H) option. Extra helper files can be included.
+    |
+    */
+
+    'include_helpers' => false,
+
+    'helper_files' => array(
+        base_path() . '/vendor/laravel/framework/src/Illuminate/Support/helpers.php',
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Model locations to include
+    |--------------------------------------------------------------------------
+    |
+    | Define in which directories the ide-helper:models command should look
+    | for models.
+    |
+    | glob patterns are supported to easier reach models in sub-directories,
+    | e.g. `app/Services/* /Models` (without the space)
+    |
+    */
+
+    'model_locations' => array(
+        'app',
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Models to ignore
+    |--------------------------------------------------------------------------
+    |
+    | Define which models should be ignored.
+    |
+    */
+
+    'ignored_models' => array(
+
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Extra classes
+    |--------------------------------------------------------------------------
+    |
+    | These implementations are not really extended, but called with magic functions
+    |
+    */
+
+    'extra' => array(
+        'Eloquent' => array('Illuminate\Database\Eloquent\Builder', 'Illuminate\Database\Query\Builder'),
+        'Session' => array('Illuminate\Session\Store'),
+    ),
+
+    'magic' => array(),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Interface implementations
+    |--------------------------------------------------------------------------
+    |
+    | These interfaces will be replaced with the implementing class. Some interfaces
+    | are detected by the helpers, others can be listed below.
+    |
+    */
+
+    'interfaces' => array(
+
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Support for custom DB types
+    |--------------------------------------------------------------------------
+    |
+    | This setting allow you to map any custom database type (that you may have
+    | created using CREATE TYPE statement or imported using database plugin
+    | / extension to a Doctrine type.
+    |
+    | Each key in this array is a name of the Doctrine2 DBAL Platform. Currently valid names are:
+    | 'postgresql', 'db2', 'drizzle', 'mysql', 'oracle', 'sqlanywhere', 'sqlite', 'mssql'
+    |
+    | This name is returned by getName() method of the specific Doctrine/DBAL/Platforms/AbstractPlatform descendant
+    |
+    | The value of the array is an array of type mappings. Key is the name of the custom type,
+    | (for example, "jsonb" from Postgres 9.4) and the value is the name of the corresponding Doctrine2 type (in
+    | our case it is 'json_array'. Doctrine types are listed here:
+    | http://doctrine-dbal.readthedocs.org/en/latest/reference/types.html
+    |
+    | So to support jsonb in your models when working with Postgres, just add the following entry to the array below:
+    |
+    | "postgresql" => array(
+    |       "jsonb" => "json_array",
+    |  ),
+    |
+    */
+    'custom_db_types' => array(
+	    'mysql' => [
+		    'bit' => 'boolean'
+	    ]
+    ),
+
+    /*
+     |--------------------------------------------------------------------------
+     | Support for camel cased models
+     |--------------------------------------------------------------------------
+     |
+     | There are some Laravel packages (such as Eloquence) that allow for accessing
+     | Eloquent model properties via camel case, instead of snake case.
+     |
+     | Enabling this option will support these packages by saving all model
+     | properties as camel case, instead of snake case.
+     |
+     | For example, normally you would see this:
+     |
+     |  * @property \Illuminate\Support\Carbon $created_at
+     |  * @property \Illuminate\Support\Carbon $updated_at
+     |
+     | With this enabled, the properties will be this:
+     |
+     |  * @property \Illuminate\Support\Carbon $createdAt
+     |  * @property \Illuminate\Support\Carbon $updatedAt
+     |
+     | Note, it is currently an all-or-nothing option.
+     |
+     */
+    'model_camel_case_properties' => false,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Property Casts
+    |--------------------------------------------------------------------------
+    |
+    | Cast the given "real type" to the given "type".
+    |
+    */
+    'type_overrides' => array(
+        'integer' => 'int',
+        'boolean' => 'bool',
+    ),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Include DocBlocks from classes
+    |--------------------------------------------------------------------------
+    |
+    | Include DocBlocks from classes to allow additional code inspection for
+    | magic methods and properties.
+    |
+    */
+    'include_class_docblocks' => false,
+
+);

+ 1 - 2
resources/lang/en/home.php

@@ -124,8 +124,7 @@ return [
 	// 邀请码
 	'invite_code_make'                => 'Generate Invite Code',
 	'invite_code_button'              => 'Create',
-	'invite_code_tips1'               => 'You can generate',
-	'invite_code_tips2'               => 'invite codes, effective within :days days',
+	'invite_code_tips'                => 'You can generate<strong> :num </strong>invite codes, effective within :days days',
 	'invite_code_my_codes'            => 'My Invite Codes',
 	'invite_code_table_name'          => 'Codes',
 	'invite_code_table_date'          => 'Overdue Date',

+ 1 - 2
resources/lang/ja/home.php

@@ -121,8 +121,7 @@ return [
 	// 邀请码
 	'invite_code_make'                => '招待コードを生成する',
 	'invite_code_button'              => '生成する',
-	'invite_code_tips1'               => '生成できる',
-	'invite_code_tips2'               => '枚の招待コード, :days 日以内有効',
+	'invite_code_tips'                => '生成できる<strong> :num </strong>枚の招待コード, :days 日以内有効',
 	'invite_code_my_codes'            => '私の招待コード',
 	'invite_code_table_name'          => '招待コード',
 	'invite_code_table_date'          => '有効期限',

+ 1 - 2
resources/lang/ko/home.php

@@ -118,8 +118,7 @@ return [
 	// 邀请码
 	'invite_code_make'                => '초청코드생성',
 	'invite_code_button'              => '생성',
-	'invite_code_tips1'               => '생성가능',
-	'invite_code_tips2'               => '개 총청코드, :days 일내에 유효하다.',
+	'invite_code_tips'                => '생성가능<strong> :num </strong>개 총청코드, :days 일내에 유효하다.',
 	'invite_code_my_codes'            => '나의 초청코드',
 	'invite_code_table_name'          => '초청코드',
 	'invite_code_table_date'          => '유효기간',

+ 1 - 2
resources/lang/zh-CN/home.php

@@ -126,8 +126,7 @@ return [
 	// 邀请码
 	'invite_code_make'                => '生成邀请码',
 	'invite_code_button'              => '生成',
-	'invite_code_tips1'               => '可生成',
-	'invite_code_tips2'               => '枚邀请码,:days 日内有效',
+	'invite_code_tips'                => '可生成<strong> :num </strong>枚邀请码,:days 日内有效',
 	'invite_code_my_codes'            => '我的邀请码',
 	'invite_code_table_name'          => '邀请码',
 	'invite_code_table_date'          => '有效期',

+ 1 - 2
resources/lang/zh-tw/home.php

@@ -122,8 +122,7 @@ return [
 	// 邀请码
 	'invite_code_make'                => '生成邀請碼',
 	'invite_code_button'              => '生成',
-	'invite_code_tips1'               => '可生成',
-	'invite_code_tips2'               => '枚邀請碼,:days 日內有效',
+	'invite_code_tips'                => '可生成 <strong> :num </strong> 枚邀請碼,:days 日內有效',
 	'invite_code_my_codes'            => '我的邀請碼',
 	'invite_code_table_name'          => '邀請碼',
 	'invite_code_table_date'          => '有效期',

+ 2 - 1
resources/views/admin/affiliate/affiliateDetail.blade.php

@@ -22,7 +22,8 @@
 						<thead class="thead-default">
 						<tr>
 							<th colspan="6">
-								申请单ID:{{$basic->id}} | 申请人:{{$basic->user->email}} | 申请提现金额:¥{{$basic->amount}}| 申请时间:{{$basic->created_at}}
+								申请单ID:{{$basic->id}} | 申请人:{{$basic->user->email}} | 申请提现金额:¥{{$basic->amount}}|
+								申请时间:{{$basic->created_at}}
 							</th>
 						</tr>
 						<tr>

+ 1 - 5
resources/views/admin/article/addArticle.blade.php

@@ -10,11 +10,7 @@
 				<h2 class="panel-title">添加文章</h2>
 			</div>
 			@if($errors->any())
-				<div class="alert alert-danger">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">×</span></button>
-					{{$errors->first()}}
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action="/admin/addArticle" method="post" enctype="multipart/form-data" class="form-horizontal">

+ 2 - 10
resources/views/admin/article/editArticle.blade.php

@@ -10,18 +10,10 @@
 				<h2 class="panel-title">编辑文章</h2>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">×</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if (Session::has('errorMsg'))
-				<div class="alert alert-danger">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">×</span></button>
-					<strong>错误:</strong> {{Session::get('errorMsg')}}
-				</div>
+				<x-alert type="danger" :message="Session::get('errorMsg')"/>
 		@endif
 		<!-- BEGIN PORTLET-->
 			<div class="panel-body">

+ 8 - 3
resources/views/admin/config/config.blade.php

@@ -52,7 +52,9 @@
 												<span class='badge badge-lg badge-default'>默认</span>
 											@else
 												<div class="btn-group">
-													<button class="btn btn-primary" onclick="setDefault('{{$method->id}}')">默认</button>
+													<button class="btn btn-primary" onclick="setDefault('{{$method->id}}')">
+														默认
+													</button>
 													<button class="btn btn-danger" onclick="delConfig('{{$method->id}}','{{$method->name}}')">
 														<i class="icon wb-trash"></i>
 													</button>
@@ -84,7 +86,8 @@
 												<span class="badge badge-lg badge-default">默认</span>
 											@else
 												<div class="btn-group">
-													<button class="btn btn-primary" onclick="setDefault('{{$protocol->id}}')">默认
+													<button class="btn btn-primary" onclick="setDefault('{{$protocol->id}}')">
+														默认
 													</button>
 													<button class="btn btn-danger" onclick="delConfig('{{$protocol->id}}','{{$protocol->name}}')">
 														<i class="icon wb-trash"></i>
@@ -116,7 +119,9 @@
 											@if($obfs->is_default)
 												<span class="badge badge-lg badge-default">默认</span>
 											@else
-												<button class="btn btn-primary" onclick="setDefault('{{$obfs->id}}')">默认</button>
+												<button class="btn btn-primary" onclick="setDefault('{{$obfs->id}}')">
+													默认
+												</button>
 												<button class="btn btn-danger" onclick="delConfig('{{$obfs->id}}','{{$obfs->name}}')">
 													<i class="icon wb-trash"></i>
 												</button>

+ 2 - 10
resources/views/admin/config/profile.blade.php

@@ -6,18 +6,10 @@
 				<h1 class="panel-title cyan-600"><i class="icon wb-user"></i>{{trans('home.profile')}}</h1>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissable">
-					<button class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissable">
-					<button class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-					<strong>{{trans('home.error')}}:</strong> {{$errors->first()}}
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action="/admin/profile" method="post" enctype="multipart/form-data" class="form-bordered">

+ 261 - 95
resources/views/admin/config/system.blade.php

@@ -75,7 +75,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="website_name" value="{{$website_name}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('website_name')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('website_name')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -89,7 +91,9 @@
 												<div class="input-group">
 													<input type="url" class="form-control" id="website_url" value="{{$website_url}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('website_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('website_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -103,7 +107,9 @@
 												<div class="input-group">
 													<input type="email" class="form-control" id="AppStore_id" value="{{$AppStore_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('AppStore_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('AppStore_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -117,7 +123,9 @@
 												<div class="input-group">
 													<input type="password" class="form-control" id="AppStore_password" value="{{$AppStore_password}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('AppStore_password')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('AppStore_password')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -131,7 +139,9 @@
 												<div class="input-group">
 													<input type="email" class="form-control" id="webmaster_email" value="{{$webmaster_email}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('webmaster_email')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('webmaster_email')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -145,12 +155,17 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="website_security_code" value="{{$website_security_code}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-info" type="button" onclick="makeWebsiteSecurityCode()">生成</button>
-														<button class="btn btn-primary" type="button" onclick="update('website_security_code')">修改</button>
+														<button class="btn btn-info" type="button" onclick="makeWebsiteSecurityCode()">
+															生成
+														</button>
+														<button class="btn btn-primary" type="button" onclick="update('website_security_code')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3">非空时必须通过<a href="/login?securityCode=" target="_blank">安全入口</a> 加上安全码才可访问</span>
+											<span class="text-help offset-md-3">非空时必须通过<a href="/login?securityCode=" target="_blank">安全入口</a>
+											                                    加上安全码才可访问</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -188,7 +203,9 @@
 												<div class="input-group">
 													<input type="datetime-local" class="form-control" id="maintenance_time" value="{{$maintenance_time}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('maintenance_time')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('maintenance_time')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -202,7 +219,9 @@
 												<div class="input-group">
 													<textarea class="form-control" rows="3" id="maintenance_content">{{$maintenance_content}}</textarea>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('maintenance_content')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('maintenance_content')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -216,7 +235,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="redirect_url" value="{{$redirect_url}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('redirect_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('redirect_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -310,7 +331,9 @@
 													<input type="number" class="form-control" id="default_days" value="{{$default_days}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">天</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('default_days','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('default_days','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -325,7 +348,9 @@
 													<input type="number" class="form-control" id="default_traffic" value="{{$default_traffic}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">MB</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('default_traffic','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('default_traffic','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -339,7 +364,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="invite_num" value="{{$invite_num}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('invite_num','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('invite_num','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -353,7 +380,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="reset_password_times" value="{{$reset_password_times}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('reset_password_times','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('reset_password_times','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -368,7 +397,8 @@
 												<option value="1">黑名单</option>
 												<option value="2">白名单</option>
 											</select>
-											<span class="text-help offset-md-3"> 黑名单: 用户可使用任意黑名单外的邮箱注册;白名单: 用户只能选择使用白名单中的邮箱后缀注册 </span>
+											<span class="text-help offset-md-3"> 黑名单: 用户可使用任意黑名单外的邮箱注册;白名单:
+											                                     用户只能选择使用白名单中的邮箱后缀注册 </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -378,7 +408,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="active_times" value="{{$active_times}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('active_times','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('active_times','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -392,7 +424,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="register_ip_limit" value="{{$register_ip_limit}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('register_ip_limit','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('register_ip_limit','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -407,7 +441,9 @@
 													<input type="number" class="form-control" id="user_invite_days" value="{{$user_invite_days}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">天</span>
-														<button class="btn btn-primary" type="button" onchange="updateFromOther('user_invite_days','1',false)">修改</button>
+														<button class="btn btn-primary" type="button" onchange="updateFromOther('user_invite_days','1',false)">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -423,7 +459,9 @@
 													<div class="input-group-append">
 														<span class="input-group-text">天</span>
 													</div>
-													<button class="btn btn-primary" type="button" onclick="updateFromInput('admin_invite_days','1',false)">修改</button>
+													<button class="btn btn-primary" type="button" onclick="updateFromInput('admin_invite_days','1',false)">
+														修改
+													</button>
 												</div>
 											</div>
 											<span class="text-help offset-md-3"> 管理员生成邀请码的有效期 </span>
@@ -442,11 +480,14 @@
 												<div class="input-group">
 													<input type="url" class="form-control" id="subscribe_domain" value="{{$subscribe_domain}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('subscribe_domain')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('subscribe_domain')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> (推荐)防止面板域名被DNS投毒后无法正常订阅,需带http://或https:// </span>
+											<span class="text-help offset-md-3">
+												(推荐)防止面板域名被DNS投毒后无法正常订阅,需带http://或https:// </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -456,7 +497,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="subscribe_max" value="{{$subscribe_max}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('subscribe_max','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('subscribe_max','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -467,7 +510,8 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="mix_subscribe">混合订阅</label>
 											<span class="col-md-9"><input type="checkbox" id="mix_subscribe" data-plugin="switchery" @if($mix_subscribe) checked @endif onchange="updateFromOther('switch','mix_subscribe')"></span>
-											<span class="text-help offset-md-3"> 启用后,订阅信息中将包含V2Ray节点信息(仅支持Shadowrocket、Quantumult、v2rayN) </span>
+											<span class="text-help offset-md-3">
+												启用后,订阅信息中将包含V2Ray节点信息(仅支持Shadowrocket、Quantumult、v2rayN) </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -481,7 +525,8 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="is_custom_subscribe">高级订阅</label>
 											<span class="col-md-9"><input type="checkbox" id="is_custom_subscribe" data-plugin="switchery" @if($is_custom_subscribe) checked @endif onchange="updateFromOther('switch','is_custom_subscribe')"></span>
-											<span class="text-help offset-md-3"> 启用后,订阅信息顶部将显示过期时间、剩余流量(Quantumult有特殊效果) </span>
+											<span class="text-help offset-md-3">
+												启用后,订阅信息顶部将显示过期时间、剩余流量(Quantumult有特殊效果) </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -491,11 +536,14 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="web_api_url" value="{{$web_api_url}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('web_api_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('web_api_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 用于 VNet后端 授权,此域名需要解析A记录到面板,例:https://demo.proxypanel.ml</span>
+											<span class="text-help offset-md-3"> 用于 VNet后端
+											                                     授权,此域名需要解析A记录到面板,例:https://demo.proxypanel.ml</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -505,7 +553,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="v2ray_license" value="{{$v2ray_license}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('v2ray_license')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('v2ray_license')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -518,7 +568,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="trojan_license" value="{{$trojan_license}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('trojan_license')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('trojan_license')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -526,12 +578,15 @@
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="v2ray_tls_provider">V2Ray TLS配置</label>
+											<label class="col-md-3 col-form-label" for="v2ray_tls_provider">V2Ray
+											                                                                TLS配置</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="v2ray_tls_provider" value="{{$v2ray_tls_provider}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('v2ray_tls_provider')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('v2ray_tls_provider')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -548,21 +603,27 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="is_namesilo">Namesilo</label>
 											<span class="col-md-9"><input type="checkbox" id="is_namesilo" data-plugin="switchery" @if($is_namesilo) checked @endif onchange="updateFromOther('switch','is_namesilo')"></span>
-											<span class="text-help offset-md-3"> 添加、编辑节点的绑定域名时自动更新域名DNS记录值为节点IP(<a href="https://www.namesilo.com/account_api.php?rid=326ec20pa" target="_blank">创建API KEY</a>)</span>
+											<span class="text-help offset-md-3">
+												添加、编辑节点的绑定域名时自动更新域名DNS记录值为节点IP(<a href="https://www.namesilo.com/account_api.php?rid=326ec20pa" target="_blank">创建API
+												                                                                                                                KEY</a>)</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="namesilo_key">Namesilo API KEY</label>
+											<label class="col-md-3 col-form-label" for="namesilo_key">Namesilo API
+											                                                          KEY</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="namesilo_key" value="{{$namesilo_key}}" placeholder="填入Namesilo上申请的API KEY"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('namesilo_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('namesilo_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 域名必须是<a href="https://www.namesilo.com/?rid=326ec20pa" target="_blank">www.namesilo.com</a>上购买的
+											<span class="text-help offset-md-3">
+												域名必须是<a href="https://www.namesilo.com/?rid=326ec20pa" target="_blank">www.namesilo.com</a>上购买的
 											</span>
 										</div>
 									</div>
@@ -586,12 +647,15 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="geetest_id" value="{{$geetest_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('geetest_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('geetest_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
 											<span class="text-help offset-md-3"> 本功能需要
-												<a href="https://auth.geetest.com/login/" target="_blank">极验后台</a> 申请权限及应用
+												<a href="https://auth.geetest.com/login/" target="_blank">极验后台</a>
+											                                     申请权限及应用
 											</span>
 										</div>
 									</div>
@@ -602,7 +666,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="geetest_key" value="{{$geetest_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('geetest_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('geetest_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -615,11 +681,16 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="google_captcha_secret" value="{{$google_captcha_secret}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('google_captcha_secret')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('google_captcha_secret')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 本功能需要<a href="https://www.google.com/recaptcha/admin" target="_blank">Google reCAPTCHA后台</a> 申请权限及应用 (申请需科学上网,日常验证不用)</span>
+											<span class="text-help offset-md-3">
+												本功能需要<a href="https://www.google.com/recaptcha/admin" target="_blank">Google
+												                                                                      reCAPTCHA后台</a>
+												申请权限及应用 (申请需科学上网,日常验证不用)</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -629,7 +700,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="google_captcha_sitekey" value="{{$google_captcha_sitekey}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('google_captcha_sitekey')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('google_captcha_sitekey')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -637,26 +710,34 @@
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 control-label" for="hcaptcha_secret">hCaptcha Secret密钥</label>
+											<label class="col-md-3 control-label" for="hcaptcha_secret">hCaptcha
+											                                                            Secret密钥</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="hcaptcha_secret" value="{{$hcaptcha_secret}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('hcaptcha_secret')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('hcaptcha_secret')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 本功能需要<a href="https://hCaptcha.com/?r=2d46d3aa7a4e" target="_blank">hCaptcha后台</a> 申请权限及应用</span>
+											<span class="text-help offset-md-3">
+												本功能需要<a href="https://hCaptcha.com/?r=2d46d3aa7a4e" target="_blank">hCaptcha后台</a>
+												申请权限及应用</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="hcaptcha_sitekey">hCaptcha Site Key网站密钥</label>
+											<label class="col-md-3 col-form-label" for="hcaptcha_sitekey">hCaptcha Site
+											                                                              Key网站密钥</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="hcaptcha_sitekey" value="{{$hcaptcha_sitekey}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('hcaptcha_sitekey')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('hcaptcha_sitekey')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -683,7 +764,9 @@
 													<input type="number" class="form-control" id="traffic_limit_time" value="{{$traffic_limit_time}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">分钟</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_limit_time','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_limit_time','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -745,7 +828,9 @@
 													<input type="number" class="form-control" id="referral_traffic" value="{{$referral_traffic}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">MB</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_traffic','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_traffic','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -760,7 +845,9 @@
 													<input type="number" class="form-control" id="referral_percent" value="{{$referral_percent * 100}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">%</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_percent','0','100')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_percent','0','100')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -775,7 +862,9 @@
 													<input type="number" class="form-control" id="referral_money" value="{{$referral_money}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">元</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_money','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('referral_money','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -805,7 +894,9 @@
 													<input type="number" class="form-control" id="expire_days" value="{{$expire_days}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">天</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('expire_days','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('expire_days','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -828,7 +919,9 @@
 													<input type="number" class="form-control" id="traffic_warning_percent" value="{{$traffic_warning_percent}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">%</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_warning_percent','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_warning_percent','0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -851,7 +944,9 @@
 													<input type="number" class="form-control" id="offline_check_times" value="{{$offline_check_times}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">次</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('offline_check_times','0','60')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('offline_check_times','0','60')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -873,7 +968,9 @@
 													<input type="number" class="form-control" id="detection_check_times" value="{{$detection_check_times}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">次</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('detection_check_times','0','12')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('detection_check_times','0','12')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -888,7 +985,8 @@
 												<option value="serverChan">ServerChan</option>
 												<option value="bark">Bark</option>
 											</select>
-											<span class="text-help offset-md-3"> 推送节点离线提醒、用户流量异常警告、节点使用报告(<a href="javascript:sendTestNotification();">发送测试消息</a>)</span>
+											<span class="text-help offset-md-3">
+												推送节点离线提醒、用户流量异常警告、节点使用报告(<a href="javascript:sendTestNotification();">发送测试消息</a>)</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -898,11 +996,14 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="server_chan_key" value="{{$server_chan_key}}" placeholder="请到ServerChan申请"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('server_chan_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('server_chan_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 启用ServerChan,请务必填入本值(<a href="http://sc.ftqq.com" target="_blank">申请SCKEY</a>)
+											<span class="text-help offset-md-3">
+												启用ServerChan,请务必填入本值(<a href="http://sc.ftqq.com" target="_blank">申请SCKEY</a>)
 											</span>
 										</div>
 									</div>
@@ -913,28 +1014,35 @@
 												<div class="input-group">
 													<input type="url" class="form-control" id="bark_key" value="{{$bark_key}}" placeholder="安装并打开Bark后取得"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('bark_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('bark_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 推送消息到iOS设备,需要在iOS设备里装一个名为Bark的应用,取网址后的一长串代码,启用Bark,请务必填入本值 </span>
+											<span class="text-help offset-md-3">
+												推送消息到iOS设备,需要在iOS设备里装一个名为Bark的应用,取网址后的一长串代码,启用Bark,请务必填入本值 </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="is_push_bear">PushBear</label>
 											<span class="col-md-9"><input type="checkbox" id="is_push_bear" data-plugin="switchery" @if($is_push_bear) checked @endif onchange="updateFromOther('switch','is_push_bear')"></span>
-											<span class="text-help offset-md-3"> 使用PushBear推送微信消息给用户(<a href="https://pushbear.ftqq.com/admin/#/signin" target="_blank">创建消息通道</a>)</span>
+											<span class="text-help offset-md-3">
+												使用PushBear推送微信消息给用户(<a href="https://pushbear.ftqq.com/admin/#/signin" target="_blank">创建消息通道</a>)</span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
 										<div class="row">
-											<label class="col-md-3 col-form-label" for="push_bear_send_key">PushBear SendKey</label>
+											<label class="col-md-3 col-form-label" for="push_bear_send_key">PushBear
+											                                                                SendKey</label>
 											<div class="col-md-7">
 												<div class="input-group">
 													<input type="text" class="form-control" id="push_bear_send_key" value="{{$push_bear_send_key}}" placeholder="创建消息通道后即可获取"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('push_bear_send_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('push_bear_send_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -948,7 +1056,9 @@
 												<div class="input-group">
 													<input type="url" class="form-control" id="push_bear_qrcode" value="{{$push_bear_qrcode}}" placeholder="填入消息通道的二维码URL"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('push_bear_qrcode')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('push_bear_qrcode')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -989,7 +1099,9 @@
 												<div class="input-group">
 													<input type="number" class="form-control" id="subscribe_ban_times" value="{{$subscribe_ban_times}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('subscribe_ban_times','0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('subscribe_ban_times','0')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1012,7 +1124,9 @@
 													<input type="number" class="form-control" id="traffic_ban_value" value="{{$traffic_ban_value}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">GB</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_ban_value', '1')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_ban_value', '1')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -1027,7 +1141,9 @@
 													<input type="number" class="form-control" id="traffic_ban_time" value="{{$traffic_ban_time}}"/>
 													<div class="input-group-append">
 														<span class="input-group-text">分钟</span>
-														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_ban_time', '0')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="updateFromInput('traffic_ban_time', '0')">
+															修改
+														</button>
 													</div>
 												</div>
 											</div>
@@ -1046,7 +1162,8 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label" for="is_ban_status">过期自动封禁</label>
 											<span class="col-md-9"><input type="checkbox" id="is_ban_status" data-plugin="switchery" @if($is_ban_status) checked @endif onchange="updateFromOther('switch','is_ban_status')"></span>
-											<span class="text-help offset-md-3"> (慎重)封禁整个账号会重置账号的所有数据且会导致用户无法登录, 不开启状态下只封禁用户代理 </span>
+											<span class="text-help offset-md-3"> (慎重)封禁整个账号会重置账号的所有数据且会导致用户无法登录,
+											                                     不开启状态下只封禁用户代理 </span>
 										</div>
 									</div>
 									<div class="form-group col-lg-6">
@@ -1068,7 +1185,8 @@
 											<label class="col-form-label col-md-3" for="website_home_logo">首页LOGO</label>
 											<div class="col-md-9">
 												<input type="file" id="website_home_logo" data-plugin="dropify" data-default-file={{$website_home_logo?:'/assets/images/default.png'}} />
-												<button type="submit" class="btn btn-success float-right mt-10"> 提 交</button>
+												<button type="submit" class="btn btn-success float-right mt-10"> 提 交
+												</button>
 											</div>
 										</div>
 									</div>
@@ -1077,7 +1195,8 @@
 											<label class="col-form-label col-md-3" for="website_logo">站内LOGO</label>
 											<div class="col-md-9">
 												<input type="file" id="website_logo" data-plugin="dropify" data-default-file={{$website_logo?:'/assets/images/default.png'}} />
-												<button type="submit" class="btn btn-success float-right mt-10"> 提 交</button>
+												<button type="submit" class="btn btn-success float-right mt-10"> 提 交
+												</button>
 											</div>
 										</div>
 									</div>
@@ -1086,7 +1205,8 @@
 											<label class="col-form-label col-md-3" for="website_analytics">统计代码</label>
 											<div class="col-md-9">
 												<textarea class="form-control" rows="10" id="website_analytics">{{$website_analytics}}</textarea>
-												<button type="submit" class="btn btn-success float-right mt-10"> 提 交</button>
+												<button type="submit" class="btn btn-success float-right mt-10"> 提 交
+												</button>
 											</div>
 										</div>
 									</div>
@@ -1095,7 +1215,8 @@
 											<label class="col-form-label col-md-3" for="website_customer_service">客服代码</label>
 											<div class="col-md-9">
 												<textarea class="form-control" rows="10" id="website_customer_service">{{$website_customer_service}}</textarea>
-												<button type="submit" class="btn btn-success float-right mt-10"> 提 交</button>
+												<button type="submit" class="btn btn-success float-right mt-10"> 提 交
+												</button>
 											</div>
 										</div>
 									</div>
@@ -1154,7 +1275,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="subject_name" value="{{$subject_name}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('subject_name')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('subject_name')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1168,11 +1291,14 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="website_callback_url" value="{{$website_callback_url}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('website_callback_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('website_callback_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
-											<span class="text-help offset-md-3"> 防止因为网站域名被DNS投毒后导致支付无法正常回调,需带http://或https:// </span>
+											<span class="text-help offset-md-3">
+												防止因为网站域名被DNS投毒后导致支付无法正常回调,需带http://或https:// </span>
 										</div>
 									</div>
 								</div>
@@ -1181,7 +1307,8 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label">支付宝F2F</label>
 											<div class="col-md-7">
-												本功能需要<a href="https://open.alipay.com/platform/home.htm" target="_blank">蚂蚁金服开放平台</a> 申请权限及应用
+												本功能需要<a href="https://open.alipay.com/platform/home.htm" target="_blank">蚂蚁金服开放平台</a>
+												申请权限及应用
 											</div>
 										</div>
 									</div>
@@ -1192,7 +1319,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="f2fpay_app_id" value="{{$f2fpay_app_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('f2fpay_app_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('f2fpay_app_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1206,7 +1335,9 @@
 												<div class="input-group">
 													<input class="form-control" type="text" id="f2fpay_private_key" value="{{$f2fpay_private_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('f2fpay_private_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('f2fpay_private_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1220,7 +1351,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="f2fpay_public_key" value="{{$f2fpay_public_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('f2fpay_public_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('f2fpay_public_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1244,7 +1377,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="codepay_url" value="{{$codepay_url}}" placeholder="https://codepay.fateqq.com/creat_order/?"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('codepay_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('codepay_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1257,7 +1392,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="codepay_id" value="{{$codepay_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('codepay_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('codepay_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1270,7 +1407,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="codepay_key" value="{{$codepay_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('codepay_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('codepay_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1282,7 +1421,9 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label">易支付</label>
 											<div class="col-md-7">
-												<button class="btn btn-primary" type="button" onclick="epayInfo()">咨询查询</button>
+												<button class="btn btn-primary" type="button" onclick="epayInfo()">
+													咨询查询
+												</button>
 											</div>
 										</div>
 									</div>
@@ -1293,7 +1434,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="epay_url" value="{{$epay_url}}" placeholder="https://www.example.com"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('epay_url')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('epay_url')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1306,7 +1449,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="epay_mch_id" value="{{$epay_mch_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('epay_mch_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('epay_mch_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1319,7 +1464,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="epay_key" value="{{$epay_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('epay_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('epay_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1342,7 +1489,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="payjs_mch_id" value="{{$payjs_mch_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('payjs_mch_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('payjs_mch_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1356,7 +1505,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="payjs_key" value="{{$payjs_key}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('payjs_key')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('payjs_key')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1368,7 +1519,9 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label">麻瓜宝 MugglePay</label>
 											<div class="col-md-7">
-												请到<a href="https://merchants.mugglepay.com/user/register?ref=MP904BEBB79FE0" target="_blank">麻瓜宝 MugglePay</a> 申请账号
+												请到<a href="https://merchants.mugglepay.com/user/register?ref=MP904BEBB79FE0" target="_blank">麻瓜宝
+												                                                                                             MugglePay</a>
+												申请账号
 											</div>
 										</div>
 									</div>
@@ -1379,7 +1532,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="bitpay_secret" value="{{$bitpay_secret}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('bitpay_secret')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('bitpay_secret')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1392,7 +1547,8 @@
 										<div class="row">
 											<label class="col-md-3 col-form-label">PayPal</label>
 											<div class="col-md-7">
-												使用商家账号登录<a href="https://www.paypal.com/businessprofile/mytools/apiaccess/firstparty" target="_blank">API凭证申请页</a>, 同意并获取设置信息
+												使用商家账号登录<a href="https://www.paypal.com/businessprofile/mytools/apiaccess/firstparty" target="_blank">API凭证申请页</a>,
+												同意并获取设置信息
 											</div>
 										</div>
 									</div>
@@ -1403,7 +1559,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_username" value="{{$paypal_username}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('paypal_username')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('paypal_username')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1416,7 +1574,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_password" value="{{$paypal_password}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('paypal_password')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('paypal_password')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1429,7 +1589,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_secret" value="{{$paypal_secret}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('paypal_secret')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('paypal_secret')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1442,7 +1604,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_certificate" value="{{$paypal_certificate}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('paypal_certificate')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('paypal_certificate')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>
@@ -1455,7 +1619,9 @@
 												<div class="input-group">
 													<input type="text" class="form-control" id="paypal_app_id" value="{{$paypal_app_id}}"/>
 													<span class="input-group-append">
-														<button class="btn btn-primary" type="button" onclick="update('paypal_app_id')">修改</button>
+														<button class="btn btn-primary" type="button" onclick="update('paypal_app_id')">
+															修改
+														</button>
 													</span>
 												</div>
 											</div>

+ 2 - 10
resources/views/admin/coupon/addCoupon.blade.php

@@ -19,18 +19,10 @@
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					<span> {{$errors->first()}} </span>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action="{{url('/coupon/add')}}" method="post" enctype="multipart/form-data" class="form-horizontal" role="form">

+ 5 - 8
resources/views/admin/inviteList.blade.php

@@ -8,15 +8,12 @@
 			<div class="col-md-4">
 				<div class="card">
 					<div class="card-block">
-						<h4 class="card-title cyan-600"><i class="icon wb-plus"></i> {{trans('home.invite_code_make')}}
+						<h4 class="card-title cyan-600"><i class="icon wb-plus"></i>
+							{{trans('home.invite_code_make')}}
 						</h4>
-						<p class="card-text alert alert-info">
-							<i class="icon wb-warning red-700"></i> {{trans('home.invite_code_tips1')}}
-							<strong>
-								10 </strong> {{trans('home.invite_code_tips2', ['days' => sysConfig('user_invite_days')])}}
-						</p>
-						<button type="button" class="btn btn-primary btn-animate btn-animate-side"
-								onclick="makeInvite()"><i class="icon wb-plus"></i> {{trans('home.invite_code_button')}}
+						<x-alert type="info" :message="trans('home.invite_code_tips', ['num'=>10, 'days' => sysConfig('user_invite_days')])"/>
+						<button type="button" class="btn btn-primary btn-animate btn-animate-side" onclick="makeInvite()">
+							<i class="icon wb-plus"></i> {{trans('home.invite_code_button')}}
 						</button>
 					</div>
 				</div>

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

@@ -391,8 +391,8 @@
 <div class="page">
 	<!--[if lt IE 8]>
 	<p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
-	<a href="http://browsehappy.com/">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong> browser. Please
-	<a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.
+		<a href="http://browsehappy.com/">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong> browser. Please
+		<a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.
 	</p>
 	<![endif]-->
 	@yield('content')

+ 2 - 2
resources/views/admin/marketing/pushList.blade.php

@@ -31,8 +31,8 @@
 					</div>
 				</div>
 				<div class="alert alert-info alert-dismissible" role="alert">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">×</span></button>
+					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+						<span aria-hidden="true">×</span></button>
 					仅会推送给关注了您的消息通道的用户 <a href="/admin/system" class="alert-link" target="_blank">设置PushBear</a>.
 				</div>
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

+ 3 - 2
resources/views/admin/node/authList.blade.php

@@ -86,7 +86,7 @@
 					</div>
 					<div class="modal-body">
 						@if($vl->node->type === 2)
-							<div class="alert alert-info  text-break">
+							<div class="alert alert-info text-break">
 								<div class="text-center red-700 mb-5">VNET-V2Ray</div>
 								(yum install curl 2> /dev/null || apt install curl 2> /dev/null) \<br>
 								&& curl -L -s http://mrw.so/5XKg2o \<br>
@@ -138,7 +138,8 @@
 							</div>
 						@elseif($vl->node->type === 3)
 							@if(!$vl->node->server)
-								<h3>请先<a href="/node/edit?id={{$vl->node->id}}" target="_blank">填写节点域名</a>并将域名解析到节点对应的IP上</h3>
+								<h3>请先<a href="/node/edit?id={{$vl->node->id}}" target="_blank">填写节点域名</a>并将域名解析到节点对应的IP上
+								</h3>
 							@else
 								<div class="alert alert-info text-break">
 									<div class="text-center red-700 mb-5">Trojan-Poseidon</div>

+ 9 - 4
resources/views/admin/node/nodeInfo.blade.php

@@ -101,7 +101,8 @@
 												class="col-md-5 form-control" name="country_code" id="country_code">
 											<option value="un" selected hidden>请选择</option>
 											@foreach($countryList as $country)
-												<option value="{{$country->code}}">{{$country->code}}- {{$country->name}}</option>
+												<option value="{{$country->code}}">{{$country->code}}
+													- {{$country->name}}</option>
 											@endforeach
 										</select>
 									</div>
@@ -222,7 +223,8 @@
 												<input type="number" class="form-control col-md-4" name="port" value="443" id="single_port"/>
 												<span class="text-help offset-md-3"> 推荐80或443,服务端需要配置 </span>
 												<span class="text-help offset-md-3">
-													严格模式:用户的端口无法连接,只能通过以下指定的端口进行连接 (<a href="javascript:showPortsOnlyConfig();">如何配置</a>)</span>
+													严格模式:用户的端口无法连接,只能通过以下指定的端口进行连接
+													(<a href="javascript:showPortsOnlyConfig();">如何配置</a>)</span>
 											</div>
 											<div class="form-group row">
 												<label for="passwd" class="col-md-3 col-form-label">[单] 密码</label>
@@ -293,7 +295,9 @@
 													</select>
 												</div>
 											</div>
-											<div class="text-help offset-md-3"> 伪装类型为http时多个伪装域名逗号隔开,使用WebSocket传输协议时只允许单个</div>
+											<div class="text-help offset-md-3">
+												伪装类型为http时多个伪装域名逗号隔开,使用WebSocket传输协议时只允许单个
+											</div>
 										</div>
 										<div class="form-group row">
 											<label for="v2_path" class="col-md-3 col-form-label">路径 | 密钥</label>
@@ -309,7 +313,8 @@
 											<label for="tls_provider" class="col-md-3 col-form-label">TLS配置</label>
 											<input type="text" class="form-control col-md-9" name="tls_provider" id="tls_provider"/>
 											<div class="text-help offset-md-3"> 不同后端配置不同:
-												<a href="https://proxypanel.gitbook.io/wiki/webapi/webapi-basic-setting#vnet-v2-ray-hou-duan" target="_blank">VNET-V2Ray</a> 、
+												<a href="https://proxypanel.gitbook.io/wiki/webapi/webapi-basic-setting#vnet-v2-ray-hou-duan" target="_blank">VNET-V2Ray</a>
+											                                    、
 												<a href="https://proxypanel.gitbook.io/wiki/webapi/webapi-basic-setting#v-2-ray-poseidon-hou-duan" target="_blank">V2Ray-Poseidon</a>
 											</div>
 										</div>

+ 2 - 14
resources/views/admin/rule/group/assign.blade.php

@@ -12,22 +12,10 @@
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action={{route('rule.group.assign',$ruleGroup->id)}} method="post" enctype="multipart/form-data" class="form-horizontal">

+ 2 - 14
resources/views/admin/rule/group/info.blade.php

@@ -12,22 +12,10 @@
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action=@isset($ruleGroup){{route('rule.group.update',$ruleGroup->id)}}@else{{route('rule.group.store')}}@endisset method="post" enctype="multipart/form-data" class="form-horizontal">

+ 5 - 19
resources/views/admin/shop/info.blade.php

@@ -23,28 +23,13 @@
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissible" role="alert">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span>
-					</button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissible" role="alert">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span>
-					</button>
-					<strong>错误:</strong> {{$errors->first()}}
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			@if (Session::has('errorMsg'))
-				<div class="alert alert-success alert-dismissible" role="alert">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span>
-					</button>
-					{{Session::get('errorMsg')}}
-				</div>
+				<x-alert type="danger" :message="Session::get('errorMsg')"/>
 			@endif
 			<div class="panel-body">
 				<form action=@isset($goods){{route('goods.update',$goods->id)}} @else {{route('goods.store')}} @endisset method="post" enctype="multipart/form-data" class="form-horizontal" role="form">
@@ -164,7 +149,8 @@
 							<div class="form-group row">
 								<label class="col-md-2 col-form-label" for="logo">商品图片</label>
 								<div class="col-md-6">
-									<input type="file" id="logo" name="logo" data-plugin="dropify" data-default-file=@if(isset($goods) && $goods->logo) "{{$goods->logo}}" @else "/assets/images/default.png" @endif/>
+									<input type="file" id="logo" name="logo" data-plugin="dropify" data-default-file=@if(isset($goods) && $goods->logo) "{{$goods->logo}}" @else
+										"/assets/images/default.png" @endif/>
 								</div>
 							</div>
 							<div class="form-group row">

+ 2 - 2
resources/views/admin/ticket/replyTicket.blade.php

@@ -17,9 +17,9 @@
 			<div class="panel-body">
 				<div class="chat-box">
 					<div class="chats">
-						@component('components.chatUnit',['ticket'=>$ticket])@endcomponent
+						<x-chat-unit :user="Auth::getUser()" :ticket="$ticket"/>
 						@foreach ($replyList as $reply)
-							@component('components.chatUnit',['ticket'=>$reply])@endcomponent
+							<x-chat-unit :user="Auth::getUser()" :ticket="$reply"/>
 						@endforeach
 					</div>
 				</div>

+ 1 - 6
resources/views/admin/tools/analysis.blade.php

@@ -11,12 +11,7 @@
 				</h2>
 			</div>
 			@if (Session::has('analysisErrorMsg'))
-				<div class="alert alert-danger" role="alert">
-					<button class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">&times;</span><span class="sr-only">{{trans('home.close')}}</span>
-					</button>
-					{{Session::get('analysisErrorMsg')}}
-				</div>
+				<x-alert type="danger" :message="Session::get('analysisErrorMsg')"/>
 			@endif
 			<div class="panel-body">
 				<table class="text-md-center" data-toggle="table" data-mobile-responsive="true">

+ 1 - 6
resources/views/admin/tools/import.blade.php

@@ -15,12 +15,7 @@
 				</div>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger" role="alert">
-					<button class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">&times;</span><span class="sr-only">{{trans('home.close')}}</span>
-					</button>
-					<span> {{$errors->first()}} </span>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action="/tools/import" method="POST" enctype="multipart/form-data" class="upload-form">

+ 2 - 14
resources/views/admin/user/group/info.blade.php

@@ -12,22 +12,10 @@
 				</div>
 			</div>
 			@if (Session::has('successMsg'))
-				<div class="alert alert-success alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')"/>
 			@endif
 			@if($errors->any())
-				<div class="alert alert-danger alert-dismissible">
-					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-						<span aria-hidden="true">×</span></button>
-					<ul>
-						@foreach ($errors->all() as $error)
-							<li>{{ $error }}</li>
-						@endforeach
-					</ul>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			<div class="panel-body">
 				<form action=@isset($userGroup){{route('group.update',$userGroup->id)}}@else{{route('group.store')}}@endisset method="POST" enctype="multipart/form-data" class="form-horizontal">

+ 2 - 1
resources/views/admin/user/userInfo.blade.php

@@ -65,7 +65,8 @@
 										<div class="input-group">
 											<p class="form-control"> {{$user->credit}} </p>
 											<span class="input-group-append">
-												<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#handle_user_credit">充值
+												<button class="btn btn-danger" type="button" data-toggle="modal" data-target="#handle_user_credit">
+													充值
 												</button>
 											</span>
 										</div>

+ 2 - 6
resources/views/auth/active.blade.php

@@ -2,14 +2,10 @@
 @section('title', trans('auth.active_account'))
 @section('content')
 	@if(Session::get('errorMsg'))
-		<div class="alert alert-danger">
-			<span> {{Session::get('errorMsg')}} </span>
-		</div>
+		<x-alert type="danger" :message="Session::get('errorMsg')"/>
 	@endif
 	@if(Session::get('successMsg'))
-		<div class="alert alert-success">
-			<span> {{Session::get('successMsg')}} </span>
-		</div>
+		<x-alert type="success" :message="Session::get('successMsg')"/>
 	@endif
 	<form action="{{url(Request::getRequestUri())}}" method="post">
 		<a href="/login" class="btn btn-lg btn-block btn-success">{{trans('auth.login')}}</a>

+ 3 - 11
resources/views/auth/activeUser.blade.php

@@ -2,16 +2,10 @@
 @section('title', trans('auth.active_account'))
 @section('content')
 	@if (Session::get('successMsg'))
-		<div class="alert alert-success">
-			<button class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span><span
-						class="sr-only">{{trans('auth.close')}}</span></button>
-			<span> {{Session::get('successMsg')}} </span>
-		</div>
+		<x-alert type="success" :message="Session::get('successMsg')"/>
 	@endif
 	@if($errors->any())
-		<div class="alert alert-danger">
-			<span> {{$errors->first()}} </span>
-		</div>
+		<x-alert type="danger" :message="$errors->first()"/>
 	@endif
 	<form action="/activeUser" method="post">
 		@if(sysConfig('is_activate_account') == 2)
@@ -24,9 +18,7 @@
 				{{csrf_field()}}
 			</div>
 		@else
-			<div class="alert alert-danger">
-				<span> {{trans('auth.system_maintenance_tip',['email' => sysConfig('webmaster_email')])}}</span>
-			</div>
+			<x-alert type="danger" :message="trans('auth.system_maintenance_tip',['email' => sysConfig('webmaster_email')])"/>
 		@endif
 		<a href="/login"
 				class="btn btn-danger btn-lg {{sysConfig('is_activate_account')==2? 'float-left':'btn-block'}}">{{trans('auth.back')}}</a>

+ 2 - 2
resources/views/auth/error.blade.php

@@ -47,9 +47,9 @@
 <body class="animsition page-error page-error-400 layout-full">
 <!--[if lt IE 8]>
 <p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
-<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
+	<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
                           browser. Please
-<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
+	<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
 <![endif]-->
 
 <div class="page vertical-align text-center" data-animsition-in="fade-in" data-animsition-out="fade-out">

+ 2 - 2
resources/views/auth/layouts.blade.php

@@ -43,9 +43,9 @@
 </head>
 <body class="animsition page-login-v3 layout-full" style="position: relative;">
 <!--[if lt IE 8]> <p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
-<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
+	<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
                                             browser. Please
-<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
+	<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
 <![endif]-->
 @if(Agent::isMobile() && Agent::is('iOS') && strpos(Agent::getUserAgent(), 'MicroMessenger') !== false)
 	<style type="text/css">

+ 2 - 9
resources/views/auth/login.blade.php

@@ -3,17 +3,10 @@
 @section('content')
 	<form action="/login" method="post" id="login-form">
 		@if($errors->any())
-			<div class="alert alert-danger">
-				<span> {!! $errors->first() !!} </span>
-			</div>
+			<x-alert type="danger" :message="$errors->first()"/>
 		@endif
 		@if (Session::get('regSuccessMsg'))
-			<div class="alert alert-success">
-				<button class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span>
-					<span class="sr-only">{{trans('auth.close')}}</span>
-				</button>
-				<span>{{Session::get('regSuccessMsg')}}</span>
-			</div>
+			<x-alert type="success" :message="Session::get('regSuccessMsg')"/>
 		@endif
 		<div class="form-group form-material floating" data-plugin="formMaterial">
 			<input type="email" class="form-control" name="email" value="{{Request::old('email')}}" required/>

+ 2 - 2
resources/views/auth/maintenance.blade.php

@@ -44,9 +44,9 @@
 </head>
 <body class="animsition page-login-v3 layout-full" style="position: relative;">
 <!--[if lt IE 8]> <p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
-<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
+	<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an <strong>outdated</strong>
                                             browser. Please
-<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
+	<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
 <![endif]-->
 
 <!-- Page -->

+ 2 - 8
resources/views/auth/register.blade.php

@@ -8,9 +8,7 @@
 	<form action="/register" method="post" id="register-form">
 		@if(sysConfig('is_register'))
 			@if($errors->any())
-				<div class="alert alert-danger">
-					<span>{{$errors->first()}}</span>
-				</div>
+				<x-alert type="danger" :message="$errors->first()"/>
 			@endif
 			@csrf
 			<input type="hidden" name="register_token" value="{{Session::get('register_token')}}"/>
@@ -121,11 +119,7 @@
 				</div>
 			</div>
 		@else
-			<div class="alert alert-danger">
-				<span>
-					{{trans('auth.system_maintenance')}}
-				</span>
-			</div>
+			<x-alert type="danger" :message="trans('auth.system_maintenance')"/>
 		@endif
 		<a href="/login"
 				class="btn btn-danger btn-lg {{sysConfig('is_register')? 'float-left': 'btn-block'}}">{{trans('auth.back')}}</a>

+ 3 - 9
resources/views/auth/reset.blade.php

@@ -3,19 +3,13 @@
 @section('content')
 	<form action="{{url(Request::getRequestUri())}}" method="post" class="register-form">
 		@if(Session::get('successMsg'))
-			<div class="alert alert-success">
-				<span> {{Session::get('successMsg')}} </span>
-			</div>
+			<x-alert type="success" :message="Session::get('successMsg')"/>
 		@endif
 		@if($errors->any())
-			<div class="alert alert-danger">
-				<span> {{$errors->first()}} </span>
-			</div>
+			<x-alert type="danger" :message="$errors->first()"/>
 		@endif
 		@if ($verify->status > 0 && count($errors) <= 0 && empty(Session::get('successMsg')))
-			<div class="alert alert-danger">
-				<span> {{trans('auth.overtime')}} </span>
-			</div>
+			<x-alert type="danger" :message="trans('auth.overtime')"/>
 		@else
 			<div class="form-title">
 				{{trans('auth.resetPassword')}}

+ 3 - 9
resources/views/auth/resetPassword.blade.php

@@ -2,14 +2,10 @@
 @section('title', trans('auth.resetPassword'))
 @section('content')
 	@if (Session::get('successMsg'))
-		<div class="alert alert-success">
-			<span> {{Session::get('successMsg')}} </span>
-		</div>
+		<x-alert type="success" :message="Session::get('successMsg')"/>
 	@endif
 	@if($errors->any())
-		<div class="alert alert-danger">
-			<span> {{$errors->first()}} </span>
-		</div>
+		<x-alert type="danger" :message="$errors->first()"/>
 	@endif
 	<form method="post" action="/resetPassword">
 		@if(sysConfig('is_reset_password'))
@@ -23,9 +19,7 @@
 				{{csrf_field()}}
 			</div>
 		@else
-			<div class="alert alert-danger">
-				<span> {{trans('auth.system_maintenance_tip',['email' => sysConfig('webmaster_email')])}} </span>
-			</div>
+			<x-alert type="danger" :message="trans('auth.system_maintenance_tip' ,['email' => sysConfig('webmaster_email')])"/>
 		@endif
 		<a href="/login"
 				class="btn btn-danger btn-lg {{sysConfig('is_reset_password')? 'float-left':'btn-block'}}">{{trans('auth.back')}}</a>

+ 6 - 0
resources/views/components/alert.blade.php

@@ -0,0 +1,6 @@
+<div {{ $attributes->merge(['class' => 'alert  alert-dismissible alert-'.$type]) }} role="alert">
+	<button class="close" data-dismiss="alert" aria-label="Close">
+		<span aria-hidden="true">&times;</span><span class="sr-only">{{trans('home.close')}}</span>
+	</button>
+	{!! $message !!}
+</div>

+ 2 - 2
resources/views/components/chatUnit.blade.php → resources/views/components/chat-unit.blade.php

@@ -1,7 +1,7 @@
-<div class="chat @if(($ticket->admin && !Auth::getUser()->is_admin) ||(!$ticket->admin && Auth::getUser()->is_admin)) chat-left @endif">
+<div class="chat @if(($ticket->admin && !$user->is_admin) ||(!$ticket->admin && $user->is_admin)) chat-left @endif">
 	<div class="chat-avatar">
 		<p class="avatar" data-toggle="tooltip" href="#" data-placement="right" title="" data-original-title="{{($ticket->admin?:$ticket->user)->email}}">
-			@component('components.avatar',['user' => $ticket->admin?:$ticket->user])@endcomponent
+			<x-avatar :user="$ticket->admin?:$ticket->user"/>
 		</p>
 	</div>
 	<div class="chat-body">

+ 8 - 8
resources/views/emails/resetPassword.blade.php

@@ -774,8 +774,8 @@
 					<div style="border-collapse: collapse;display: table;width: 100%;">
 						<!--[if (mso)|(IE)]>
 						<table align="center" class="preheader" cellpadding="0" cellspacing="0" role="presentation">
-						<tr>
-							<td style="width: 280px" valign="top"><![endif]-->
+							<tr>
+								<td style="width: 280px" valign="top"><![endif]-->
 						<div class="snippet"
 								style="display: table-cell;Float: left;font-size: 12px;line-height: 19px;max-width: 280px;min-width: 140px; width: 140px;width: calc(14000% - 78120px);padding: 10px 0 5px 0;color: #bdbdbd;font-family: Ubuntu,sans-serif;">
 
@@ -799,8 +799,8 @@
 							emb-background-style>
 						<!--[if (mso)|(IE)]>
 						<table align="center" cellpadding="0" cellspacing="0" role="presentation">
-						<tr class="layout-fixed-width" emb-background-style>
-							<td style="width: 600px" class="w560"><![endif]-->
+							<tr class="layout-fixed-width" emb-background-style>
+								<td style="width: 600px" class="w560"><![endif]-->
 						<div class="column"
 								style="text-align: left;color: #787778;font-size: 16px;line-height: 24px;font-family: Ubuntu,sans-serif;max-width: 600px;min-width: 320px; width: 320px;width: calc(28000% - 167400px);">
 
@@ -867,8 +867,8 @@
 						<div class="layout__inner" style="border-collapse: collapse;display: table;width: 100%;">
 							<!--[if (mso)|(IE)]>
 							<table align="center" cellpadding="0" cellspacing="0" role="presentation">
-							<tr class="layout-email-footer">
-								<td style="width: 400px;" valign="top" class="w360"><![endif]-->
+								<tr class="layout-email-footer">
+									<td style="width: 400px;" valign="top" class="w360"><![endif]-->
 							<div class="column wide"
 									style="text-align: left;font-size: 12px;line-height: 19px;color: #bdbdbd;font-family: Ubuntu,sans-serif;Float: left;max-width: 400px;min-width: 320px; width: 320px;width: calc(8000% - 47600px);">
 								<div style="Margin-left: 20px;Margin-right: 20px;Margin-top: 10px;Margin-bottom: 10px;">
@@ -905,8 +905,8 @@
 						<div class="layout__inner" style="border-collapse: collapse;display: table;width: 100%;">
 							<!--[if (mso)|(IE)]>
 							<table align="center" cellpadding="0" cellspacing="0" role="presentation">
-							<tr class="layout-email-footer">
-								<td style="width: 600px;" class="w560"><![endif]-->
+								<tr class="layout-email-footer">
+									<td style="width: 600px;" class="w560"><![endif]-->
 							<div class="column"
 									style="text-align: left;font-size: 12px;line-height: 19px;color: #bdbdbd;font-family: Ubuntu,sans-serif;max-width: 600px;min-width: 320px; width: 320px;width: calc(28000% - 167400px);">
 								<div style="Margin-left: 20px;Margin-right: 20px;Margin-top: 10px;Margin-bottom: 10px;">

+ 29 - 47
resources/views/user/help.blade.php

@@ -19,12 +19,9 @@
 				<div class="panel">
 					<div class="panel-body">
 						<div class="list-group faq-list" role="tablist">
-							<a class="list-group-item list-group-item-action active" data-toggle="tab"
-									href="#category-1" aria-controls="category-1" role="tab">使用&下载</a>
-							<a class="list-group-item" data-toggle="tab" href="#category-3" aria-controls="category-3"
-									role="tab">账号&服务</a>
-							<a class="list-group-item" data-toggle="tab" href="#category-2" aria-controls="category-2"
-									role="tab">面板相关</a>
+							<a class="list-group-item list-group-item-action active" data-toggle="tab" href="#category-1" aria-controls="category-1" role="tab">使用&下载</a>
+							<a class="list-group-item" data-toggle="tab" href="#category-3" aria-controls="category-3" role="tab">账号&服务</a>
+							<a class="list-group-item" data-toggle="tab" href="#category-2" aria-controls="category-2" role="tab">面板相关</a>
 						</div>
 					</div>
 				</div>
@@ -36,27 +33,17 @@
 					<div class="panel-body">
 						<div class="tab-content">
 							<div class="tab-pane animation-fade active" id="category-1" role="tabpanel">
-								<div class="panel-group panel-group-simple panel-group-continuous" id="accordion1"
-										aria-multiselectable="true" role="tablist">
+								<div class="panel-group panel-group-simple panel-group-continuous" id="accordion1" aria-multiselectable="true" role="tablist">
 									<div class="panel">
 										<div class="panel-heading" id="question-1" role="tab">
-											<a class="panel-title cyan-600" aria-controls="answer-1"
-													aria-expanded="true" data-toggle="collapse" href="#answer-1"
-													data-parent="#accordion1"><i class="icon wb-link"
-														aria-hidden="true"></i>{{trans('home.subscribe_link')}}
+											<a class="panel-title cyan-600" aria-controls="answer-1" aria-expanded="true" data-toggle="collapse" href="#answer-1" data-parent="#accordion1">
+												<i class="icon wb-link" aria-hidden="true"></i>{{trans('home.subscribe_link')}}
 											</a>
 										</div>
-										<div class="panel-collapse collapse show" id="answer-1"
-												aria-labelledby="question-1" role="tabpanel">
+										<div class="panel-collapse collapse show" id="answer-1" aria-labelledby="question-1" role="tabpanel">
 											<div class="panel-body">
 												@if($subscribe_status)
-													<div class="alert alert-warning" role="alert">
-														<button class="close" data-dismiss="alert" aria-label="Close">
-															<span aria-hidden="true">&times;</span><span
-																	class="sr-only">{{trans('home.close')}}</span>
-														</button>
-														{{trans('home.subscribe_warning')}}
-													</div>
+													<x-alert type="warning" :message="trans('home.subscribe_warning')"/>
 													<div class="input-group">
 														<input type="text" class="form-control" id="sub_link" value="{{$link}}"/>
 														<div class="input-group-btn btn-group" role="group">
@@ -67,7 +54,9 @@
 																	</button>
 																	<div class="dropdown-menu" aria-labelledby="sublink" role="menu">
 																		@if(in_array('ss',$sub))
-																			<button class="dropdown-item" onclick="linkManager('1')" role="menuitem">只订阅SS/SSR</button>
+																			<button class="dropdown-item" onclick="linkManager('1')" role="menuitem">
+																				只订阅SS/SSR
+																			</button>
 																		@endif
 																		@if(in_array('v2',$sub))
 																			<a class="dropdown-item" onclick="linkManager('2')" role="menuitem">只订阅V2Ray</a>
@@ -87,12 +76,7 @@
 														</div>
 													</div>
 												@else
-													<div class="alert alert-danger alert-dismissible" role="alert">
-														<button type="button" class="close" data-dismiss="alert"
-																aria-label="Close"><span aria-hidden="true">×</span>
-														</button>
-														{{trans('home.subscribe_baned')}}
-													</div>
+													<x-alert type="danger" :message="trans('home.subscribe_baned')"/>
 												@endif
 											</div>
 										</div>
@@ -162,9 +146,10 @@
 																href="/services">【{{trans('home.services')}}】</a>选择想要购买的套餐,在订单界面选择<code>在线支付</code>即可。
 													</li>
 													<li>余额支付,本支付方法支持微信,支付宝。支付后需要等待充值到账,再购买服务。
-													    ,充值后等待充值到账,一般会在<code>24小时</code>内到账,到账后可以在<a
-																href="/services">【{{trans('home.services')}}】</a>
-													    页面查看您的账号余额。 在<a href="/services">【{{trans('home.services')}}】</a>选择想要购买的套餐,在订单界面选择<code>余额支付</code>即可。
+													    ,充值后等待充值到账,一般会在<code>24小时</code>内到账,到账后可以在
+														<a href="/services">【{{trans('home.services')}}】</a>页面查看您的账号余额。
+													    在<a href="/services">【{{trans('home.services')}}】</a>
+													    选择想要购买的套餐,在订单界面选择<code>余额支付</code>即可。
 													</li>
 												</ol>
 											</div>
@@ -225,8 +210,9 @@
 																<code>命令提示符(管理员)/ Windows PowerShell(管理员)</code>
 															</li>
 															<li>
-																输入<code>Netsh winsock reset</code> 后回车,再输入 <code>netsh
-																                                                 advfirewall reset</code> 后回车;
+																输入<code>Netsh winsock reset</code> 后回车,再输入
+																<code>netsh advfirewall reset</code>
+																后回车;
 															</li>
 														</ol>
 													</li>
@@ -239,8 +225,7 @@
 									<!-- Question 6 -->
 									<div class="panel">
 										<div class="panel-heading" id="question-6" role="tab">
-											<a class="panel-title" aria-controls="answer-6" aria-expanded="false"
-													data-toggle="collapse" href="#answer-6" data-parent="#accordion">
+											<a class="panel-title" aria-controls="answer-6" aria-expanded="false" data-toggle="collapse" href="#answer-6" data-parent="#accordion">
 												为什么我的账号状态显示是<span class="red-700">禁用</span>?
 											</a>
 										</div>
@@ -250,15 +235,14 @@
 												账号在2种情况下会显示禁用;
 												<ol>
 													<li>
-														套餐过期/流量枯竭;此情况您需要重新<a
-																href="/services">【{{trans('home.services')}}】</a>;
+														套餐过期/流量枯竭;此情况您需要重新
+														<a href="/services">【{{trans('home.services')}}】</a>;
 													</li>
 													<li>
 														近期流量使用异常;在<code>1小时</code>内使用流量超过
-														<code>{{sysConfig('traffic_ban_value')}}
-															GB</code>
-														,即会触发本站的流量异常保护;保护时长为<code>{{sysConfig('traffic_ban_time')}}
-															分钟</code>
+														<code>{{sysConfig('traffic_ban_value')}}GB</code>
+														,即会触发本站的流量异常保护;保护时长为
+														<code>{{sysConfig('traffic_ban_time')}}分钟</code>
 													</li>
 												</ol>
 												如您对禁用情况有疑问,可以创建<a href="/tickets">【{{trans('home.tickets')}}】</a>,联系售后人员。
@@ -270,8 +254,7 @@
 									<!-- Question 7 -->
 									<div class="panel">
 										<div class="panel-heading" id="question-7" role="tab">
-											<a class="panel-title" aria-controls="answer-7" aria-expanded="false"
-													data-toggle="collapse" href="#answer-7" data-parent="#accordion">
+											<a class="panel-title" aria-controls="answer-7" aria-expanded="false" data-toggle="collapse" href="#answer-7" data-parent="#accordion">
 												为什么我的订阅链接被禁用了?
 											</a>
 										</div>
@@ -280,14 +263,13 @@
 											<div class="panel-body">
 												订阅地址对于账号来说非常重要。所以本站对此设置了严格的限制措施,以防止用户无意间泄露给他人后,无法挽回。
 												<p>限制为:
-													<code>24小时</code>内,订阅地址只允许请求<code>{{sysConfig('subscribe_ban_times')}}
-														次</code>
+													<code>24小时</code>内,订阅地址只允许请求
+													<code>{{sysConfig('subscribe_ban_times')}}次</code>
 												</p>
 												<p>解封,请在过一段时间并确定无误后,创建<a href="/tickets">【{{trans('home.tickets')}}】</a>,联系售后人员
 												</p>
 												<p>小知识:如果您无意间的截图忘记将订阅地址打码了,您可以
-													<button class="btn btn-sm btn-outline-info"
-															onclick="exchangeSubscribe();">
+													<button class="btn btn-sm btn-outline-info" onclick="exchangeSubscribe();">
 														<i class="icon wb-refresh" aria-hidden="true"></i>
 														点这里
 													</button>

+ 4 - 14
resources/views/user/index.blade.php

@@ -7,12 +7,7 @@
 	<div class="page-content container-fluid">
 		<div class="row" data-plugin="matchHeight" data-by-row="true">
 			@if (Session::has('successMsg'))
-				<div class="col-md-12 alert alert-success" role="alert">
-					<button class="close" data-dismiss="alert" aria-label="Close"><span
-								aria-hidden="true">&times;</span><span class="sr-only">{{trans('home.close')}}</span>
-					</button>
-					{{Session::get('successMsg')}}
-				</div>
+				<x-alert type="success" :message="Session::get('successMsg')" class="col-md-12"/>
 			@endif
 			<div class="col-xxl-3 col-xl-4 col-lg-5 col-md-6 col-12">
 				<div class="card card-shadow">
@@ -82,7 +77,8 @@
 										data-barcolor="#96A3FA" data-size="100" data-barsize="10"
 										data-goal="{{$unusedPercent * 100}}" aria-valuenow="{{$unusedPercent * 100}}"
 										role="progressbar">
-									<span class="pie-progress-number blue-grey-700 font-size-20">{{$unusedPercent * 100}}%</span>
+									<span class="pie-progress-number blue-grey-700 font-size-20">
+										{{$unusedPercent * 100}}%</span>
 								</div>
 							</div>
 						</div>
@@ -207,13 +203,7 @@
 									</ul>
 								</div>
 							</div>
-							<div class="alert alert-danger alert-dismissible" role="alert">
-								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-									<span aria-hidden="true">×</span>
-									<span class="sr-only">Close</span>
-								</button>
-								{{trans('home.traffic_log_tips')}}
-							</div>
+							<x-alert type="danger" :message="trans('home.traffic_log_tips')"/>
 							<div class="panel-body">
 								<div class="tab-content">
 									<div class="tab-pane active" id="daily" role="tabpanel">

+ 6 - 14
resources/views/user/invite.blade.php

@@ -6,25 +6,17 @@
 	<div class="page-header">
 		<h1 class="page-title cyan-600"><i class="icon wb-extension"></i>{{trans('home.invite_code')}}</h1>
 		<div class="page-content container-fluid">
-			<div class="alert alert-info" role="alert">
-				<button class="close" data-dismiss="alert" aria-label="Close"><span
-							aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-				{!! trans('home.promote_invite_code', ['traffic' => $referral_traffic, 'referral_percent' => $referral_percent * 100]) !!}
-			</div>
+			<x-alert type="info" :message="trans('home.promote_invite_code', ['traffic' => $referral_traffic, 'referral_percent' => $referral_percent * 100])"/>
 			<div class="row">
 				<div class="col-xxl-3 col-lg-4">
 					<div class="card">
 						<div class="card-block">
-							<h4 class="card-title cyan-600"><i
-										class="icon wb-plus"></i> {{trans('home.invite_code_make')}}
+							<h4 class="card-title cyan-600">
+								<i class="icon wb-plus"></i> {{trans('home.invite_code_make')}}
 							</h4>
-							<p class="card-text alert alert-info">
-								<i class="icon wb-warning red-700"></i> {{trans('home.invite_code_tips1')}}
-								<strong> {{$num}} </strong> {{trans('home.invite_code_tips2', ['days' => sysConfig('user_invite_days')])}}
-							</p>
-							<button type="button" class="btn btn-primary btn-animate btn-animate-side"
-									onclick="makeInvite()" @if(!$num) disabled @endif><i
-										class="icon wb-plus"></i> {{trans('home.invite_code_button')}}
+							<x-alert type="info" :message="trans('home.invite_code_tips', ['num'=>$num, 'days' => sysConfig('user_invite_days')])"/>
+							<button type="button" class="btn btn-primary btn-animate btn-animate-side" onclick="makeInvite()" @if(!$num) disabled @endif>
+								<i class="icon wb-plus"></i> {{trans('home.invite_code_button')}}
 							</button>
 						</div>
 					</div>

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

@@ -112,7 +112,7 @@
 					<a href="#" aria-expanded="false" class="nav-link navbar-avatar" data-animation="scale-up"
 							data-toggle="dropdown" role="button">
 						<span class="avatar avatar-online">
-							@component('components.avatar',['user' => Auth::getUser()])@endcomponent
+							<x-avatar :user="Auth::getUser()"/>
 							<i></i>
 						</span>
 					</a>
@@ -201,9 +201,9 @@
 <div class="page">
 	<!--[if lt IE 8]>
 	<p class="browserupgrade">您正在使用 <strong>过时/老旧</strong> 的浏览器。 为了您的使用体验,请
-	<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an
-	<strong>outdated</strong> browser. Please
-	<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
+		<a href="http://browsehappy.com/" target="_blank">升级您的浏览器</a> <br/>You are using an
+		<strong>outdated</strong> browser. Please
+		<a href="http://browsehappy.com/" target="_blank">upgrade your browser</a> to improve your experience.</p>
 	<![endif]-->
 	@yield('content')
 </div>

+ 7 - 13
resources/views/user/profile.blade.php

@@ -6,15 +6,17 @@
 				<div class="card">
 					<div class="card-header white bg-cyan-600 p-30 clearfix">
 						<span class="avatar avatar-100 float-left mr-20">
-							@component('components.avatar',['user' => Auth::getUser()])@endcomponent
+							<x-avatar :user="Auth::getUser()"/>
 						</span>
 						<div class="float-left">
 							<div class="font-size-20 mb-15">{{Auth::getUser()->username}}</div>
 							<p class="mb-5 text-nowrap"><i class="icon bd-webchat mr-10" aria-hidden="true"></i>
-								<span class="text-break">微信: @if(Auth::getUser()->wechat) {{Auth::getUser()->wechat}} @else未添加 @endif</span>
+								<span class="text-break">微信: @if(Auth::getUser()->wechat) {{Auth::getUser()->wechat}} @else
+								                         未添加 @endif</span>
 							</p>
 							<p class="mb-5 text-nowrap"><i class="icon bd-qq mr-10" aria-hidden="true"></i>
-								<span class="text-break">QQ: @if(Auth::getUser()->qq) {{Auth::getUser()->qq}} @else未添加 @endif</span>
+								<span class="text-break">QQ: @if(Auth::getUser()->qq) {{Auth::getUser()->qq}} @else
+								                         未添加 @endif</span>
 							</p>
 						</div>
 					</div>
@@ -23,18 +25,10 @@
 			<div class="col-lg-7">
 				<div class="panel">
 					@if (Session::has('successMsg'))
-						<div class="alert alert-success alert-dismissable">
-							<button class="close" data-dismiss="alert" aria-label="Close">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-							{{Session::get('successMsg')}}
-						</div>
+						<x-alert type="success" :message="Session::get('successMsg')"/>
 					@endif
 					@if($errors->any())
-						<div class="alert alert-danger alert-dismissable">
-							<button class="close" data-dismiss="alert" aria-label="Close">
-								<span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-							<strong>{{trans('home.error')}}:</strong> {{$errors->first()}}
-						</div>
+						<x-alert type="danger" :message="$errors->first()"/>
 					@endif
 					<div class="panel-body nav-tabs-animate nav-tabs-horizontal" data-plugin="tabs">
 						<ul class="nav nav-tabs nav-tabs-line" role="tablist">

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

@@ -7,11 +7,7 @@
 		<h1 class="page-title cyan-600"><i class="icon wb-star"></i>{{trans('home.referrals')}}</h1>
 	</div>
 	<div class="page-content  container-fluid">
-		<div class="alert alert-info" role="alert">
-			<button class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span><span
-						class="sr-only">Close</span></button>
-			{!! trans('home.promote_link', ['traffic' => $referral_traffic, 'referral_percent' => $referral_percent * 100]) !!}
-		</div>
+		<x-alert type="success" :message="trans('home.promote_link', ['traffic' => $referral_traffic, 'referral_percent' => $referral_percent * 100])"/>
 		<div class="row">
 			<div class="col-lg-5">
 				<!-- 推广链接 -->

+ 2 - 2
resources/views/user/replyTicket.blade.php

@@ -16,9 +16,9 @@
 			<div class="panel-body">
 				<div class="chat-box">
 					<div class="chats">
-						@component('components.chatUnit',['ticket'=>$ticket])@endcomponent
+						<x-chat-unit :user="Auth::getUser()" :ticket="$ticket"/>
 						@foreach ($replyList as $reply)
-							@component('components.chatUnit',['ticket'=>$reply])@endcomponent
+							<x-chat-unit :user="Auth::getUser()" :ticket="$reply"/>
 						@endforeach
 					</div>
 				</div>