diff --git a/.gitignore b/.gitignore index 078975ce17..bf4ad2ea74 100644 --- a/.gitignore +++ b/.gitignore @@ -28,11 +28,11 @@ public/clients/*.* storage/framework/smarty/cache/* storage/framework/smarty/compile/* -storage/framework/views/* +storage/framework/twig/* storage/*.* !storage/framework/smarty/cache/.gitkeep !storage/framework/smarty/compile/.gitkeep -!storage/framework/views/.gitkeep +!storage/framework/twig/.gitkeep .user.ini public/.user.ini diff --git a/composer.lock b/composer.lock index 6d13297b52..ae77ce6e7f 100644 --- a/composer.lock +++ b/composer.lock @@ -123,16 +123,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.283.2", + "version": "3.283.8", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "6616677d76e39af28138512740199d38a461859f" + "reference": "0f73ec85852312a6e971cfe2eebfd7c8091cca34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6616677d76e39af28138512740199d38a461859f", - "reference": "6616677d76e39af28138512740199d38a461859f", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0f73ec85852312a6e971cfe2eebfd7c8091cca34", + "reference": "0f73ec85852312a6e971cfe2eebfd7c8091cca34", "shasum": "" }, "require": { @@ -212,9 +212,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.283.2" + "source": "https://github.com/aws/aws-sdk-php/tree/3.283.8" }, - "time": "2023-10-06T18:09:54+00:00" + "time": "2023-10-19T19:26:52+00:00" }, { "name": "bacon/bacon-qr-code", @@ -4840,16 +4840,16 @@ }, { "name": "stripe/stripe-php", - "version": "v12.7.0", + "version": "v12.8.0", "source": { "type": "git", "url": "https://github.com/stripe/stripe-php.git", - "reference": "01a4a316d7c724fd1a111f36f037b698ca425f2c" + "reference": "6b6f4a775ad46fee4b1df2df4fdfa574365b1621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/stripe/stripe-php/zipball/01a4a316d7c724fd1a111f36f037b698ca425f2c", - "reference": "01a4a316d7c724fd1a111f36f037b698ca425f2c", + "url": "https://api.github.com/repos/stripe/stripe-php/zipball/6b6f4a775ad46fee4b1df2df4fdfa574365b1621", + "reference": "6b6f4a775ad46fee4b1df2df4fdfa574365b1621", "shasum": "" }, "require": { @@ -4893,9 +4893,9 @@ ], "support": { "issues": "https://github.com/stripe/stripe-php/issues", - "source": "https://github.com/stripe/stripe-php/tree/v12.7.0" + "source": "https://github.com/stripe/stripe-php/tree/v12.8.0" }, - "time": "2023-10-11T17:29:55+00:00" + "time": "2023-10-16T18:04:12+00:00" }, { "name": "symfony/deprecation-contracts", @@ -7050,16 +7050,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.34.1", + "version": "v3.35.1", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3" + "reference": "ec1ccc264994b6764882669973ca435cf05bab08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", - "reference": "98bf1b1068b4ceddbbc2a2b70b67a5e380add9e3", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/ec1ccc264994b6764882669973ca435cf05bab08", + "reference": "ec1ccc264994b6764882669973ca435cf05bab08", "shasum": "" }, "require": { @@ -7092,8 +7092,6 @@ "phpspec/prophecy": "^1.16", "phpspec/prophecy-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "phpunitgoodpractices/polyfill": "^1.6", - "phpunitgoodpractices/traits": "^1.9.2", "symfony/phpunit-bridge": "^6.2.3", "symfony/yaml": "^5.4 || ^6.0" }, @@ -7133,7 +7131,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.34.1" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.35.1" }, "funding": [ { @@ -7141,7 +7139,7 @@ "type": "github" } ], - "time": "2023-10-03T23:51:05+00:00" + "time": "2023-10-12T13:47:26+00:00" }, { "name": "justinrainbow/json-schema", @@ -7412,16 +7410,16 @@ }, { "name": "nunomaduro/phpinsights", - "version": "v2.8.0", + "version": "v2.9.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/phpinsights.git", - "reference": "a701b7acfda9940ef0140c7276319df9026824c4" + "reference": "52d69d895239b1e9a90d7212dffc6c7e73ec822e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/a701b7acfda9940ef0140c7276319df9026824c4", - "reference": "a701b7acfda9940ef0140c7276319df9026824c4", + "url": "https://api.github.com/repos/nunomaduro/phpinsights/zipball/52d69d895239b1e9a90d7212dffc6c7e73ec822e", + "reference": "52d69d895239b1e9a90d7212dffc6c7e73ec822e", "shasum": "" }, "require": { @@ -7439,8 +7437,8 @@ "psr/container": "^1.0|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "sebastian/diff": "^4.0|^5.0", - "slevomat/coding-standard": "^7.0.8|^8.0", - "squizlabs/php_codesniffer": "^3.5", + "slevomat/coding-standard": "^8.13", + "squizlabs/php_codesniffer": "^3.7", "symfony/cache": "^4.4|^5.0|^6.0", "symfony/console": "^4.2.12|^5.0|^6.0", "symfony/finder": "^4.2.12|^5.0|^6.0", @@ -7498,7 +7496,7 @@ ], "support": { "issues": "https://github.com/nunomaduro/phpinsights/issues", - "source": "https://github.com/nunomaduro/phpinsights/tree/v2.8.0" + "source": "https://github.com/nunomaduro/phpinsights/tree/v2.9.0" }, "funding": [ { @@ -7514,7 +7512,7 @@ "type": "github" } ], - "time": "2023-03-18T18:38:03+00:00" + "time": "2023-10-20T15:58:50+00:00" }, { "name": "phar-io/manifest", diff --git a/resources/email/finance.tpl b/resources/email/finance.tpl index 9d379f90a7..3f62fcd6ca 100644 --- a/resources/email/finance.tpl +++ b/resources/email/finance.tpl @@ -1,30 +1,35 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- {$title} -

-
+
+
+
+
+
+
+
+

+ {$title} +

-
-
-
-
-

- {$text} -

-
+
+
+
+
+
+

+ {$text} +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/footer.tpl b/resources/email/footer.tpl index 239bfb5aa7..aa7c89e6ed 100644 --- a/resources/email/footer.tpl +++ b/resources/email/footer.tpl @@ -1,11 +1,16 @@ -
+
-
+

- {$config['appName']} | - 修改邮件接收设置 + {$config['appName']} | + 修改邮件接收设置

diff --git a/resources/email/header.tpl b/resources/email/header.tpl index 412f44aa36..2e64ec32be 100644 --- a/resources/email/header.tpl +++ b/resources/email/header.tpl @@ -8,38 +8,38 @@ diff --git a/resources/email/new_user.tpl b/resources/email/new_user.tpl index 59c813eb91..ad57a95a1f 100644 --- a/resources/email/new_user.tpl +++ b/resources/email/new_user.tpl @@ -1,30 +1,35 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 账户已经生成 -

-
+
+
+
+
+
+
+
+

+ 账户已经生成 +

-
-
-
-
-

- {$text} -

-
+
+
+
+
+
+

+ {$text} +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/password_reset.tpl b/resources/email/password_reset.tpl index eee3e7214f..682d77ece2 100644 --- a/resources/email/password_reset.tpl +++ b/resources/email/password_reset.tpl @@ -1,32 +1,37 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 密码重置 -

-
+
+
+
+
+
+
+
+

+ 密码重置 +

-
-
-
-
-

- 你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。 -

- 点击此链接重置密码 -

-
+
+
+
+
+
+

+ 你收到此邮件是因为你在 {$config['appName']} 系统申请了密码重置，如果非本人申请，请忽略此邮件。 +

+ 点击此链接重置密码 +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/test.tpl b/resources/email/test.tpl index 8c99248821..41fa8df226 100644 --- a/resources/email/test.tpl +++ b/resources/email/test.tpl @@ -1,30 +1,35 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 邮件发送测试 -

-
+
+
+
+
+
+
+
+

+ 邮件发送测试 +

-
-
-
-
-

- 这是一封测试邮件。如果你能收到，说明邮件发送配置有效，可以正常工作。 -

-
+
+
+
+
+
+

+ 这是一封测试邮件。如果你能收到，说明邮件发送配置有效，可以正常工作。 +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/traffic_report.tpl b/resources/email/traffic_report.tpl index 1833adf5b0..2e3b9e201e 100644 --- a/resources/email/traffic_report.tpl +++ b/resources/email/traffic_report.tpl @@ -1,44 +1,49 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 每日流量报告 -

-
+
+
+
+
+
+
+
+

+ 每日流量报告 +

-
-
-
-
-

- 用户名: {$user->user_name} -
- Email: {$user->email} -

- 总流量: {$enable_traffic} -
- 已用流量: {$used_traffic} -
- 剩余流量: {$unused_traffic} -
- 今日使用流量: {$lastday_traffic} -

-

-

- {$text} -

-
+
+
+
+
+
+

+ 用户名: {$user->user_name} +
+ Email: {$user->email} +

+ 总流量: {$enable_traffic} +
+ 已用流量: {$used_traffic} +
+ 剩余流量: {$unused_traffic} +
+ 今日使用流量: {$lastday_traffic} +

+

+

+ {$text} +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/verify_code.tpl b/resources/email/verify_code.tpl index 02abffd70a..beea4560d8 100644 --- a/resources/email/verify_code.tpl +++ b/resources/email/verify_code.tpl @@ -1,32 +1,37 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 邮箱验证 -

-
+
+
+
+
+
+
+
+

+ 邮箱验证 +

-
-
-
-
-

- 你请求的邮箱验证代码为: {$code}
- 本验证代码在 {$expire} 前有效。
- 如果此验证码非你本人所请求，请直接忽视。
-

-
+
+
+
+
+
+

+ 你请求的邮箱验证代码为: {$code}
+ 本验证代码在 {$expire} 前有效。
+ 如果此验证码非你本人所请求，请直接忽视。
+

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/email/warn.tpl b/resources/email/warn.tpl index f97f7d95ad..8464c42662 100644 --- a/resources/email/warn.tpl +++ b/resources/email/warn.tpl @@ -1,30 +1,35 @@ {include file='header.tpl'} -
-
-
-
-
-
-
-

- 系统提示 -

-
+
+
+
+
+
+
+
+

+ 系统提示 +

-
-
-
-
-

- {$text} -

-
+
+
+
+
+
+

+ {$text} +

+
-{include file='footer.tpl'} + {include file='footer.tpl'} diff --git a/resources/views/tabler/admin/announcement/create.tpl b/resources/views/tabler/admin/announcement/create.tpl index 7dc4b2f5ef..0832c65506 100644 --- a/resources/views/tabler/admin/announcement/create.tpl +++ b/resources/views/tabler/admin/announcement/create.tpl @@ -1,6 +1,6 @@ {include file='admin/header.tpl'} - +
@@ -48,7 +48,7 @@ @@ -68,13 +68,13 @@ menubar: false, statusbar: false, plugins: - 'advlist autolink lists link image charmap preview anchor ' + - 'searchreplace visualblocks code fullscreen ' + - 'insertdatetime media table wordcount', + 'advlist autolink lists link image charmap preview anchor ' + + 'searchreplace visualblocks code fullscreen ' + + 'insertdatetime media table wordcount', toolbar: 'undo redo | formatselect | ' + - 'bold italic backcolor link | blocks | alignleft aligncenter ' + - 'alignright alignjustify | bullist numlist outdent indent | ' + - 'removeformat', + 'bold italic backcolor link | blocks | alignleft aligncenter ' + + 'alignright alignjustify | bullist numlist outdent indent | ' + + 'removeformat', content_style: 'body { font-family: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif;font-size: 14px; -webkit-font-smoothing: antialiased; }', {if $user->is_dark_mode} skin: 'oxide-dark', @@ -84,7 +84,7 @@ tinyMCE.init(options); }) - $("#create-ann").click(function() { + $("#create-ann").click(function () { $.ajax({ url: '/admin/announcement', type: 'POST', @@ -96,7 +96,7 @@ email_notify: $("#email_notify").is(":checked"), content: tinyMCE.activeEditor.getContent(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); diff --git a/resources/views/tabler/admin/announcement/edit.tpl b/resources/views/tabler/admin/announcement/edit.tpl index fcbfcf4b93..76b24c4648 100644 --- a/resources/views/tabler/admin/announcement/edit.tpl +++ b/resources/views/tabler/admin/announcement/edit.tpl @@ -1,6 +1,6 @@ {include file='admin/header.tpl'} - +
@@ -47,13 +47,13 @@ menubar: false, statusbar: false, plugins: - 'advlist autolink lists link image charmap preview anchor ' + - 'searchreplace visualblocks code fullscreen ' + - 'insertdatetime media table wordcount', + 'advlist autolink lists link image charmap preview anchor ' + + 'searchreplace visualblocks code fullscreen ' + + 'insertdatetime media table wordcount', toolbar: 'undo redo | formatselect | ' + - 'bold italic backcolor link | blocks | alignleft aligncenter ' + - 'alignright alignjustify | bullist numlist outdent indent | ' + - 'removeformat', + 'bold italic backcolor link | blocks | alignleft aligncenter ' + + 'alignright alignjustify | bullist numlist outdent indent | ' + + 'removeformat', content_style: 'body { font-family: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif; font-size: 14px; -webkit-font-smoothing: antialiased; }', {if $user->is_dark_mode} skin: 'oxide-dark', @@ -63,7 +63,7 @@ tinyMCE.init(options); }) - $("#save-ann").click(function() { + $("#save-ann").click(function () { $.ajax({ url: '/admin/announcement/' + {$ann->id}, type: 'PUT', @@ -71,7 +71,7 @@ data: { content: tinyMCE.activeEditor.getContent(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); diff --git a/resources/views/tabler/admin/announcement/index.tpl b/resources/views/tabler/admin/announcement/index.tpl index b855d6c60c..a74fa0ffe3 100644 --- a/resources/views/tabler/admin/announcement/index.tpl +++ b/resources/views/tabler/admin/announcement/index.tpl @@ -31,11 +31,11 @@
- - {foreach $details['field'] as $key => $value} - - {/foreach} - + + {foreach $details['field'] as $key => $value} + + {/foreach} +
{$value}
{$value}
@@ -52,7 +52,7 @@ type: 'POST', dataSrc: 'anns' }, - "autoWidth":false, + "autoWidth": false, 'iDisplayLength': 10, 'scrollX': true, 'order': [ @@ -60,11 +60,16 @@ ], columns: [ {foreach $details['field'] as $key => $value} - { data: '{$key}' }, + { + data: '{$key}' + }, {/foreach} ], - "columnDefs":[ - { targets:[0],orderable:false } + "columnDefs": [ + { + targets: [0], + orderable: false + } ], "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + "<'row'<'col-sm-12'tr>>" + @@ -102,12 +107,12 @@ function deleteAnn(ann_id) { $('#notice-message').text('确定删除此公告？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/announcement/" + ann_id, type: 'DELETE', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -128,4 +133,4 @@ loadTable(); -{include file='admin/footer.tpl'} + {include file='admin/footer.tpl'} diff --git a/resources/views/tabler/admin/coupon.tpl b/resources/views/tabler/admin/coupon.tpl index 1a9fd1874e..a87249007e 100644 --- a/resources/views/tabler/admin/coupon.tpl +++ b/resources/views/tabler/admin/coupon.tpl @@ -21,7 +21,7 @@
+ data-bs-target="#create-dialog"> 创建 @@ -38,11 +38,11 @@
- - {foreach $details['field'] as $key => $value} - - {/foreach} - + + {foreach $details['field'] as $key => $value} + + {/foreach} +
{$value}
{$value}
@@ -66,7 +66,7 @@
+ placeholder="{$detail['placeholder']}">
{/if} @@ -74,7 +74,7 @@
+ placeholder="{$detail['placeholder']}">
{/if} {if $detail['type'] === 'select'} @@ -94,14 +94,15 @@
+ placeholder="">
+ type="button" class="btn btn-primary" data-bs-dismiss="modal">创建 +
@@ -122,7 +123,7 @@ type: 'POST', dataSrc: 'coupons' }, - "autoWidth":false, + "autoWidth": false, 'iDisplayLength': 10, 'scrollX': true, 'order': [ @@ -130,11 +131,16 @@ ], columns: [ {foreach $details['field'] as $key => $value} - { data: '{$key}' }, + { + data: '{$key}' + }, {/foreach} ], - "columnDefs":[ - { targets:[0],orderable:false } + "columnDefs": [ + { + targets: [0], + orderable: false + } ], "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + "<'row'<'col-sm-12'tr>>" + @@ -176,11 +182,11 @@ dataType: "json", data: { {foreach $details['create_dialog'] as $detail} - {$detail['id']}: $('#{$detail['id']}').val(), + {$detail['id']}: $('#{$detail['id']}').val(), {/foreach} expire_time: $('#expire_time').val(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -196,12 +202,12 @@ function deleteCoupon(coupon_id) { $('#notice-message').text('确定删除此优惠码？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/coupon/" + coupon_id, type: 'DELETE', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -218,12 +224,12 @@ function disableCoupon(coupon_id) { $('#notice-message').text('确定禁用此优惠码？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/coupon/" + coupon_id + "/disable", type: 'POST', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-dialog').text(data.msg); $('#success-noreload-message').modal('show'); @@ -244,4 +250,4 @@ loadTable(); -{include file='admin/footer.tpl'} + {include file='admin/footer.tpl'} diff --git a/resources/views/tabler/admin/detect.tpl b/resources/views/tabler/admin/detect.tpl index 20cf69b5d6..65874aa35c 100644 --- a/resources/views/tabler/admin/detect.tpl +++ b/resources/views/tabler/admin/detect.tpl @@ -15,7 +15,7 @@
@@ -32,11 +32,11 @@
- - {foreach $details['field'] as $key => $value} - - {/foreach} - + + {foreach $details['field'] as $key => $value} + + {/foreach} +
{$value}
{$value}
@@ -60,7 +60,7 @@
+ placeholder="{$from['placeholder']}">
{/if} @@ -68,7 +68,7 @@
+ placeholder="{$from['placeholder']}">
{/if} {if $from['type'] === 'select'} @@ -87,7 +87,8 @@
- +
@@ -100,7 +101,7 @@ type: 'POST', dataSrc: 'rules' }, - "autoWidth":false, + "autoWidth": false, 'iDisplayLength': 10, 'scrollX': true, 'order': [ @@ -108,11 +109,16 @@ ], columns: [ {foreach $details['field'] as $key => $value} - { data: '{$key}' }, + { + data: '{$key}' + }, {/foreach} ], - "columnDefs":[ - { targets:[0],orderable:false }, + "columnDefs": [ + { + targets: [0], + orderable: false + }, ], "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + "<'row'<'col-sm-12'tr>>" + @@ -143,17 +149,17 @@ } }); - $("#add-detect-button").click(function() { + $("#add-detect-button").click(function () { $.ajax({ type: "POST", url: "/admin/detect/add", dataType: "json", data: { {foreach $details['add_dialog'] as $from} - {$from['id']}: $('#{$from['id']}').val(), + {$from['id']}: $('#{$from['id']}').val(), {/foreach} }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); @@ -169,12 +175,12 @@ function deleteRule(rule_id) { $('#notice-message').text('确定删除此审计规则？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/detect/" + rule_id, type: 'DELETE', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -199,4 +205,4 @@ loadTable(); -{include file='admin/footer.tpl'} + {include file='admin/footer.tpl'} diff --git a/resources/views/tabler/admin/docs/create.tpl b/resources/views/tabler/admin/docs/create.tpl index f3028afa22..e59fee0cc2 100644 --- a/resources/views/tabler/admin/docs/create.tpl +++ b/resources/views/tabler/admin/docs/create.tpl @@ -1,6 +1,6 @@ {include file='admin/header.tpl'} - +
@@ -17,7 +17,7 @@
@@ -78,13 +78,13 @@ menubar: false, statusbar: false, plugins: - 'advlist autolink lists link image charmap preview anchor ' + - 'searchreplace visualblocks code fullscreen ' + - 'insertdatetime media table wordcount', + 'advlist autolink lists link image charmap preview anchor ' + + 'searchreplace visualblocks code fullscreen ' + + 'insertdatetime media table wordcount', toolbar: 'undo redo | formatselect | ' + - 'bold italic backcolor link | blocks | alignleft aligncenter ' + - 'alignright alignjustify | bullist numlist outdent indent | ' + - 'image removeformat', + 'bold italic backcolor link | blocks | alignleft aligncenter ' + + 'alignright alignjustify | bullist numlist outdent indent | ' + + 'image removeformat', image_title: false, image_description: false, content_style: 'body { font-family: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif;font-size: 14px; -webkit-font-smoothing: antialiased; }', @@ -96,7 +96,7 @@ tinyMCE.init(options); }) - $("#generate").click(function() { + $("#generate").click(function () { $.ajax({ url: "/admin/docs/generate", type: 'POST', @@ -104,7 +104,7 @@ data: { question: $("#question").val(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -117,7 +117,7 @@ }) }); - $("#create-doc").click(function() { + $("#create-doc").click(function () { $.ajax({ url: '/admin/docs', type: 'POST', @@ -126,7 +126,7 @@ title: $("#title").val(), content: tinyMCE.get('tinymce').getContent(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); diff --git a/resources/views/tabler/admin/docs/edit.tpl b/resources/views/tabler/admin/docs/edit.tpl index 1599456ba6..89e113cab3 100644 --- a/resources/views/tabler/admin/docs/edit.tpl +++ b/resources/views/tabler/admin/docs/edit.tpl @@ -1,6 +1,6 @@ {include file='admin/header.tpl'} - +
@@ -53,13 +53,13 @@ menubar: false, statusbar: false, plugins: - 'advlist autolink lists link image charmap preview anchor ' + - 'searchreplace visualblocks code fullscreen ' + - 'insertdatetime media table wordcount', + 'advlist autolink lists link image charmap preview anchor ' + + 'searchreplace visualblocks code fullscreen ' + + 'insertdatetime media table wordcount', toolbar: 'undo redo | formatselect | ' + - 'bold italic backcolor link | blocks | alignleft aligncenter ' + - 'alignright alignjustify | bullist numlist outdent indent | ' + - 'image removeformat', + 'bold italic backcolor link | blocks | alignleft aligncenter ' + + 'alignright alignjustify | bullist numlist outdent indent | ' + + 'image removeformat', image_title: false, image_description: false, content_style: 'body { font-family: -apple-system, BlinkMacSystemFont, San Francisco, Segoe UI, Roboto, Helvetica Neue, sans-serif; font-size: 14px; -webkit-font-smoothing: antialiased; }', @@ -71,7 +71,7 @@ tinyMCE.init(options); }) - $("#save-doc").click(function() { + $("#save-doc").click(function () { $.ajax({ url: '/admin/docs/' + {$doc->id}, type: 'PUT', @@ -80,7 +80,7 @@ title: $("#title").val(), content: tinyMCE.activeEditor.getContent(), }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); diff --git a/resources/views/tabler/admin/docs/index.tpl b/resources/views/tabler/admin/docs/index.tpl index ef9735d68a..4ebcaf516d 100644 --- a/resources/views/tabler/admin/docs/index.tpl +++ b/resources/views/tabler/admin/docs/index.tpl @@ -31,11 +31,11 @@
- - {foreach $details['field'] as $key => $value} - - {/foreach} - + + {foreach $details['field'] as $key => $value} + + {/foreach} +
{$value}
{$value}
@@ -52,7 +52,7 @@ type: 'POST', dataSrc: 'docs' }, - "autoWidth":false, + "autoWidth": false, 'iDisplayLength': 10, 'scrollX': true, 'order': [ @@ -60,11 +60,16 @@ ], columns: [ {foreach $details['field'] as $key => $value} - { data: '{$key}' }, + { + data: '{$key}' + }, {/foreach} ], - "columnDefs":[ - { targets:[0],orderable:false } + "columnDefs": [ + { + targets: [0], + orderable: false + } ], "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + "<'row'<'col-sm-12'tr>>" + @@ -102,12 +107,12 @@ function deleteDoc(doc_id) { $('#notice-message').text('确定删除此文档？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/docs/" + doc_id, type: 'DELETE', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -128,4 +133,4 @@ loadTable(); -{include file='admin/footer.tpl'} + {include file='admin/footer.tpl'} diff --git a/resources/views/tabler/admin/footer.tpl b/resources/views/tabler/admin/footer.tpl index 7484d1c702..27ada50bbd 100644 --- a/resources/views/tabler/admin/footer.tpl +++ b/resources/views/tabler/admin/footer.tpl @@ -112,12 +112,12 @@
@@ -139,4 +139,4 @@ - \ No newline at end of file + diff --git a/resources/views/tabler/admin/giftcard.tpl b/resources/views/tabler/admin/giftcard.tpl index e92e80486f..23edb35618 100644 --- a/resources/views/tabler/admin/giftcard.tpl +++ b/resources/views/tabler/admin/giftcard.tpl @@ -17,7 +17,7 @@
+ data-bs-target="#create-dialog"> 创建 @@ -34,11 +34,11 @@
- - {foreach $details['field'] as $key => $value} - - {/foreach} - + + {foreach $details['field'] as $key => $value} + + {/foreach} +
{$value}
{$value}
@@ -62,7 +62,7 @@
+ placeholder="{$detail['placeholder']}">
{/if} @@ -70,7 +70,7 @@
+ placeholder="{$detail['placeholder']}">
{/if} {if $detail['type'] === 'select'} @@ -90,7 +90,8 @@
+ type="button" class="btn btn-primary" data-bs-dismiss="modal">创建 +
@@ -103,7 +104,7 @@ type: 'POST', dataSrc: 'giftcards' }, - "autoWidth":false, + "autoWidth": false, 'iDisplayLength': 10, 'scrollX': true, 'order': [ @@ -111,11 +112,16 @@ ], columns: [ {foreach $details['field'] as $key => $value} - { data: '{$key}' }, + { + data: '{$key}' + }, {/foreach} ], - "columnDefs":[ - { targets:[0],orderable:false } + "columnDefs": [ + { + targets: [0], + orderable: false + } ], "dom": "<'row px-3 py-3'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" + "<'row'<'col-sm-12'tr>>" + @@ -157,10 +163,10 @@ dataType: "json", data: { {foreach $details['create_dialog'] as $detail} - {$detail['id']}: $('#{$detail['id']}').val(), + {$detail['id']}: $('#{$detail['id']}').val(), {/foreach} }, - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-message').text(data.msg); $('#success-dialog').modal('show'); @@ -176,12 +182,12 @@ function deleteGiftCard(giftcard_id) { $('#notice-message').text('确定删除此礼品卡？'); $('#notice-dialog').modal('show'); - $('#notice-confirm').off('click').on('click', function() { + $('#notice-confirm').off('click').on('click', function () { $.ajax({ url: "/admin/giftcard/" + giftcard_id, type: 'DELETE', dataType: "json", - success: function(data) { + success: function (data) { if (data.ret === 1) { $('#success-noreload-message').text(data.msg); $('#success-noreload-dialog').modal('show'); @@ -202,4 +208,4 @@ loadTable(); -{include file='admin/footer.tpl'} + {include file='admin/footer.tpl'} diff --git a/resources/views/tabler/admin/header.tpl b/resources/views/tabler/admin/header.tpl index 989a152edd..05fc86ea58 100644 --- a/resources/views/tabler/admin/header.tpl +++ b/resources/views/tabler/admin/header.tpl @@ -2,21 +2,21 @@ - - - - - + + + + + {$config['appName']} - - - + + + - +