From 36566437fcee6b0095970823506c3995b257fc27 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 13 Dec 2023 18:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/modules/activity.js | 15 + components/filter-popup/filter-popup.vue | 2 +- components/sideSelect/sideSelect.vue | 42 +++ libs/util.js | 8 + order/activityDetail/activityDetail.vue | 187 ---------- other/activityDetail/activityDetail.vue | 321 ++++++++++++++++++ .../registeredActivity/registeredActivity.vue | 208 +++++++----- .../supplierDetail/supplierDetail.vue | 0 pages.json | 4 +- pages/index/index.vue | 129 +++++-- pages/person/person.vue | 2 +- pages/supplier/supplier.vue | 4 +- styles/common.scss | 11 +- 13 files changed, 635 insertions(+), 298 deletions(-) create mode 100644 components/sideSelect/sideSelect.vue delete mode 100644 order/activityDetail/activityDetail.vue create mode 100644 other/activityDetail/activityDetail.vue rename {order => other}/registeredActivity/registeredActivity.vue (64%) rename {order => other}/supplierDetail/supplierDetail.vue (100%) diff --git a/apis/modules/activity.js b/apis/modules/activity.js index 4656b43..f442e7e 100644 --- a/apis/modules/activity.js +++ b/apis/modules/activity.js @@ -6,4 +6,19 @@ export const postLoginActivity = (data) => { } export const getCompetition = (id) => { return post(`competition/competition/management/getCompetition?competitionId=${id}`) +} +export const individualEventRegistration = (data) => { + return post(`competition/competition/registration/individualEventRegistration`, data) +} +export const getCurrentTime = () => { + return get(`competition/competition/management/getCurrentTime`) +} +export const queryRegistrationByCondition = (data) => { + return post(`competition/competition/registration/queryRegistrationByCondition`, data) +} +export const competitionUserDel = (data) => { + return post(`competition/competitionUserDel/save`, data) +} +export const cancelRegistration = (id) => { + return post(`competition/competition/registration/cancelRegistration?competitionId=${id}`) } \ No newline at end of file diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue index 636217d..d74cfa8 100644 --- a/components/filter-popup/filter-popup.vue +++ b/components/filter-popup/filter-popup.vue @@ -162,7 +162,7 @@ export default { } }, mounted() { - this.getDis() + }, methods: { //选择存value 还是id diff --git a/components/sideSelect/sideSelect.vue b/components/sideSelect/sideSelect.vue new file mode 100644 index 0000000..896a4f8 --- /dev/null +++ b/components/sideSelect/sideSelect.vue @@ -0,0 +1,42 @@ + + + + + \ No newline at end of file diff --git a/libs/util.js b/libs/util.js index a5c4644..5763151 100644 --- a/libs/util.js +++ b/libs/util.js @@ -1,4 +1,5 @@ import Product from '@/config/product' +import { getCurrentTime } from '@/apis/modules/activity.js' const files = [ 'https://huorantech.cn/%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE.docx', // 用户服务协议 @@ -125,4 +126,11 @@ export default { getFileExt(fileName) { return fileName.substring(fileName.lastIndexOf(".") + 1); }, + // 获取当前时间 + getNow () { + return new Promise(async (resolve, reject) => { + const res = await getCurrentTime() + resolve(new Date(res.currentTime)) + }) + }, } \ No newline at end of file diff --git a/order/activityDetail/activityDetail.vue b/order/activityDetail/activityDetail.vue deleted file mode 100644 index cb82e9f..0000000 --- a/order/activityDetail/activityDetail.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue new file mode 100644 index 0000000..6570536 --- /dev/null +++ b/other/activityDetail/activityDetail.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/order/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue similarity index 64% rename from order/registeredActivity/registeredActivity.vue rename to other/registeredActivity/registeredActivity.vue index 75d82ed..64c56c2 100644 --- a/order/registeredActivity/registeredActivity.vue +++ b/other/registeredActivity/registeredActivity.vue @@ -1,41 +1,67 @@ diff --git a/order/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue similarity index 100% rename from order/supplierDetail/supplierDetail.vue rename to other/supplierDetail/supplierDetail.vue diff --git a/pages.json b/pages.json index 84122fb..6f7fd66 100644 --- a/pages.json +++ b/pages.json @@ -52,7 +52,7 @@ ], "subPackages": [ { - "root": "order", + "root": "other", "pages": [ { "path" : "supplierDetail/supplierDetail", @@ -67,7 +67,7 @@ "style" : { "navigationBarTitleText" : "活动详情", - "enablePullDownRefresh" : false + "enablePullDownRefresh" : true } }, { diff --git a/pages/index/index.vue b/pages/index/index.vue index 3c78d89..b9a630e 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -31,32 +31,43 @@ {{ item.competitionName }} - 时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }} + 举办时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }} 主办方：{{ item.sponsor }} - (0/{{ item.quantityLimit }})人已报名 - 报名 + {{ item.applicantNum }}/{{ item.quantityLimit }}人已报名 + 报名 功能升级中，敬请期待... + + + + @@ -146,16 +232,6 @@ .hot { width: 100%; } -.search-wrap { - display: flex; - justify-content: space-between; - align-items: center; - padding: 0 10rpx; - background-color: #fff; - .search { - flex: 1; - } -} .module { margin: 20rpx; padding: 20rpx; @@ -180,17 +256,16 @@ display: flex; margin-bottom: 28rpx; background-color: #fff; - border-radius: 8px; overflow: hidden; } .pic { width: 320rpx; height: 240rpx; margin-right: 20rpx; + border-radius: 8px; } .texts { width: calc(100% - 240rpx); - padding: 10rpx; } .name { font-size: 28rpx; diff --git a/pages/person/person.vue b/pages/person/person.vue index f1b83e5..4bacfdf 100644 --- a/pages/person/person.vue +++ b/pages/person/person.vue @@ -26,7 +26,7 @@ 我的关注 -
  • +
  • 已报名活动
    • diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue index fa3ba5f..023c281 100644 --- a/pages/supplier/supplier.vue +++ b/pages/supplier/supplier.vue @@ -6,7 +6,7 @@