diff --git a/gym-manage-uniapp/api/main.js b/gym-manage-uniapp/api/main.js
index 0a38907..0cb7476 100644
--- a/gym-manage-uniapp/api/main.js
+++ b/gym-manage-uniapp/api/main.js
@@ -4,12 +4,28 @@ export function login(params) {
return request.post('/member/auth/miniapp/login', params)
}
+/**
+ * 发送短信验证码
+ * @param {object} params - { phone: string }
+ */
export function sendCode(params) {
- return request.post('/member/auth/send-code', params)
+ return request.post('/auth/phone/send-code', params)
}
+/**
+ * 手机号验证码登录
+ * @param {object} params - { phone: string, code: string }
+ */
export function loginWithPhone(params) {
- return request.post('/member/auth/phone-login', params)
+ return request.post('/auth/phone/code-login', params)
+}
+
+/**
+ * 手机号一键登录
+ * @param {object} params - { accessToken: string, openid: string, nickname?: string, avatar?: string }
+ */
+export function oneClickLogin(params) {
+ return request.post('/auth/phone/one-click-login', params)
}
export function logout() {
@@ -157,6 +173,14 @@ 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
@@ -237,6 +261,7 @@ export default {
login,
sendCode,
loginWithPhone,
+ oneClickLogin,
logout,
getQRCode,
checkIn,
@@ -254,6 +279,7 @@ export default {
purchaseMemberCard,
getMyMemberCards,
createPayment,
+ createQrCodePayment,
getPaymentStatus,
refundPayment,
getRecommendCourses,
diff --git a/gym-manage-uniapp/common/constants/routes.js b/gym-manage-uniapp/common/constants/routes.js
index dbb5494..bbd1846 100644
--- a/gym-manage-uniapp/common/constants/routes.js
+++ b/gym-manage-uniapp/common/constants/routes.js
@@ -4,8 +4,6 @@
export const PAGE = {
INDEX: '/pages/index/index',
COURSE: '/pages/course/index',
- TRAIN: '/pages/train/index',
- DISCOVER: '/pages/discover/index',
MEMBER: '/pages/memberInfo/memberInfo',
BOOKING: '/pages/memberInfo/booking',
MEMBER_CARD: '/pages/memberInfo/memberCard',
@@ -40,8 +38,6 @@ export const PAGE = {
export const TAB_ROUTES = [
PAGE.INDEX,
PAGE.COURSE,
- PAGE.TRAIN,
- PAGE.DISCOVER,
PAGE.MEMBER
]
diff --git a/gym-manage-uniapp/components/TabBar.vue b/gym-manage-uniapp/components/TabBar.vue
index 9b8d90b..f3a8f3c 100644
--- a/gym-manage-uniapp/components/TabBar.vue
+++ b/gym-manage-uniapp/components/TabBar.vue
@@ -48,7 +48,6 @@ const HIDE_TABBAR_PAGES = [
'pages/memberInfo/bodyTestReport',
'pages/groupCourse/list',
'pages/groupCourse/detail',
- 'pages/searchCourse/searchCourse',
'pages/checkIn/checkIn',
'pages/memberInfo/myCourses',
'pages/memberInfo/coupons',
@@ -162,20 +161,6 @@ const tabs = [
useFontIcon: true,
fontSize:"36rpx"
},
- {
- path: PAGE.TRAIN,
- icon: 'icon-train',
- label: '训练',
- useFontIcon: true,
- fontSize:"48rpx"
- },
- {
- path: PAGE.DISCOVER,
- icon: 'icon-discover',
- label: '发现',
- useFontIcon: true,
- fontSize:"48rpx"
- },
{
path: PAGE.MEMBER,
icon: 'icon-profile',
diff --git a/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue b/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue
index bb70cdc..6540350 100644
--- a/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue
+++ b/gym-manage-uniapp/components/groupCourse/TimeRangePicker.vue
@@ -121,6 +121,8 @@ const weekdays = ['日', '一', '二', '三', '四', '五', '六']
const quickOptions = [
{ label: '近7天', value: '7d' },
{ label: '近30天', value: '30d' },
+ { label: '未来7天', value: 'future7d' },
+ { label: '未来30天', value: 'future30d' },
{ label: '本月', value: 'month' },
{ label: '上月', value: 'lastMonth' }
]
@@ -218,12 +220,14 @@ function isToday(year, month, day) {
day === today.getDate()
}
-// 判断是否是未来日期
+// 判断是否是未来日期(限制最多选择未来90天)
function isFuture(year, month, day) {
const today = new Date()
today.setHours(0, 0, 0, 0)
+ const maxFuture = new Date(today)
+ maxFuture.setDate(maxFuture.getDate() + 90) // 最多允许选择未来90天
const date = new Date(year, month - 1, day)
- return date > today
+ return date > maxFuture
}
// 切换日期选择器
@@ -273,7 +277,7 @@ const selectDate = (day) => {
console.log(`[TimeRangePicker] ${pickerType.value === 'start' ? '开始' : '结束'}日期变更:`, day.date)
}
-// 应用快捷选项
+// 应用快捷选项(所有日期计算基于当前真实时间)
const applyQuickOption = (value) => {
quickSelected.value = value
const today = new Date()
@@ -281,18 +285,32 @@ const applyQuickOption = (value) => {
switch (value) {
case '7d':
+ // 近7天:以今天为终点,往前推7天
startDate = new Date(today.getTime() - 7 * 24 * 60 * 60 * 1000)
endDate = today
break
case '30d':
+ // 近30天:以今天为终点,往前推30天
startDate = new Date(today.getTime() - 30 * 24 * 60 * 60 * 1000)
endDate = today
break
+ case 'future7d':
+ // 未来7天:以今天为起点,往后推7天
+ startDate = today
+ endDate = new Date(today.getTime() + 7 * 24 * 60 * 60 * 1000)
+ break
+ case 'future30d':
+ // 未来30天:以今天为起点,往后推30天
+ startDate = today
+ endDate = new Date(today.getTime() + 30 * 24 * 60 * 60 * 1000)
+ break
case 'month':
+ // 本月:当月1号到当月最后一天
startDate = new Date(today.getFullYear(), today.getMonth(), 1)
- endDate = today
+ endDate = new Date(today.getFullYear(), today.getMonth() + 1, 0)
break
case 'lastMonth':
+ // 上月:上月1号到上月最后一天
startDate = new Date(today.getFullYear(), today.getMonth() - 1, 1)
endDate = new Date(today.getFullYear(), today.getMonth(), 0)
break
diff --git a/gym-manage-uniapp/components/index/QuickEntry.vue b/gym-manage-uniapp/components/index/QuickEntry.vue
index 09720f7..b477306 100644
--- a/gym-manage-uniapp/components/index/QuickEntry.vue
+++ b/gym-manage-uniapp/components/index/QuickEntry.vue
@@ -8,7 +8,6 @@
>
-
{{ item.title }}
{{ item.desc }}
@@ -30,148 +29,12 @@
diff --git a/gym-manage-uniapp/pages/memberInfo/login.vue b/gym-manage-uniapp/pages/memberInfo/login.vue
index feedbb1..acfd367 100644
--- a/gym-manage-uniapp/pages/memberInfo/login.vue
+++ b/gym-manage-uniapp/pages/memberInfo/login.vue
@@ -125,18 +125,9 @@
-
-
\ No newline at end of file
diff --git a/gym-manage-uniapp/pages/train/index.vue b/gym-manage-uniapp/pages/train/index.vue
deleted file mode 100644
index b5414d1..0000000
--- a/gym-manage-uniapp/pages/train/index.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-
-
-
-
-
-
-
-
- 训练报告
- 查看本周/本月运动数据与趋势
-
-
- 智能体测
- 连接设备,获取专业体测报告
-
-
- 体测报告
- 历史记录与对比分析
-
-
- 签到记录
- 到店打卡与训练频次
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/gym-manage-uniapp/utils/request.js b/gym-manage-uniapp/utils/request.js
index 5f6aeda..e574231 100644
--- a/gym-manage-uniapp/utils/request.js
+++ b/gym-manage-uniapp/utils/request.js
@@ -1,5 +1,5 @@
-// const BASE_URL = '/api'
-const BASE_URL = 'http://192.168.43.89:8084/api'
+const BASE_URL = '/api'
+// const BASE_URL = 'http://localhost:8084'
// 缓存相关常量
const CACHE_PREFIX = 'API_CACHE_'
diff --git a/gym-manage-uniapp/vite.config.js b/gym-manage-uniapp/vite.config.js
index 626105b..3dab688 100644
--- a/gym-manage-uniapp/vite.config.js
+++ b/gym-manage-uniapp/vite.config.js
@@ -17,7 +17,7 @@ export default defineConfig({
server: {
proxy: {
'/api': {
- target: 'http://192.168.43.89:8084',
+ target: 'http://localhost:8084',
changeOrigin: true,
secure: true,
bypass: function(req, res, proxyOptions) {