From 9d18a88e4054344d75b1f750ac136a92a753ee71 Mon Sep 17 00:00:00 2001 From: Hong <1470048117@qq.com> Date: Thu, 29 Feb 2024 19:56:24 +0800 Subject: [PATCH] =?UTF-8?q?2.29(=E5=A4=A9=E5=A4=A9=E6=89=93=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/activity/activity.js | 73 +-- pages/mine/every_day_card/every_day_card.vue | 528 ++++++++++++------- pages/mine/every_day_card/previous_list.vue | 19 +- pages/mine/wallet/wallet.vue | 25 +- utils/index.js | 25 + 5 files changed, 423 insertions(+), 247 deletions(-) diff --git a/api/activity/activity.js b/api/activity/activity.js index dc7c647..54e6f96 100644 --- a/api/activity/activity.js +++ b/api/activity/activity.js @@ -1,59 +1,34 @@ +import request from '@/utils/request' -import request from "@/utils/request.js"; - -/** - * 活动列表 - */ -export function activityList(params) { - return request({ - url: `/api/front/act/activity/list`, - method: 'get', - params - }) -} -/** - * 一元活动详情 - */ -export function oneDollarDetails() { +// 查询每日打卡列表 +export function clockList(data) { return request({ - url: `/api/front/act/oneyuan/today`, - method: 'get', - }) -} -/** - * 参加一元活动,直接唤起小程序微信支付 - */ -export function payOneDollar(data) { - return request({ - url: `/api/front/act/oneyuan/join?activityId=${data}`, - method: 'post', - }) -} -//支付参加活动 -export function paycardAPI(data) { - return request({ - url: `/api/front/pay/payactive`, - method: 'post', + url: '/api/front/daily/check/in/page/list', + method: 'get', data }) } +//报名 -/** - 一元活动打卡 - */ -export function oneYuanClock(id) { +export function DailyJoin(data) { return request({ - url: `/api/front/act/oneyuan/clock?activityId=${id}`, - method: 'post', + url: '/api/front/daily/check/in/join', + method: 'post', + data:data }) } -/** - 获取活动背景配置 - */ -export function actGetConfig(params) { - return request({ - url: `/api/front/act/get/config`, - method: 'get', - params - }) +//支付 +export function prepay(data) { + return request({ + url: '/api/front/pay/paydaily', + method: 'post', + data:data + }) +} +//参加每日打卡活动创建订单 +export function DailyClock(dailyCheckId) { + return request({ + url: '/api/front/daily/check/in/clock/' + dailyCheckId, + method: 'post' + }) } \ No newline at end of file diff --git a/pages/mine/every_day_card/every_day_card.vue b/pages/mine/every_day_card/every_day_card.vue index de8f507..f5cbc42 100644 --- a/pages/mine/every_day_card/every_day_card.vue +++ b/pages/mine/every_day_card/every_day_card.vue @@ -1,123 +1,182 @@