From 4ad01ea72d8e64b4ba84c9da4f19c8a39dd5c0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=A3=E4=BA=9B=E8=8A=B1=E5=84=BF?= <1156921458@qq.com> Date: Thu, 24 Apr 2025 19:05:25 +0800 Subject: [PATCH] .. --- .../activity/vo/ClientActivitySignVO.java | 3 +- frontend/package-lock.json | 10 + frontend/package.json | 1 + frontend/src/main.js | 5 + frontend/src/pages.json | 47 +- frontend/src/pages/activity/list/index.vue | 61 +- frontend/src/pages/activity/team/index.vue | 177 ++++- frontend/src/pages/login/index.vue | 239 +++++++ frontend/src/pages/my/index.vue | 11 - frontend/src/pages/profile/index.vue | 611 ++++++++++++++++++ 10 files changed, 1090 insertions(+), 75 deletions(-) create mode 100644 frontend/src/pages/login/index.vue delete mode 100644 frontend/src/pages/my/index.vue create mode 100644 frontend/src/pages/profile/index.vue diff --git a/backend/src/main/java/com/budwk/app/client/module/activity/vo/ClientActivitySignVO.java b/backend/src/main/java/com/budwk/app/client/module/activity/vo/ClientActivitySignVO.java index c8658f3..bfab850 100644 --- a/backend/src/main/java/com/budwk/app/client/module/activity/vo/ClientActivitySignVO.java +++ b/backend/src/main/java/com/budwk/app/client/module/activity/vo/ClientActivitySignVO.java @@ -11,6 +11,5 @@ public class ClientActivitySignVO { private String contactName; private String contactPhone; - - + } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 8fa3fa1..79eed9d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -24,6 +24,7 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4050720250324001", "@dcloudio/uni-mp-xhs": "3.0.0-4050720250324001", "@dcloudio/uni-quickapp-webview": "3.0.0-4050720250324001", + "moment": "^2.30.1", "tdesign-mobile-vue": "^1.8.3", "vue": "^3.4.21", "vue-i18n": "^9.1.9" @@ -8773,6 +8774,15 @@ "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==", "license": "MIT" }, + "node_modules/moment": { + "version": "2.30.1", + "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz", + "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==", + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz", diff --git a/frontend/package.json b/frontend/package.json index 5e73f11..605e005 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -52,6 +52,7 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4050720250324001", "@dcloudio/uni-mp-xhs": "3.0.0-4050720250324001", "@dcloudio/uni-quickapp-webview": "3.0.0-4050720250324001", + "moment": "^2.30.1", "tdesign-mobile-vue": "^1.8.3", "vue": "^3.4.21", "vue-i18n": "^9.1.9" diff --git a/frontend/src/main.js b/frontend/src/main.js index 6346110..348850e 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -8,6 +8,11 @@ import 'tdesign-mobile-vue/es/style/index.css'; // 自定义组件库样式 import './theme.css' +// 引入moment +import moment from 'moment'; +import 'moment/dist/locale/zh-cn' +moment.locale('zh-cn') + export function createApp() { const app = createSSRApp(App); app.use(TDesign); // 使用TDesign组件库 diff --git a/frontend/src/pages.json b/frontend/src/pages.json index 8065a70..2c058dd 100644 --- a/frontend/src/pages.json +++ b/frontend/src/pages.json @@ -6,10 +6,20 @@ "navigationBarTitleText": "uni-app" } }, + { + "path": "pages/login/index", + "style": { + "navigationBarTitleText": "登录", + "navigationStyle": "custom", + "disableScroll": true + } + }, { "path": "pages/activity/list/index", "style": { - "navigationBarTitleText": "赛事活动" + "navigationBarTitleText": "赛事活动", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 } }, { @@ -29,31 +39,52 @@ "style": { "navigationBarTitleText": "我的团队" } + }, + { + "path": "pages/profile/index", + "style": { + "navigationBarTitleText": "我的" + } } ], "globalStyle": { "navigationBarTextStyle": "#FFFFFF", "navigationBarTitleText": "uni-app", - "navigationBarBackgroundColor": "#ff5050", + "navigationBarBackgroundColor": "#f45a5a", "backgroundColor": "#F8F8F8" }, "tabBar": { "color": "#000", - "selectedColor": "#ff5050", - "borderStyle": "black", + "selectedColor": "#f45a5a", + "borderStyle": "white", "backgroundColor": "#ffffff", "height": "60px", - "fontSize": "12px", + "fontSize": "14px", "iconWidth": "24px", "spacing": "3px", + "iconfontSrc": "static/fonts/iconfont.ttf", "list": [ { "pagePath": "pages/index/index", - "text": "组件" + "text": "组件", + "iconfont": { + "text": "\ue64d", + "selectedText": "\ue64d", + "fontSize": "17px", + "color": "#333", + "selectedColor": "#f45a5a" + } }, { - "pagePath": "pages/my/index", - "text": "接口" + "pagePath": "pages/profile/index", + "text": "我的", + "iconfont": { + "text": "\ue600", + "selectedText": "\ue600", + "fontSize": "17px", + "color": "#333", + "selectedColor": "#f45a5a" + } } ] } diff --git a/frontend/src/pages/activity/list/index.vue b/frontend/src/pages/activity/list/index.vue index c1d7395..dc861a5 100644 --- a/frontend/src/pages/activity/list/index.vue +++ b/frontend/src/pages/activity/list/index.vue @@ -1,12 +1,10 @@