运输管理 运费管理 运单软删除置顶 页面修改1 by 'zengjun'1

composer.lock

@@ -111,6 +111,12 @@
                 "brick",
                 "math"
             ],
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-15T15:59:35+00:00"
         },
         {
@@ -400,6 +406,20 @@
                 "sqlserver",
                 "sqlsrv"
             ],
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-04-20T17:19:26+00:00"
         },
         {
@@ -789,16 +809,16 @@
         },
         {
             "name": "endroid/qr-code",
-            "version": "3.8.1",
+            "version": "3.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/endroid/qr-code.git",
-                "reference": "a7e07d26fad46d7032b39a076f6c85e07757028d"
+                "reference": "1616778c697238b16e1b7592ea824bafcf7d108c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/endroid/qr-code/zipball/a7e07d26fad46d7032b39a076f6c85e07757028d",
-                "reference": "a7e07d26fad46d7032b39a076f6c85e07757028d",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/1616778c697238b16e1b7592ea824bafcf7d108c",
+                "reference": "1616778c697238b16e1b7592ea824bafcf7d108c",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -860,7 +880,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-06-02T20:10:27+00:00"
+            "time": "2020-06-19T08:57:37+00:00"
         },
         {
             "name": "facade/flare-client-php",
@@ -920,6 +940,12 @@
                 "flare",
                 "reporting"
             ],
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/spatie",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-03-02T15:52:04+00:00"
         },
         {
@@ -1863,16 +1889,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.4.3",
+            "version": "1.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
+                "reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
-                "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
+                "reference": "fc33ca12575e98e57cdce7d5f38b2ca5335714b3",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -1883,7 +1909,7 @@
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^7.1"
+                "php": "^7.1 || ^8.0"
             },
             "conflict": {
                 "scrutinizer/ocular": "1.7.*"
@@ -1905,11 +1931,6 @@
                 "bin/commonmark"
             ],
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "League\\CommonMark\\": "src"
@@ -1939,7 +1960,33 @@
                 "md",
                 "parser"
             ],
-            "time": "2020-05-04T22:15:21+00:00"
+            "funding": [
+                {
+                    "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.colinodell.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.paypal.me/colinpodell/10.00",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/colinodell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/colinodell",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/league/commonmark",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-06-21T20:50:13+00:00"
         },
         {
             "name": "league/flysystem",
@@ -2108,6 +2155,16 @@
                 "php",
                 "phpspreadsheet"
             ],
+            "funding": [
+                {
+                    "url": "https://laravel-excel.com/commercial-support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/patrickbrouwers",
+                    "type": "github"
+                }
+            ],
             "time": "2020-02-28T15:47:45+00:00"
         },
         {
@@ -2850,6 +2907,12 @@
                 "Pinyin",
                 "cn2pinyin"
             ],
+            "funding": [
+                {
+                    "url": "https://www.patreon.com/overtrue",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-04-13T08:53:30+00:00"
         },
         {
@@ -3824,6 +3887,12 @@
                 "identifier",
                 "uuid"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/ramsey",
+                    "type": "github"
+                }
+            ],
             "time": "2020-03-29T20:13:32+00:00"
         },
         {
@@ -3899,6 +3968,12 @@
                 "highlight.php",
                 "syntax"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/allejo",
+                    "type": "github"
+                }
+            ],
             "time": "2020-03-02T05:59:21+00:00"
         },
         {
@@ -4963,16 +5038,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
-                "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
+                "reference": "2edd75b8b35d62fd3eeabba73b26b8f1f60ce13d",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -4991,6 +5066,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5037,20 +5116,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:14:59+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
+                "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
-                "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ba6c9c18db36235b859cc29b8372d1c01298c035",
+                "reference": "ba6c9c18db36235b859cc29b8372d1c01298c035",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5069,6 +5148,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5116,20 +5199,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2"
+                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/e094b0770f7833fdf257e6ba4775be4e258230b2",
-                "reference": "e094b0770f7833fdf257e6ba4775be4e258230b2",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/6e4dbcf5e81eba86e36731f94fe56b1726835846",
+                "reference": "6e4dbcf5e81eba86e36731f94fe56b1726835846",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5148,6 +5231,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5196,20 +5283,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
+                "reference": "a57f8161502549a742a63c09f0a604997bf47027"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
-                "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a57f8161502549a742a63c09f0a604997bf47027",
+                "reference": "a57f8161502549a742a63c09f0a604997bf47027",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5230,6 +5317,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5278,20 +5369,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9"
+                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/1357b1d168eb7f68ad6a134838e46b0b159444a9",
-                "reference": "1357b1d168eb7f68ad6a134838e46b0b159444a9",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/40309d1700e8f72447bb9e7b54af756eeea35620",
+                "reference": "40309d1700e8f72447bb9e7b54af756eeea35620",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5310,6 +5401,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5361,20 +5456,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:14:59+00:00"
+            "time": "2020-06-14T14:40:37+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
-                "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7110338d81ce1cbc3e273136e4574663627037a7",
+                "reference": "7110338d81ce1cbc3e273136e4574663627037a7",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5393,6 +5488,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5440,7 +5539,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
@@ -5519,16 +5618,16 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
+                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
-                "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fa0837fe02d617d31fbb25f990655861bb27bd1a",
+                "reference": "fa0837fe02d617d31fbb25f990655861bb27bd1a",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5544,6 +5643,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5593,20 +5696,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.17.0",
+            "version": "v1.17.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd"
+                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/5e30b2799bc1ad68f7feb62b60a73743589438dd",
-                "reference": "5e30b2799bc1ad68f7feb62b60a73743589438dd",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4a5b6bba3259902e386eb80dd1956181ee90b5b2",
+                "reference": "4a5b6bba3259902e386eb80dd1956181ee90b5b2",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -5622,6 +5725,10 @@
             "extra": {
                 "branch-alias": {
                     "dev-master": "1.17-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
                 }
             },
             "autoload": {
@@ -5675,7 +5782,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-12T16:47:27+00:00"
+            "time": "2020-06-06T08:46:27+00:00"
         },
         {
             "name": "symfony/process",
@@ -6473,16 +6580,16 @@
         },
         {
             "name": "te7a-houdini/laravel-trix",
-            "version": "2.0.1",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Te7a-Houdini/laravel-trix.git",
-                "reference": "495c4637eafc549a3933f9d9d11f4703e9b75967"
+                "reference": "cba876b2b0ed5ceaa1e2fba73ac1a4240eef9900"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Te7a-Houdini/laravel-trix/zipball/495c4637eafc549a3933f9d9d11f4703e9b75967",
-                "reference": "495c4637eafc549a3933f9d9d11f4703e9b75967",
+                "url": "https://api.github.com/repos/Te7a-Houdini/laravel-trix/zipball/cba876b2b0ed5ceaa1e2fba73ac1a4240eef9900",
+                "reference": "cba876b2b0ed5ceaa1e2fba73ac1a4240eef9900",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -6528,7 +6635,7 @@
                 "laravel-trix",
                 "te7a-houdini"
             ],
-            "time": "2020-03-06T15:33:35+00:00"
+            "time": "2020-06-04T12:31:59+00:00"
         },
         {
             "name": "tightenco/collect",
@@ -6862,6 +6969,16 @@
                 "oracle",
                 "pdo_oci"
             ],
+            "funding": [
+                {
+                    "url": "https://www.paypal.me/yajra",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/yajra",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-03-04T02:15:19+00:00"
         },
         {
@@ -6985,6 +7102,12 @@
                 "profiler",
                 "webprofiler"
             ],
+            "funding": [
+                {
+                    "url": "https://github.com/barryvdh",
+                    "type": "github"
+                }
+            ],
             "time": "2020-05-05T10:53:32+00:00"
         },
         {
@@ -7506,6 +7629,20 @@
                 "php",
                 "symfony"
             ],
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/nunomaduro",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/nunomaduro",
+                    "type": "patreon"
+                }
+            ],
             "time": "2020-04-04T19:56:08+00:00"
         },
         {
@@ -7738,16 +7875,16 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
+                "reference": "30441f2752e493c639526b215ed81d54f369d693"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
-                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/30441f2752e493c639526b215ed81d54f369d693",
+                "reference": "30441f2752e493c639526b215ed81d54f369d693",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -7767,7 +7904,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.x-dev"
+                    "dev-1.x": "1.x-dev"
                 }
             },
             "autoload": {
@@ -7786,7 +7923,7 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2020-02-18T18:59:58+00:00"
+            "time": "2020-06-19T20:22:09+00:00"
         },
         {
             "name": "phpspec/prophecy",
@@ -8141,16 +8278,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.6",
+            "version": "8.5.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348"
+                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
-                "reference": "3f9c4079d1407cd84c51c02c6ad1df6ec2ed1348",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
+                "reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
                 "shasum": "",
                 "mirrors": [
                     {
@@ -8236,7 +8373,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-06-15T10:45:47+00:00"
+            "time": "2020-06-22T07:06:58+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",

resources/views/waybill/index.blade.php

@@ -169,7 +169,9 @@
                     <th class="td-transit">承运商计重</th>
                     <th class="td-transit">计数</th>
                     <th class="td-transit">里程</th>
+                    @can('运输管理-运费')
                     <th class="td-fee">运费</th>
+                    @endcan
                     <th class="td-fee">提货费</th>
                     <th class="td-fee">其他费用</th>
                     <th class="td-fee">调度备注</th>
@@ -220,15 +222,18 @@
                         </span>
                     </td>
                     @can('运输管理-置顶')
-                    <td class=" text-muted toptd" >
-                        <div v-if="waybill.remark" class="bg-dark  text-warning top"  data-toggle="tooltip" style="opacity: 0.1"
-                        >@{{  waybill.remark }}</div>
-                        <a v-if="waybill.remark" class="text-muted" @click="cancelOnTop($event)" :data_id="waybill.id" href="javascript:0">取消<br>置顶</a>
-                        <a v-else @click="waybillOnTop($event)" :data_id="waybill.id" class="text-danger" href="javascript:0">置顶</a>
+                    <td class="td-bill text-muted" v-if="waybill.remark" style="height: 55px">
+                        <button type="button" class="btn btn-sm btn-outline-danger " @click="cancelOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">取消</button>
+                    </td>
+                    <td v-else>
+                        <button type="button" class="btn btn-sm btn-outline-secondary" @click="waybillOnTop($event)" :data_id="waybill.id"  style="opacity: 0.75">置顶</button>
                     </td>
                     @endcan
                     <td :class="[waybill.status=='已审核'?'text-success':'']">@{{waybill.status}}</td>
-                    <td class="td-bill text-muted">@{{waybill.id}}</td>
+                    <td class="td-bill text-muted toptd" >
+                        <div v-if="waybill.remark" class="bg-dark  text-warning top"  data-toggle="tooltip" style="opacity: 0.1;position: absolute"
+                        >置顶中：@{{  waybill.remark }}</div>
+                        @{{waybill.id}}</td>
                     <td class="td-bill text-muted">@{{waybill.created_at}}</td>
                     <td class="td-bill">@{{waybill.type}} <span class="badge badge-sm bg-warning" v-if="waybill.collect_fee">到付</span></td>
                     <td class="td-bill">@{{waybill.owner}}</td>
@@ -250,8 +255,8 @@
                     <td class="td-transit text-muted">@{{waybill.origination}}</td>
                     <td class="td-transit text-muted">@{{waybill.destination}}</td>
                     <td class="td-transit">@{{waybill.carrier}}</td>
-                    <td class="td-transit"><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
-                        <span v-if="waybill.type=='直发车'">
+                    <td class="td-transit"><span v-if="waybill.type==='专线'">@{{waybill.carrier_bill}}</span>
+                        <span v-if="waybill.type==='直发车'">
                             <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
                     <td class="td-transit"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight}}  @{{waybill.warehouse_weight_unit}}</span></td>
                     <td class="td-transit"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight}}  @{{waybill.carrier_weight_unit}}</span></td>
@@ -262,9 +267,22 @@
                     @can('运输管理-可见费用项')
                         {{--zengjun start--}}
                         @can('运输管理-运费')
-                            <td class="td-fee">
-                                <span v-if="waybill.type=='专线'"></span><span v-else-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee}}</span>
-                                <input type="number" class="form-control form-control-sm"  @blur="udpateWaybillFee($event)" :value="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">
+{{--                            <td class="td-fee" v-if="waybill.type==='专线'">--}}
+
+{{--                            </td>--}}
+{{--                            <td class="td-fee" v-else-if="waybill.type==='直发车'">--}}
+{{--                                <span v-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee}}</span>--}}
+{{--                                <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" v-model="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">--}}
+{{--                                <input v-else type="number" class="form-control form-control-sm">--}}
+{{--                            </td>--}}
+                            <td class="td-fee" v-if="waybill.fee">
+                                <span v-if="waybill.type==='专线'"></span>
+                                <span v-else-if="waybill.fee" class="btn-sm btn-outline-secondary btn" @click="waybillFeeCheck($event)" :data_id="waybill.id">@{{waybill.fee|money}}</span>
+                                <input type="number" class="form-control form-control-sm"  @blur="updateWaybillFee($event)" :value="waybill.fee" :data_id="waybill.id" style="min-width:85px;display: none">
+                            </td>
+                            <td v-else>
+                                <span v-if="waybill.type==='专线'"></span>
+                                <input v-else type="number" class="form-control form-control-sm" @blur="addWaybillFee($event)" onfocus="$(this).css('width','85px')" :value="waybill.fee" :data_id="waybill.id" >
                             </td>
                         @endcan
                         {{--zengjun end--}}
@@ -273,7 +291,9 @@
                     @endcan
                     <td class="td-fee">@{{waybill.dispatch_remark}}</td>
                     @can('运输管理-删除')
-                        <td class="td-operation btn-outline-danger" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删除</td>
+                        <td class="td-operation">
+                            <button type="button" class="btn btn-outline-danger btn-sm" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删</button>
+                        </td>
                     @endcan
                     {{--                    <td>@{{waybill.wms_bill_number}}</td>--}}
                     {{--                    <td>@{{waybill.recipient}}</td>--}}
@@ -342,10 +362,37 @@
                 {{--                    </td>--}}
                 {{--                </tr>--}}
             </table>
+            <div class="modal fade " id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+                <div class="modal-dialog modal-dialog-centered">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h5 class="modal-title" id="exampleModalLabel">请输入置顶备注</h5>
+                            <button type="button" class="close"  data-dismiss="modal" aria-label="Close" @click="changeRemark">
+                                <span aria-hidden="true">&times;</span>
+                            </button>
+                        </div>
+                        <div class="modal-body">
+                            <input type="hidden" class="form-control" id="onTopId">
+                            <textarea type="text" class="form-control"  required id="remark" @change="changeRemark"  ></textarea>
+                            <div class="invalid-feedback">
+                                备注信息不能为空
+                            </div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal" @click="changeRemark" >关闭</button>
+                            <button type="button" class="btn btn-sm btn-primary" @click="submitOnTop">提交</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
             <div class="text-info h5 btn btn">{{$waybills->count()}}/{{$waybills->total()}}</div>
             {{$waybills->appends($filterData)->links()}}
         </div>
     </div>
+
+
+
+
 @endsection
 
 
@@ -353,10 +400,12 @@
     <style type="text/css">
         @keyframes anima
         {
-            0%{opacity:0.1}
-            60%{opacity:0.4}
-            80%{opacity:0.6}
-            100%{opacity:0.75}
+            from {
+                opacity:0.1;
+            }
+            to{
+                opacity:1;
+            }
         }
         @-webkit-keyframes anima
         {
@@ -370,22 +419,21 @@
         .top{
             padding-top: 0px;
             padding-left: 10px;
-            margin-left: 88px;
             margin-top: -4px;
+            margin-left: -5px;
             line-height: 55px;
 
+
             position: absolute;
             animation: anima;
-            animation-duration: 2s;
-            animation-timing-function: linear;
-            animation-delay: 0.5s;
+            animation-duration: 3s;
+            animation-timing-function: cubic-bezier(0,0,1,1);
             animation-direction: alternate;
             animation-play-state: running;
 
             -webkit-animation-name: anima;
-            -webkit-animation-duration: 2s;
-            -webkit-animation-timing-function: linear;
-            -webkit-animation-delay: 0.5s;
+            -webkit-animation-duration: 5s;
+            -webkit-animation-timing-function:  cubic-bezier(0,0,1,1);
             -webkit-animation-iteration-count: infinite;
             -webkit-animation-direction: alternate;
             -webkit-animation-play-state: running;
@@ -468,7 +516,7 @@
                 this.initInputs();
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 $('#list').removeClass('d-none');
-                 let waybill =  $('.table-header-layer-1')[1];
+                let waybill =  $('.table-header-layer-1')[1];
                 $('.top').css('min-width', waybill.scrollWidth);
 
                 this.imgs=Array.from(document.getElementById('list').querySelectorAll('img'));
@@ -846,58 +894,113 @@
                     input.focus();
                 },
                 // 失焦事件
-                udpateWaybillFee:function (e) {
-                    let _this = this;
+                updateWaybillFee:function (e) {
                     let target = $(e.target);
+                    let _this = this;
                     let span = target.prev();
                     let id = target.attr('data_id');
+                    let oldFee = span.text();
                     let fee = target.val();
                     if(fee !== span.text()){
                         let ajaxUrl= '{{url("apiLocal/waybill/changeFee")}}';
+                        let newFee = 0;
                         axios.post(ajaxUrl,{'id':id,'fee':fee}).then(function (response) {
                             if(response.data.success){
+                                newFee = fee;
+                                _this.updateWaybills(id,newFee);
                                 tempTip.setDuration(2000);
                                 tempTip.showSuccess('运单运费修改成功');
-                                span.text(fee);
                             }else{
+                                newFee= oldFee;
                                 tempTip.setDuration(3000);
                                 tempTip.show('运单运费修改失败!'+response.data.fail_info);
+                                _this.updateWaybills(id,newFee);
                             }
                         }).catch(function (err) {
+                            newFee = oldFee;
+                            _this.updateWaybills(id,newFee);
                             tempTip.setDuration(3000);
-                            tempTip.show('运单运费修改失败!'+response.data.fail_info);
+                            tempTip.show('运单运费修改失败!网络异常：'+err);
                         });
                     }
                     span.show();
                     target.hide();
                 },
+                // 为直发车运单添加运费
+                addWaybillFee(e){
+                    let target = $(e.target);
+                    target.css('width','85px');
+                    let _this = this;
+                    let id = target.attr('data_id');
+                    let fee = target.val();
+                    let ajaxUrl= '{{url("apiLocal/waybill/changeFee")}}';
+                    let newFee = 0;
+                    if(fee === ''|| fee === null){
+                        target.css('width','75px');
+                        return;
+                    }else{
+                        axios.post(ajaxUrl,{'id':id,'fee':fee}).then(function (response) {
+                            if(response.data.success){
+                                newFee = fee;
+                                tempTip.setDuration(2000);
+                                tempTip.showSuccess('运单运费添加成功');
+                                _this.updateWaybills(id,newFee);
+                            }else{
+                                tempTip.setDuration(3000);
+                                tempTip.show('运单运费添加失败!'+response.data.fail_info);
+                            }
+                        }).catch(function (err) {
+                            tempTip.setDuration(3000);
+                            tempTip.show('运单运费添加失败！网络异常：'+response.data.fail_info);
+                        });
+                        target.css('width','75px');
+                    }
+                },
+                // 更新表格数据
+                updateWaybills(id,newFee){
+                    this.waybills.some(function(waybill){
+                        if(waybill.id === id){
+                            waybill.fee = newFee;
+                            return true;
+                        }
+                    })
+                },
                 // 置顶操作
                 waybillOnTop:function(e){
                     let target = $(e.target);
                     let id = target.attr('data_id');
+                    $("#onTopId").val(id);
+                    $('#exampleModal').modal('show');
+                },
+                submitOnTop:function(){
                     let ajaxUrl = '{{url('waybill/ontop/top')}}';
-                    alert(ajaxUrl);
-                    let detail = '';
-                    tempTip.inputVal('输入置顶备注',function (detail) {
-                        if(id !== null && detail!=null){
-                            axios.post(ajaxUrl,{'id':id,'detail':detail}).then(function (response) {
-                                if(response.data.success){
-                                    tempTip.setDuration(3000);
-                                    tempTip.showSuccess('置顶成功');
-                                    setTimeout(function(){
+                    let remark =  $("#remark").val();
+                    let id = $("#onTopId").val();
+                    if(remark === ''){
+                        $("#remark").focus();
+                        $('#remark').addClass('is-invalid');
+                    }else{
+                        axios.post(ajaxUrl,{'id':id,'detail':remark}).then(function (response) {
+                            if(response.data.success){
+                                tempTip.setDuration(3000);
+                                tempTip.showSuccess('置顶成功');
+                                $('#exampleModal').modal('hide');
+                                setTimeout(function(){
                                         window.location.reload();
-                                        }
+                                    }
                                     ,1000);
-                                }else{
-                                    tempTip.setDuration(3000);
-                                    tempTip.show('置顶失败!'+response.fail_info);
-                                }
-                            }).catch(function (err) {
-                                tempTip.setDuration(30000);
-                                tempTip.show('置顶失败,网络连接错误!'+err);
-                            });
-                        }
-                    });
+                            }else{
+                                tempTip.setDuration(3000);
+                                tempTip.show('置顶失败!'+response.fail_info);
+                            }
+                        }).catch(function (err) {
+                            tempTip.setDuration(3000);
+                            tempTip.show('置顶失败,网络连接错误!'+err);
+                        });
+                    }
+                },
+                changeRemark:function(){
+                  $('#remark').removeClass('is-invalid');
                 },
                 cancelOnTop:function (e) {
                     let target = $(e.target);
@@ -942,7 +1045,17 @@
                     if(!value)return '';
                     return value + ' km';
                 },
+                money:function(value){
+                    if(value.indexOf('.')>0){
+                        return value
+                    }
+                    return value += '.00';
+                }
             }
         });
+        // modal 隐藏时修改 inpu 为空
+        $("#exampleModal").on('hide.bs.modal',function(e){
+            $('#remark').val('');
+        });
     </script>
 @endsection