diff --git a/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java b/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java index 2d3a11c..dba4d61 100644 --- a/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java +++ b/backend/src/main/java/com/budwk/app/web/controllers/open/file/UploadController.java @@ -138,7 +138,7 @@ public class UploadController { //下载文件 @At @Ok("void") - @SaCheckAnyLogin +// @SaCheckAnyLogin public void download(String filepath, String inline, HttpServletResponse response) throws IOException { //校验文件路径是否合法 boolean isValid = filepath != null && !filepath.contains("../") && !filepath.contains("..\\"); diff --git a/backend/src/main/resources/static/components/plugins/textEditor/index.vue b/backend/src/main/resources/static/components/plugins/textEditor/index.vue index 98c5e64..e5a8655 100644 --- a/backend/src/main/resources/static/components/plugins/textEditor/index.vue +++ b/backend/src/main/resources/static/components/plugins/textEditor/index.vue @@ -66,8 +66,8 @@ module.exports = { console.log(v) if (v.code === 0) { console.log(v.data) - insertImgFn('https://3skj.ltd/api/open/file/upload/download?filepath='+v.data) - // insertImgFn(v.data) + // insertImgFn('https://3skj.ltd/api/open/file/upload/download?filepath='+v.data) + insertImgFn('/open/file/upload/download?filepath='+v.data) } else { this.$message.error(v.msg) } diff --git a/backend/src/main/resources/views/platform/activity/user/index.html b/backend/src/main/resources/views/platform/activity/user/index.html index 2c73302..0d481e9 100644 --- a/backend/src/main/resources/views/platform/activity/user/index.html +++ b/backend/src/main/resources/views/platform/activity/user/index.html @@ -81,6 +81,7 @@ layout("/layouts/platform_1.html"){ width="50"> + diff --git a/frontend/src/pages/activity/detail/index.vue b/frontend/src/pages/activity/detail/index.vue index 38d39dc..50a4646 100644 --- a/frontend/src/pages/activity/detail/index.vue +++ b/frontend/src/pages/activity/detail/index.vue @@ -89,7 +89,7 @@ {{ item.rule }} - + @@ -130,6 +130,7 @@ import {onLoad} from '@dcloudio/uni-app'; import {Toast} from 'tdesign-mobile-vue'; import {useRequest} from "@/utils/request"; import {config} from "@/utils/config"; +import moment from "moment"; const request = useRequest(); const actId = ref(null); @@ -139,28 +140,46 @@ const detailData = ref(null); // 格式化日期 const formatDate = (dateStr) => { if (!dateStr) return ''; - try { - const date = new Date(dateStr); - return `${date.getFullYear()}.${(date.getMonth() + 1).toString().padStart(2, '0')}.${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`; - } catch (error) { - return dateStr; - } + return moment(dateStr).format('YYYY.MM.DD HH:mm'); + // try { + // // 手动解析日期部分 + // const [datePart, timePart] = dateStr.split(' '); + // const [year, month, day] = datePart.split('-').map(Number); + // const [hours, minutes, seconds] = timePart.split(':').map(Number); + // + // // 创建日期对象（月份需要减1） + // const date = new Date(year, month - 1, day, hours, minutes, seconds); + // + // // 检查日期是否有效 + // if (isNaN(date.getTime())) { + // return dateStr; + // } + // + // return `${date.getFullYear()}.${(date.getMonth() + 1).toString().padStart(2, '0')}.${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}`; + // } catch (error) { + // return dateStr; + // } }; // 底部按钮文字 const bottomButton = computed(() => { const {signStartTime, signEndTime} = detailData.value if (signStartTime && signEndTime) { - const now = new Date(); - const startTime = new Date(signStartTime); - const endTime = new Date(signEndTime); - if (now >= startTime && now <= endTime) { + // const now = new Date(); + // const startTime = new Date(signStartTime); + // const endTime = new Date(signEndTime); + + const now = moment(); + const startTime = moment(signStartTime); + const endTime = moment(signEndTime); + + if (now.isBetween(startTime, endTime, null, '[]')) { return { text: isSignUp.value ? '修改报名信息' : '立即报名', disabled: false, onClick: navigateToSignUp } - } else if (now < startTime) { + } else if (now.isBefore(startTime)) { return { text: `报名开始时间：${formatDate(signStartTime)}`, disabled: true, @@ -510,7 +529,7 @@ onLoad((option) => { max-height: 200rpx; overflow: hidden; position: relative; - + &::after { content: ''; position: absolute; diff --git a/frontend/src/pages/activity/registration-form/index.vue b/frontend/src/pages/activity/registration-form/index.vue index 24e2454..df75bc3 100644 --- a/frontend/src/pages/activity/registration-form/index.vue +++ b/frontend/src/pages/activity/registration-form/index.vue @@ -44,7 +44,7 @@ show-error-message label-align="left" scroll-to-first-error="auto" - labelWidth="90px" + labelWidth="100px" :requiredMark="true" > @@ -89,9 +89,9 @@ - - + @@ -116,8 +116,8 @@ - + diff --git a/frontend/src/pages/index/index.vue b/frontend/src/pages/index/index.vue index 4b0a5a8..323e2ed 100644 --- a/frontend/src/pages/index/index.vue +++ b/frontend/src/pages/index/index.vue @@ -2,7 +2,7 @@ @@ -43,7 +43,7 @@ - 近期活动 + 活动详情 更多 @@ -288,7 +288,7 @@ uni-page-body { } .section-title { - font-size: 16px; + font-size: 18px; font-weight: bold; color: #333; position: relative; diff --git a/frontend/src/pages/login/index.vue b/frontend/src/pages/login/index.vue index ce124b2..22a55d1 100644 --- a/frontend/src/pages/login/index.vue +++ b/frontend/src/pages/login/index.vue @@ -61,18 +61,18 @@ diff --git a/frontend/src/pages/login/register.vue b/frontend/src/pages/login/register.vue index bffeeae..f99f28f 100644 --- a/frontend/src/pages/login/register.vue +++ b/frontend/src/pages/login/register.vue @@ -137,7 +137,7 @@ 主办单位：浙江省教育工会 - 承办单位：杭州医学院工会 + 承办单位：杭州医学院 技术支持：武汉地大三思科技有限公司（智慧工会提供商） diff --git a/frontend/src/static/img/index3.png b/frontend/src/static/img/index3.png new file mode 100644 index 0000000..124607f Binary files /dev/null and b/frontend/src/static/img/index3.png differ diff --git a/frontend/src/static/img/index4.png b/frontend/src/static/img/index4.png new file mode 100644 index 0000000..ef583ab Binary files /dev/null and b/frontend/src/static/img/index4.png differ diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 7b8b5f2..24b42f3 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -34,8 +34,8 @@ export default defineConfig({ },*/ proxy: { '/api': { - // target: 'http://119.91.224.39:9090/', - target: 'http://192.168.118.1:9090/', + target: 'http://119.91.224.39:9090/', + // target: 'http://192.168.118.1:9090/', changeOrigin: true, rewrite: (path) => path.replace(/^\/api/, '') }