xiaoyu пре 3 година
родитељ
комит
e6b96a5e40

+ 4 - 4
admin/templates/default/merchant.ctl.php

@@ -224,7 +224,7 @@
                     <td colspan="2" class="required"><label class="validation">充值时间和次数设置:</label>
                         <div style="margin-left:149px;">
                             <label style="display: inline-block;">白天秒数</label>
-                            <label style="display: inline-block; margin: 0 145px 0 148px;">黑天秒数</label>
+                            <label style="display: inline-block; margin: 0 145px 0 148px;">夜晚秒数</label>
                             <label style="display: inline-block;">重试次数</label>
                         </div>
                     </td>
@@ -415,7 +415,7 @@
         let times
         $("#submitBtn").click(function() {
             if (day == 0 || nights == 0 || times == 0) {
-                layer.msg('白天秒数,黑天秒数,重试次数(三者都需设置)');
+                layer.msg('白天秒数,夜晚秒数,重试次数(三者都需设置)');
             } else {
                 $("#user_form").submit();
             }
@@ -452,7 +452,7 @@
                     $(item).val(zero);
                 }
                 if ((!/^\d+$/.test(night_secs)) || isNaN(night_secs)) {
-                    layer.msg('黑天秒数只能设置大于0的整数');
+                    layer.msg('夜晚秒数只能设置大于0的整数');
                     $(item).val("0");
                 }
             })
@@ -517,7 +517,7 @@
                 nights = night_secs
                 times = times_secs
                 if (day_secs == 0 || night_secs == 0 || times_secs == 0) {
-                    layer.msg('白天秒数,黑天秒数,重试次数(三者都需设置 只能设置大于0的整数)');
+                    layer.msg('白天秒数,夜晚秒数,重试次数(三者都需设置 只能设置大于0的整数)');
                 }
             })
         })

+ 11 - 40
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e442471d898d555cab75123cc5bc6f4a",
+    "content-hash": "a6765a2349fdc7efd79357ad3fd76bc3",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",
@@ -112,12 +112,6 @@
                 "stream",
                 "zip"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/zipstream",
-                    "type": "open_collective"
-                }
-            ],
             "time": "2020-05-30T13:11:16+00:00"
         },
         {
@@ -263,30 +257,20 @@
             "keywords": [
                 "enum"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/mnapoli",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-07-05T08:18:36+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.22.0",
+            "version": "1.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48"
+                "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a9e29b4f386a08a151a33578e80ef1747037a48",
-                "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e",
+                "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e",
                 "shasum": ""
             },
             "require": {
@@ -310,7 +294,7 @@
                 "php": "^7.3 || ^8.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
-                "psr/simple-cache": "^1.0"
+                "psr/simple-cache": "^1.0 || ^2.0"
             },
             "require-dev": {
                 "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
@@ -373,7 +357,7 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2022-02-18T12:57:07+00:00"
+            "time": "2022-04-24T13:53:10+00:00"
         },
         {
             "name": "psr/http-client",
@@ -638,20 +622,6 @@
                 "portable",
                 "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2021-11-30T18:21:41+00:00"
         }
     ],
@@ -661,7 +631,8 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform": {
+        "ext-json": "*"
+    },
+    "platform-dev": []
 }

+ 0 - 3
vendor/composer/autoload_real.php

@@ -13,9 +13,6 @@ class ComposerAutoloaderInit998192ad309e6e472f9c99c8ddf8011d
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {

+ 7 - 37
vendor/composer/installed.json

@@ -109,12 +109,6 @@
         "keywords": [
             "stream",
             "zip"
-        ],
-        "funding": [
-            {
-                "url": "https://opencollective.com/zipstream",
-                "type": "open_collective"
-            }
         ]
     },
     {
@@ -266,31 +260,21 @@
         "homepage": "http://github.com/myclabs/php-enum",
         "keywords": [
             "enum"
-        ],
-        "funding": [
-            {
-                "url": "https://github.com/mnapoli",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum",
-                "type": "tidelift"
-            }
         ]
     },
     {
         "name": "phpoffice/phpspreadsheet",
-        "version": "1.22.0",
-        "version_normalized": "1.22.0.0",
+        "version": "1.23.0",
+        "version_normalized": "1.23.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-            "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48"
+            "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/3a9e29b4f386a08a151a33578e80ef1747037a48",
-            "reference": "3a9e29b4f386a08a151a33578e80ef1747037a48",
+            "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/21e4cf62699eebf007db28775f7d1554e612ed9e",
+            "reference": "21e4cf62699eebf007db28775f7d1554e612ed9e",
             "shasum": ""
         },
         "require": {
@@ -314,7 +298,7 @@
             "php": "^7.3 || ^8.0",
             "psr/http-client": "^1.0",
             "psr/http-factory": "^1.0",
-            "psr/simple-cache": "^1.0"
+            "psr/simple-cache": "^1.0 || ^2.0"
         },
         "require-dev": {
             "dealerdirect/phpcodesniffer-composer-installer": "dev-master",
@@ -335,7 +319,7 @@
             "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
             "tecnickcom/tcpdf": "Option for rendering PDF with PDF Writer (doesn't yet support PHP8)"
         },
-        "time": "2022-02-18T12:57:07+00:00",
+        "time": "2022-04-24T13:53:10+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -653,20 +637,6 @@
             "polyfill",
             "portable",
             "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
         ]
     }
 ]