From 3425c29ccd6484a63d2f8223fe42725929104613 Mon Sep 17 00:00:00 2001 From: GoEdgeLab Date: Tue, 26 Oct 2021 20:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 4 ++- go.sum | 12 ++++++-- web/views/@default/finance/bills/@menu.html | 4 --- .../@default/finance/bills/generate.html | 8 ----- web/views/@default/finance/bills/generate.js | 16 ---------- web/views/@default/finance/bills/index.html | 30 ------------------- 6 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 web/views/@default/finance/bills/@menu.html delete mode 100644 web/views/@default/finance/bills/generate.html delete mode 100644 web/views/@default/finance/bills/generate.js delete mode 100644 web/views/@default/finance/bills/index.html diff --git a/go.mod b/go.mod index dc8d1cc5..5b008ae4 100644 --- a/go.mod +++ b/go.mod @@ -10,9 +10,11 @@ require ( github.com/go-sql-driver/mysql v1.5.0 github.com/go-yaml/yaml v2.1.0+incompatible github.com/google/go-cmp v0.5.6 // indirect - github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa + github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 + github.com/json-iterator/go v1.1.12 // indirect github.com/miekg/dns v1.1.35 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/tealeg/xlsx/v3 v3.2.3 github.com/xlzd/gotp v0.0.0-20181030022105-c8557ba2c119 diff --git a/go.sum b/go.sum index de755d1b..0463e006 100644 --- a/go.sum +++ b/go.sum @@ -62,12 +62,16 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/iwind/TeaGo v0.0.0-20210628135026-38575a4ab060/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= -github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa h1:woN88uEmRRUNFD7pRZEtX9heDcjFn0ClMxjF5ButKow= -github.com/iwind/TeaGo v0.0.0-20210720011303-fc255c995afa/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20210831140440-a2a442471b13 h1:HuEJ5xJfujW1Q6rNDhOu5LQXEBB2qLPah3jYslT8Gz4= +github.com/iwind/TeaGo v0.0.0-20210831140440-a2a442471b13/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= +github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24 h1:1cGulkD2SNJJRok5OKwyhP/Ddm+PgSWKOupn0cR36/A= +github.com/iwind/TeaGo v0.0.0-20211026123858-7de7a21cad24/go.mod h1:KU4mS7QNiZ7QWEuDBk1zw0/Q2LrAPZv3tycEFBsuUwc= github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3 h1:aBSonas7vFcgTj9u96/bWGILGv1ZbUSTLiOzcI1ZT6c= github.com/iwind/gosock v0.0.0-20210722083328-12b2d66abec3/go.mod h1:H5Q7SXwbx3a97ecJkaS2sD77gspzE7HFUafBO0peEyA= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -77,8 +81,12 @@ github.com/miekg/dns v1.1.35 h1:oTfOaDH+mZkdcgdIjH6yBajRGtIwcwcaR+rt23ZSrJs= github.com/miekg/dns v1.1.35/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= diff --git a/web/views/@default/finance/bills/@menu.html b/web/views/@default/finance/bills/@menu.html deleted file mode 100644 index 3496ecd7..00000000 --- a/web/views/@default/finance/bills/@menu.html +++ /dev/null @@ -1,4 +0,0 @@ - - 账单 - 生成账单 - \ No newline at end of file diff --git a/web/views/@default/finance/bills/generate.html b/web/views/@default/finance/bills/generate.html deleted file mode 100644 index 8d5798b7..00000000 --- a/web/views/@default/finance/bills/generate.html +++ /dev/null @@ -1,8 +0,0 @@ -{$layout} -{$template "menu"} - -
-
- -

多次点击不会重复生成同样的账单。

-
diff --git a/web/views/@default/finance/bills/generate.js b/web/views/@default/finance/bills/generate.js deleted file mode 100644 index 2838ed71..00000000 --- a/web/views/@default/finance/bills/generate.js +++ /dev/null @@ -1,16 +0,0 @@ -Tea.context(function () { - this.generateBills = function () { - let that = this - teaweb.confirm("确定要生成上个月的账单吗？", function () { - that.$post(".generate") - .params({ - month: that.month - }) - .success(function () { - teaweb.success("生成成功", function () { - window.location = "/finance/bills" - }) - }) - }) - } -}) \ No newline at end of file diff --git a/web/views/@default/finance/bills/index.html b/web/views/@default/finance/bills/index.html deleted file mode 100644 index 1b998d76..00000000 --- a/web/views/@default/finance/bills/index.html +++ /dev/null @@ -1,30 +0,0 @@ -{$layout} -{$template "menu"} - -

暂时还没有账单。

- - - - - - - - - - - - - - - - - - - - -
用户月份项目金额描述已支付
{{bill.user.fullname}}{{bill.month}}{{bill.typeName}}¥{{bill.amount}}元{{bill.description}} - Y - N -
- -
\ No newline at end of file