diff --git a/gym-manage-uniapp/api/groupCourse.js b/gym-manage-uniapp/api/groupCourse.js index c3213ca..4315a0b 100644 --- a/gym-manage-uniapp/api/groupCourse.js +++ b/gym-manage-uniapp/api/groupCourse.js @@ -1,4 +1,4 @@ -import request from "@/utils/request.js" +import request from "@/utils/request.js" export function getGroupCourseList(params = {}, options = {}) { return request.get('/groupCourse/list', params, options) @@ -108,7 +108,7 @@ export function getGroupCourseRecommendList(params = {}, options = { cache: fals * @param {number} memberId - 会员ID */ export function qrSignInGroupCourse(courseId, memberId) { - return request.post(`/groupCourse/${courseId}/qrsignin`, { memberId }) + return request.post(`/groupCourse/signin/${memberId}`, { courseId }) } export default { diff --git a/gym-manage-uniapp/api/main.js b/gym-manage-uniapp/api/main.js index 10ab446..af326c4 100644 --- a/gym-manage-uniapp/api/main.js +++ b/gym-manage-uniapp/api/main.js @@ -1,4 +1,4 @@ -import request from "@/utils/request.js" +import request from "@/utils/request.js" /** * 微信小程序登录 @@ -52,7 +52,7 @@ export function getQRCode(options = { cache: true, cacheTime: 5 * 60 * 1000 }) { * @param {object} params - { qrcode: string, memberId: number } */ export function checkIn(params) { - return request.post('/checkIn/scan', params) + return request.post('/checkIn', params) } /** @@ -167,167 +167,6 @@ export function updateUserInfo(params) { return request.put('/member/info', params) } -/** - * 购买会员卡 - * @param {object} params - 购买参数 - * @param {number} params.memberId - 会员ID - * @param {number} params.memberCardId - 会员卡类型ID - * @param {number} [params.sourceOrderId] - 来源订单ID - */ -export function purchaseMemberCard(params) { - return request.post('/member-card-records/purchase', params) -} - -/** - * 获取我的会员卡列表 - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getMyMemberCards(memberId, options = { cache: false }) { - return request.get(`/member-card-records/my-cards/${memberId}`, {}, options) -} - -/** - * 获取会员的所有会员卡（支持状态筛选） - * @param {number} memberId - 会员ID - * @param {string} status - 状态筛选：all-全部, active-有效, expired-已失效 - * @param {object} options - 请求选项 - */ -export function getMyMemberCardsWithStatus(memberId, status = 'all', options = { cache: false }) { - return request.get(`/member-card-records/my-cards-with-status/${memberId}`, { status }, options) -} - -/** - * 获取会员的主要有效会员卡（只返回一条） - * 优先返回临期卡，其次返回普通有效卡 - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getPrimaryMemberCard(memberId, options = { cache: false }) { - return request.get(`/member-card-records/primary/${memberId}`, {}, options) -} - -/** - * 获取会员卡交易/流水记录（按会员ID） - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getMemberCardTransactions(memberId, options = { cache: false }) { - return request.get(`/member-card-transactions/member/${memberId}`, {}, options) -} - -/** - * 获取会员卡交易/流水记录（按会员卡记录ID） - * @param {number} recordId - 会员卡记录ID - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getMemberCardTransactionsByRecordId(recordId, options = { cache: false }) { - return request.get(`/member-card-transactions/record/${recordId}`, {}, options) -} - -/** - * 获取当前有效的会员卡列表 - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getActiveMemberCards(options = { cache: false }) { - return request.get('/member-cards/active', {}, options) -} - -/** - * 根据ID获取会员卡详情 - * @param {number} cardId - 会员卡ID - * @param {object} options - 请求选项 { cache: boolean } - */ -export function getMemberCardById(cardId, options = { cache: false }) { - return request.get(`/member-cards/${cardId}`, {}, options) -} - -// ========== 支付密码相关API ========== - -/** - * 检查会员是否已设置支付密码 - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 - */ -export function checkPayPasswordSet(memberId, options = {}) { - return request.get(`/pay-password/check/${memberId}`, {}, options) -} - -/** - * 设置支付密码 - * @param {number} memberId - 会员ID - * @param {string} password - 支付密码 - * @param {object} options - 请求选项 - */ -export function setPayPassword(memberId, password, options = {}) { - return request.post(`/pay-password/set/${memberId}`, { password }, options) -} - -/** - * 验证支付密码 - * @param {number} memberId - 会员ID - * @param {string} password - 支付密码 - * @param {object} options - 请求选项 - */ -export function verifyPayPassword(memberId, password, options = {}) { - return request.post(`/pay-password/verify/${memberId}`, { password }, options) -} - -/** - * 重置支付密码 - * @param {number} memberId - 会员ID - * @param {string} oldPassword - 旧密码 - * @param {string} newPassword - 新密码 - * @param {object} options - 请求选项 - */ -export function resetPayPassword(memberId, oldPassword, newPassword, options = {}) { - return request.post(`/pay-password/reset/${memberId}`, { oldPassword, newPassword }, options) -} - -// ========== 储值卡相关API ========== - -/** - * 获取储值卡信息（包含余额、消费记录等） - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 - */ -export function getStoredCardInfo(memberId, options = {}) { - return request.get(`/stored-card/${memberId}`, {}, options) -} - -/** - * 获取储值卡余额 - * @param {number} memberId - 会员ID - * @param {object} options - 请求选项 - */ -export function getStoredCardBalance(memberId, options = {}) { - return request.get(`/stored-card/${memberId}/balance`, {}, options) -} - -/** - * 储值卡支付（验证密码并扣减余额） - * @param {number} memberId - 会员ID - * @param {string} password - 支付密码 - * @param {number} amount - 支付金额 - * @param {object} options - 请求选项 - */ -export function payWithStoredCard(memberId, password, amount, options = {}) { - return request.post(`/stored-card/pay/${memberId}`, { - password, - amount - }, options) -} - -/** - * 查询储值卡充值记录 - * @param {number} memberId - 会员ID - * @param {number} page - 页码 - * @param {number} size - 每页数量 - */ -export function getStoredCardRechargeRecords(memberId, page = 1, size = 20, options = {}) { - return request.get(`/stored-card/${memberId}/recharges?page=${page}&size=${size}`, {}, options) -} - // ========== 系统配置相关API ========== /** @@ -339,85 +178,6 @@ export function getConfigByKey(configKey, options = {}) { return request.get(`/config/key/${configKey}`, {}, options) } -// ========== 支付相关API ========== - -/** - * 创建支付订单 - * @param {object} params - 支付参数 - * @param {number} params.memberId - 会员ID - * @param {string} params.orderType - 订单类型 (MEMBER_CARD-会员卡, GROUP_COURSE-团课, GOODS-商品) - * @param {string} params.goodsDesc - 商品描述 - * @param {string} params.transAmt - 交易金额（单位：分） - * @param {string} params.tradeType - 交易类型 (WECHAT-微信, ALIPAY-支付宝) - * @param {string} [params.remark] - 备注 - * @param {string} [params.acctId] - 账户号 - * @param {string} [params.timeExpire] - 过期时间 (yyyyMMddHHmmss) - * @param {string} [params.delayAcctFlag] - 延迟入账标识 - * @param {number} [params.feeFlag] - 手续费标识 - * @param {string} [params.limitPayType] - 禁用支付方式 - * @param {string} [params.channelNo] - 渠道号 - * @param {string} [params.payScene] - 支付场景 - * @param {string} [params.notifyUrl] - 回调通知URL - */ -export function createPayment(params) { - return request.post('/payment/create', params) -} - -/** - * 创建扫码支付订单 - * @param {object} params - 支付参数 - */ -export function createQrCodePayment(params) { - return request.post('/payment/qrcode/create', params) -} - -/** - * 查询支付状态（本地数据库） - * @param {string} orderId - 订单ID - */ -export function getPaymentStatus(orderId) { - return request.get(`/payment/${orderId}`, {}) -} - -/** - * 查询汇付官方支付状态 - * @param {string} outOrdId - 商户订单号 - * @param {string} hfSeqId - 汇付全局流水号（可选） - */ -export function queryHuifuTradeByOrderId(outOrdId, hfSeqId = null) { - let url = `/payment/huifu/query?outOrdId=${outOrdId}` - if (hfSeqId) { - url += `&hfSeqId=${hfSeqId}` - } - return request.get(url, {}) -} - -/** - * 查询待支付订单 - * @param {number} memberId - 会员ID - * @param {string} orderType - 订单类型 - */ -export function getPendingOrder(memberId, orderType) { - return request.get(`/payment/pending/${memberId}?orderType=${orderType}`, {}) -} - -/** - * 关闭订单 - * @param {string} orderId - 订单ID - */ -export function closeOrder(orderId) { - return request.post(`/payment/${orderId}/close`, {}) -} - -/** - * 申请退款 - * @param {string} orderId - 订单ID - * @param {string} refundAmt - 退款金额（单位：分） - */ -export function refundPayment(orderId, refundAmt) { - return request.post(`/payment/${orderId}/refund`, { refundAmt }) -} - // ========== 课程相关API ========== /** @@ -454,7 +214,6 @@ export function getGroupCoursePage(params = {}, options = { cache: true, cacheTi * @param {object} params - 预约参数 * @param {number} params.courseId - 团课ID * @param {number} params.memberId - 会员ID - * @param {number} params.memberCardRecordId - 会员卡记录ID */ export function bookGroupCourse(params) { return request.post('/groupCourse/book', params) @@ -522,18 +281,7 @@ export default { getUserInfo, getMemberDetail, updateUserInfo, - purchaseMemberCard, - getMyMemberCards, - getMyMemberCardsWithStatus, - getPrimaryMemberCard, - getStoredCardInfo, - getStoredCardBalance, - payWithStoredCard, - getStoredCardRechargeRecords, - createPayment, - createQrCodePayment, - getPaymentStatus, - refundPayment, + getConfigByKey, getRecommendCourses, getCourseDetail, getGroupCoursePage, diff --git a/gym-manage-uniapp/common/constants/routes.js b/gym-manage-uniapp/common/constants/routes.js index 6da0c83..7edb487 100644 --- a/gym-manage-uniapp/common/constants/routes.js +++ b/gym-manage-uniapp/common/constants/routes.js @@ -1,4 +1,4 @@ -// common/constants/routes.js +// common/constants/routes.js /** 与 pages.json 保持一致 */ export const PAGE = { @@ -6,7 +6,6 @@ export const PAGE = { COURSE: '/pages/course/index', MEMBER: '/pages/memberInfo/memberInfo', BOOKING: '/pages/memberInfo/booking', - MEMBER_CARD: '/pages/memberInfo/memberCard', USER_INFO: '/pages/memberInfo/userInfo', BODY_TEST_HOME: '/pages/memberInfo/bodyTestHome', BODY_TEST_CONNECT: '/pages/memberInfo/bodyTestConnect', @@ -30,10 +29,7 @@ export const PAGE = { POINTS: '/pages/memberInfo/points', REFERRAL: '/pages/memberInfo/referral', MY_COURSES: '/pages/memberInfo/myCourses', - CHECK_IN_HISTORY: '/pages/memberInfo/checkInHistory', - PURCHASE_CARD: '/pages/memberInfo/purchaseCard', - SET_PAY_PASSWORD: '/pages/memberInfo/setPayPassword', - RECHARGE_STORED_CARD: '/pages/memberInfo/rechargeStoredCard' + CHECK_IN_HISTORY: '/pages/memberInfo/checkInHistory' } /** 底部 TabBar 页面路径，顺序与 TabBar.vue 一致 */ diff --git a/gym-manage-uniapp/common/hooks/useLoginGuard.js b/gym-manage-uniapp/common/hooks/useLoginGuard.js index b75484e..1aca523 100644 --- a/gym-manage-uniapp/common/hooks/useLoginGuard.js +++ b/gym-manage-uniapp/common/hooks/useLoginGuard.js @@ -1,4 +1,4 @@ -/** +/** * 登录拦截Hook * 用于在需要登录的操作前检查用户登录状态，未登录则弹出登录框 * @@ -230,8 +230,6 @@ export function loginGuardMixin() { */ export const protectedRoutes = [ '/pages/memberInfo/memberInfo', - '/pages/memberInfo/purchaseCard', - '/pages/memberInfo/memberCard', '/pages/memberInfo/checkIn', '/pages/memberInfo/booking', '/pages/memberInfo/coupons', diff --git a/gym-manage-uniapp/common/permission.js b/gym-manage-uniapp/common/permission.js index 6a22bed..9e61e8a 100644 --- a/gym-manage-uniapp/common/permission.js +++ b/gym-manage-uniapp/common/permission.js @@ -1,4 +1,4 @@ -/** +/** * 路由权限拦截器 * 自动拦截配置好的路径，未登录时自动弹出登录弹窗 * @@ -31,8 +31,6 @@ const WHITE_LIST = [ * 匹配以下前缀的页面都需要登录 */ const LOGIN_REQUIRED_PREFIXES = [ - '/pages/memberInfo/memberCard', - '/pages/memberInfo/purchaseCard', '/pages/memberInfo/checkIn', '/pages/memberInfo/booking', '/pages/memberInfo/coupons', diff --git a/gym-manage-uniapp/components/TabBar.vue b/gym-manage-uniapp/components/TabBar.vue index 660db25..df4738f 100644 --- a/gym-manage-uniapp/components/TabBar.vue +++ b/gym-manage-uniapp/components/TabBar.vue @@ -1,4 +1,4 @@ - +