Browse Source

问题修复与界面优化

1. 修改报错界面的标题大小格式;
2. 修复管理员工单无法打开工单的错误;
3. 用户首页显示优化
Bretton 5 years ago
parent
commit
73e3c89332

+ 44 - 34
composer.lock

@@ -471,16 +471,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.3.3",
+            "version": "1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f"
+                "reference": "cbe23383749496fe0f373345208b79568e4bc248"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/46867cbf8ca9fb8d60c506895449eb799db1184f",
-                "reference": "46867cbf8ca9fb8d60c506895449eb799db1184f",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
+                "reference": "cbe23383749496fe0f373345208b79568e4bc248",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -490,11 +490,11 @@
                 ]
             },
             "require": {
-                "php": "^5.3.2 || ^7.0",
+                "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
             },
             "type": "library",
             "autoload": {
@@ -512,12 +512,12 @@
                     "email": "john-stevenson@blueyonder.co.uk"
                 }
             ],
-            "description": "Restarts a process without xdebug.",
+            "description": "Restarts a process without Xdebug.",
             "keywords": [
                 "Xdebug",
                 "performance"
             ],
-            "time": "2019-05-27T17:52:04+00:00"
+            "time": "2019-11-06T16:40:04+00:00"
         },
         {
             "name": "dnoegel/php-xdg-base-dir",
@@ -641,16 +641,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "v2.9.2",
+            "version": "v2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9"
+                "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
-                "reference": "22800bd651c1d8d2a9719e2a3dc46d5108ebfcc9",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
+                "reference": "0c9a646775ef549eb0a213a4f9bd4381d9b4d934",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -663,15 +663,14 @@
                 "doctrine/cache": "^1.0",
                 "doctrine/event-manager": "^1.0",
                 "ext-pdo": "*",
-                "php": "^7.1"
+                "php": "^7.2"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^5.0",
-                "jetbrains/phpstorm-stubs": "^2018.1.2",
-                "phpstan/phpstan": "^0.10.1",
-                "phpunit/phpunit": "^7.4",
-                "symfony/console": "^2.0.5|^3.0|^4.0",
-                "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
+                "doctrine/coding-standard": "^6.0",
+                "jetbrains/phpstorm-stubs": "^2019.1",
+                "phpstan/phpstan": "^0.11.3",
+                "phpunit/phpunit": "^8.4.1",
+                "symfony/console": "^2.0.5|^3.0|^4.0|^5.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -682,7 +681,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.9.x-dev",
+                    "dev-master": "2.10.x-dev",
                     "dev-develop": "3.0.x-dev"
                 }
             },
@@ -696,6 +695,10 @@
                 "MIT"
             ],
             "authors": [
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
                 {
                     "name": "Roman Borschel",
                     "email": "roman@code-factory.org"
@@ -704,10 +707,6 @@
                     "name": "Benjamin Eberlei",
                     "email": "kontakt@beberlei.de"
                 },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
                 {
                     "name": "Jonathan Wage",
                     "email": "jonwage@gmail.com"
@@ -718,14 +717,25 @@
             "keywords": [
                 "abstraction",
                 "database",
+                "db2",
                 "dbal",
+                "mariadb",
+                "mssql",
                 "mysql",
-                "persistence",
+                "oci8",
+                "oracle",
+                "pdo",
                 "pgsql",
-                "php",
-                "queryobject"
-            ],
-            "time": "2018-12-31T03:27:51+00:00"
+                "postgresql",
+                "queryobject",
+                "sasql",
+                "sql",
+                "sqlanywhere",
+                "sqlite",
+                "sqlserver",
+                "sqlsrv"
+            ],
+            "time": "2019-11-03T16:50:43+00:00"
         },
         {
             "name": "doctrine/event-manager",
@@ -1867,16 +1877,16 @@
         },
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.86",
+            "version": "v1.2.88",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee"
+                "reference": "4ede3431afaa5b77b6d9414935184edbcfffa822"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/1835311c4f458b2f59bbfec05ebfc64ac382b6ee",
-                "reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/4ede3431afaa5b77b6d9414935184edbcfffa822",
+                "reference": "4ede3431afaa5b77b6d9414935184edbcfffa822",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1918,7 +1928,7 @@
                 "crawlerdetect",
                 "php crawler detect"
             ],
-            "time": "2019-10-15T20:54:57+00:00"
+            "time": "2019-11-07T21:06:22+00:00"
         },
         {
             "name": "jenssegers/agent",

+ 1 - 1
public/assets/examples/css/pages/errors.css

@@ -2,7 +2,7 @@
   margin-bottom: 33px; }
 
 .page-error header h1 {
-  font-size: 10em;
+  font-size: 5em;
   font-weight: 400; }
 
 .page-error header p {

+ 1 - 1
public/assets/examples/css/pages/errors.min.css

@@ -1 +1 @@
-.page-error .error-mark{margin-bottom:33px}.page-error header h1{font-size:10em;font-weight:400}.page-error header p{margin-bottom:30px;font-size:30px;text-transform:uppercase}.page-error h2{margin-bottom:30px}.page-error .error-advise{margin-bottom:25px;color:#a9afb5}
+.page-error .error-mark{margin-bottom:33px}.page-error header h1{font-size:5em;font-weight:400}.page-error header p{margin-bottom:30px;font-size:30px;text-transform:uppercase}.page-error h2{margin-bottom:30px}.page-error .error-advise{margin-bottom:25px;color:#a9afb5}

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

@@ -70,7 +70,7 @@
                 <div class="panel-title">
                     <div class="brand">
                         @if(\App\Components\Helpers::systemConfig()['website_logo'])
-                            <img class="brand-img" src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" width="70px">
+                            <img class="brand-img" src="{{\App\Components\Helpers::systemConfig()['website_logo']}}" width="70px" alt="Logo">
                         @else
                             <img class="brand-img" src="/assets/images/logo64.png" alt="Logo">
                         @endif

+ 1 - 1
resources/views/ticket/ticketList.blade.php

@@ -49,7 +49,7 @@
                                 </td>
                                 @endif
                                 <td>
-                                    <a href="/admin/userList?id={{$ticket->user->id}}" target="_blank">{{$ticket->title}}</a>
+                                    <a href="/ticket/replyTicket?id={{$ticket->id}}" target="_blank">{{$ticket->title}}</a>
                                 </td>
                                 <td style="text-align: center;">
                                     @if ($ticket->status == 0)

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

@@ -65,13 +65,13 @@
                                     <i class="wb-stats-bars cyan-500"></i>
                                 </button>
                                 <span class="font-weight-400">{{trans('home.account_bandwidth_usage')}}</span>
-                                <p class="text-center font-weight-100 font-size-40">
+                                <div class="text-center font-weight-100 font-size-40">
                                     {{$info['unusedTransfer']}}
-                                </p>
+                                </div>
                                 @if( \App\Components\Helpers::systemConfig()['reset_traffic'] && $info['resetDays'] != 0 && $info['remainDays']>$info['resetDays'])
-                                    <p class="text-center font-weight-300 blue-grey-500">
+                                    <div class="text-center font-weight-300 blue-grey-500">
                                         {{trans('home.account_reset_notice', ['reset_day' => $info['resetDays']])}}
-                                    </p>
+                                    </div>
                                 @endif
                             </div>
                             <div class="col-lg-5 col-md-12 col-sm-5">
@@ -183,14 +183,14 @@
                                     </nav>
                                 </div>
                             </div>
-                            <div class="panel-body h-400" data-show-on-hover="false" data-direction="vertical"
+                            <div class="panel-body" data-show-on-hover="false" data-direction="vertical"
                                  data-skin="scrollable-shadow" data-plugin="scrollable">
                                 <div data-role="container">
                                     <div data-role="content">
                                         @if(!$noticeList -> isEmpty())
                                             @foreach($noticeList as $notice)
                                                 <h3 class="text-center">{!!$notice->title!!}</h3>
-                                                {!!$notice->content!!}
+                                                {!! $notice->content !!}
                                             @endforeach
                                         @else
                                             <p class="text-center font-size-40">暂无公告</p>
@@ -200,8 +200,8 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-xl-6 col-lg-12">
-                        <div class="panel panel-primary panel-line h-450">
+                    <div class="col-xxl-6">
+                        <div class="panel panel-primary panel-line">
                             <div class="panel-heading">
                                 <h1 class="panel-title"><i class="wb-pie-chart mr-10"></i>流量使用</h1>
                                 <div class="panel-actions">