From 44ac2723a071b8704c157e0a1e24844771c67565 Mon Sep 17 00:00:00 2001 From: linlin <15265491519@163.com> Date: Sat, 20 Sep 2025 21:09:27 +0800 Subject: [PATCH] =?UTF-8?q?9.20=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/notice/NoticeStatusConverter.java | 31 +- frontend/App.vue | 46 +- frontend/pages.json | 11 +- frontend/pages/account/form.vue | 20 +- frontend/pages/account/ledger.vue | 22 +- frontend/pages/account/select.vue | 10 +- frontend/pages/customer/detail.vue | 20 +- frontend/pages/customer/form.vue | 14 +- frontend/pages/customer/select.vue | 16 +- frontend/pages/detail/index.vue | 38 +- frontend/pages/index/index.vue | 102 +- frontend/pages/my/about.vue | 16 +- frontend/pages/my/index.vue | 22 +- frontend/pages/order/create.vue | 44 +- frontend/pages/product/form.vue | 14 +- frontend/pages/product/list.vue | 28 +- frontend/pages/product/select.vue | 12 +- frontend/pages/report/index.vue | 28 +- frontend/pages/supplier/form.vue | 14 +- frontend/static/icons/home.png | Bin 0 -> 1709 bytes frontend/uni.scss | 18 +- frontend/unpackage/dist/dev/.nvue/app.css.js | 11 + frontend/unpackage/dist/dev/.nvue/app.js | 2 + .../dist/dev/.sourcemap/mp-weixin/app.js.map | 2 +- .../.sourcemap/mp-weixin/common/assets.js.map | 2 +- .../.sourcemap/mp-weixin/common/config.js.map | 2 +- .../.sourcemap/mp-weixin/common/http.js.map | 2 +- .../.sourcemap/mp-weixin/common/vendor.js.map | 2 +- .../mp-weixin/components/ImageUploader.js.map | 2 +- .../mp-weixin/pages/account/form.js.map | 2 +- .../mp-weixin/pages/account/ledger.js.map | 2 +- .../mp-weixin/pages/account/select.js.map | 2 +- .../mp-weixin/pages/customer/detail.js.map | 2 +- .../mp-weixin/pages/customer/form.js.map | 2 +- .../mp-weixin/pages/customer/select.js.map | 2 +- .../mp-weixin/pages/detail/index.js.map | 2 +- .../mp-weixin/pages/index/index.js.map | 2 +- .../mp-weixin/pages/my/about.js.map | 2 +- .../mp-weixin/pages/my/index.js.map | 2 +- .../mp-weixin/pages/order/create.js.map | 2 +- .../mp-weixin/pages/product/categories.js.map | 2 +- .../mp-weixin/pages/product/form.js.map | 2 +- .../mp-weixin/pages/product/list.js.map | 2 +- .../mp-weixin/pages/product/select.js.map | 2 +- .../mp-weixin/pages/product/settings.js.map | 2 +- .../mp-weixin/pages/product/units.js.map | 2 +- .../mp-weixin/pages/report/index.js.map | 2 +- .../mp-weixin/pages/supplier/form.js.map | 2 +- .../mp-weixin/pages/supplier/select.js.map | 2 +- .../dist/dev/app-plus/__uniappautomator.js | 16 + .../dev/app-plus/__uniappchooselocation.js | 32 + .../dist/dev/app-plus/__uniapperror.png | Bin 0 -> 5842 bytes .../dist/dev/app-plus/__uniappopenlocation.js | 32 + .../dist/dev/app-plus/__uniapppicker.js | 33 + .../dist/dev/app-plus/__uniappquill.js | 8 + .../dev/app-plus/__uniappquillimageresize.js | 1 + .../dist/dev/app-plus/__uniappscan.js | 32 + .../dist/dev/app-plus/__uniappsuccess.png | Bin 0 -> 2021 bytes .../dist/dev/app-plus/__uniappview.html | 24 + .../dist/dev/app-plus/app-config-service.js | 11 + .../unpackage/dist/dev/app-plus/app-config.js | 1 + .../dist/dev/app-plus/app-service.js | 5076 +++++++++++++++++ frontend/unpackage/dist/dev/app-plus/app.css | 4 + .../unpackage/dist/dev/app-plus/manifest.json | 168 + .../dist/dev/app-plus/pages/account/form.css | 23 + .../dev/app-plus/pages/account/ledger.css | 35 + .../dev/app-plus/pages/account/select.css | 13 + .../dev/app-plus/pages/customer/detail.css | 23 + .../dist/dev/app-plus/pages/customer/form.css | 15 + .../dev/app-plus/pages/customer/select.css | 19 + .../dist/dev/app-plus/pages/detail/index.css | 49 + .../dist/dev/app-plus/pages/index/index.css | 185 + .../dist/dev/app-plus/pages/my/about.css | 21 + .../dist/dev/app-plus/pages/my/index.css | 27 + .../dist/dev/app-plus/pages/order/create.css | 59 + .../dev/app-plus/pages/product/categories.css | 15 + .../dist/dev/app-plus/pages/product/form.css | 33 + .../dist/dev/app-plus/pages/product/list.css | 33 + .../dev/app-plus/pages/product/select.css | 15 + .../dev/app-plus/pages/product/settings.css | 5 + .../dist/dev/app-plus/pages/product/units.css | 15 + .../dist/dev/app-plus/pages/report/index.css | 37 + .../dist/dev/app-plus/pages/supplier/form.css | 15 + .../dev/app-plus/pages/supplier/select.css | 15 + .../dist/dev/app-plus/static/icons/detail.png | 0 .../dist/dev/app-plus/static/logo.png | Bin 0 -> 4023 bytes .../dist/dev/app-plus/uni-app-view.umd.js | 7 + .../.app-plus/tsc/app-android/.tsbuildInfo | 1 + .../unpackage/dist/dev/mp-weixin/app.json | 11 +- .../unpackage/dist/dev/mp-weixin/app.wxss | 85 +- .../dist/dev/mp-weixin/common/assets.js | 4 +- .../dist/dev/mp-weixin/common/vendor.js | 4 +- .../dist/dev/mp-weixin/pages/account/form.js | 2 +- .../dev/mp-weixin/pages/account/form.wxml | 2 +- .../dev/mp-weixin/pages/account/form.wxss | 79 +- .../dev/mp-weixin/pages/account/ledger.wxss | 109 +- .../dev/mp-weixin/pages/account/select.wxss | 65 +- .../dev/mp-weixin/pages/customer/detail.wxss | 90 +- .../dev/mp-weixin/pages/customer/form.wxss | 68 +- .../dev/mp-weixin/pages/customer/select.wxss | 80 +- .../dev/mp-weixin/pages/detail/index.wxss | 161 +- .../dist/dev/mp-weixin/pages/index/index.js | 24 +- .../dist/dev/mp-weixin/pages/index/index.wxml | 2 +- .../dist/dev/mp-weixin/pages/index/index.wxss | 374 +- .../dist/dev/mp-weixin/pages/my/about.js | 2 +- .../dist/dev/mp-weixin/pages/my/about.wxss | 77 +- .../dist/dev/mp-weixin/pages/my/index.wxss | 99 +- .../dist/dev/mp-weixin/pages/order/create.js | 2 +- .../dev/mp-weixin/pages/order/create.wxss | 229 +- .../dev/mp-weixin/pages/product/form.wxml | 2 +- .../dev/mp-weixin/pages/product/form.wxss | 76 +- .../dev/mp-weixin/pages/product/list.wxss | 121 +- .../dev/mp-weixin/pages/product/select.wxss | 63 +- .../dev/mp-weixin/pages/report/index.wxss | 128 +- .../dist/dev/mp-weixin/pages/shell/index.json | 4 - .../dist/dev/mp-weixin/pages/shell/index.wxml | 1 - .../dev/mp-weixin/pages/supplier/form.wxss | 68 +- .../dist/dev/mp-weixin/static/icons/home.png | Bin 0 -> 1709 bytes 118 files changed, 8042 insertions(+), 679 deletions(-) create mode 100644 frontend/static/icons/home.png create mode 100644 frontend/unpackage/dist/dev/.nvue/app.css.js create mode 100644 frontend/unpackage/dist/dev/.nvue/app.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappautomator.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappchooselocation.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniapperror.png create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappopenlocation.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniapppicker.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappquill.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappquillimageresize.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappscan.js create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappsuccess.png create mode 100644 frontend/unpackage/dist/dev/app-plus/__uniappview.html create mode 100644 frontend/unpackage/dist/dev/app-plus/app-config-service.js create mode 100644 frontend/unpackage/dist/dev/app-plus/app-config.js create mode 100644 frontend/unpackage/dist/dev/app-plus/app-service.js create mode 100644 frontend/unpackage/dist/dev/app-plus/app.css create mode 100644 frontend/unpackage/dist/dev/app-plus/manifest.json create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/account/form.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/account/ledger.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/account/select.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/customer/detail.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/customer/form.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/customer/select.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/detail/index.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/index/index.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/my/about.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/my/index.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/order/create.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/categories.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/form.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/list.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/select.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/settings.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/product/units.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/report/index.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/supplier/form.css create mode 100644 frontend/unpackage/dist/dev/app-plus/pages/supplier/select.css create mode 100644 frontend/unpackage/dist/dev/app-plus/static/icons/detail.png create mode 100644 frontend/unpackage/dist/dev/app-plus/static/logo.png create mode 100644 frontend/unpackage/dist/dev/app-plus/uni-app-view.umd.js create mode 100644 frontend/unpackage/dist/dev/cache/.app-plus/tsc/app-android/.tsbuildInfo delete mode 100644 frontend/unpackage/dist/dev/mp-weixin/pages/shell/index.json delete mode 100644 frontend/unpackage/dist/dev/mp-weixin/pages/shell/index.wxml create mode 100644 frontend/unpackage/dist/dev/mp-weixin/static/icons/home.png diff --git a/backend/src/main/java/com/example/demo/notice/NoticeStatusConverter.java b/backend/src/main/java/com/example/demo/notice/NoticeStatusConverter.java index cfcdf07..e968d4c 100644 --- a/backend/src/main/java/com/example/demo/notice/NoticeStatusConverter.java +++ b/backend/src/main/java/com/example/demo/notice/NoticeStatusConverter.java @@ -8,22 +8,31 @@ public class NoticeStatusConverter implements AttributeConverter "draft"; - case PUBLISHED -> "published"; - case OFFLINE -> "offline"; - }; + switch (attribute) { + case DRAFT: + return "draft"; + case PUBLISHED: + return "published"; + case OFFLINE: + return "offline"; + default: + return "published"; + } } @Override public NoticeStatus convertToEntityAttribute(String dbData) { if (dbData == null) return null; - return switch (dbData) { - case "draft" -> NoticeStatus.DRAFT; - case "published" -> NoticeStatus.PUBLISHED; - case "offline" -> NoticeStatus.OFFLINE; - default -> NoticeStatus.PUBLISHED; - }; + switch (dbData) { + case "draft": + return NoticeStatus.DRAFT; + case "published": + return NoticeStatus.PUBLISHED; + case "offline": + return NoticeStatus.OFFLINE; + default: + return NoticeStatus.PUBLISHED; + } } } diff --git a/frontend/App.vue b/frontend/App.vue index 8c2b732..ae1bbb1 100644 --- a/frontend/App.vue +++ b/frontend/App.vue @@ -12,6 +12,50 @@ } - diff --git a/frontend/pages.json b/frontend/pages.json index 3a49faa..c61628a 100644 --- a/frontend/pages.json +++ b/frontend/pages.json @@ -124,13 +124,14 @@ "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "五金配件管家", - "navigationBarBackgroundColor": "#F8F8F8", - "backgroundColor": "#F8F8F8" + "navigationBarBackgroundColor": "#FFFFFF", + "backgroundColor": "#FFFFFF", + "backgroundTextStyle": "dark" }, "tabBar": { - "color": "#8a7535", - "selectedColor": "#B4880F", - "backgroundColor": "#ffffff", + "color": "#444444", + "selectedColor": "#4C8DFF", + "backgroundColor": "#FFFFFF", "borderStyle": "black", "list": [ { "pagePath": "pages/index/index", "text": "首页", "iconPath": "static/logo.png", "selectedIconPath": "static/logo.png" }, diff --git a/frontend/pages/account/form.vue b/frontend/pages/account/form.vue index ff50443..12ef58c 100644 --- a/frontend/pages/account/form.vue +++ b/frontend/pages/account/form.vue @@ -57,18 +57,18 @@ export default { } - diff --git a/frontend/pages/account/ledger.vue b/frontend/pages/account/ledger.vue index 8ea461f..fdf0c37 100644 --- a/frontend/pages/account/ledger.vue +++ b/frontend/pages/account/ledger.vue @@ -64,24 +64,24 @@ export default { } - diff --git a/frontend/pages/account/select.vue b/frontend/pages/account/select.vue index d7363e8..a86f2b8 100644 --- a/frontend/pages/account/select.vue +++ b/frontend/pages/account/select.vue @@ -41,13 +41,13 @@ } - diff --git a/frontend/pages/customer/detail.vue b/frontend/pages/customer/detail.vue index 02595bc..3e6076d 100644 --- a/frontend/pages/customer/detail.vue +++ b/frontend/pages/customer/detail.vue @@ -69,18 +69,18 @@ export default { } - diff --git a/frontend/pages/customer/form.vue b/frontend/pages/customer/form.vue index b1a7a6a..11d949c 100644 --- a/frontend/pages/customer/form.vue +++ b/frontend/pages/customer/form.vue @@ -47,14 +47,14 @@ export default { } - diff --git a/frontend/pages/customer/select.vue b/frontend/pages/customer/select.vue index a014e1f..9c28e06 100644 --- a/frontend/pages/customer/select.vue +++ b/frontend/pages/customer/select.vue @@ -51,16 +51,16 @@ } - diff --git a/frontend/pages/detail/index.vue b/frontend/pages/detail/index.vue index 65f4241..f80ee68 100644 --- a/frontend/pages/detail/index.vue +++ b/frontend/pages/detail/index.vue @@ -132,31 +132,31 @@ export default { } - diff --git a/frontend/pages/index/index.vue b/frontend/pages/index/index.vue index 9491658..68bd073 100644 --- a/frontend/pages/index/index.vue +++ b/frontend/pages/index/index.vue @@ -1,6 +1,5 @@