diff --git a/bundle/combo/combo-list.vue b/bundle/combo/combo-list.vue
new file mode 100644
index 0000000..17ef71d
--- /dev/null
+++ b/bundle/combo/combo-list.vue
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bundle/combo/details.vue b/bundle/combo/details.vue
new file mode 100644
index 0000000..dca178e
--- /dev/null
+++ b/bundle/combo/details.vue
@@ -0,0 +1,772 @@
+
+
+
+
+
+
+
+
+
+
+
+ Adult Card
+ 成人卡
+
+
+
+ 有效期：2026.03.05到期
+
+
+
+
+
+
+
+
+
+
+
+ Adult Card
+ 青年卡
+
+
+
+ 有效期：2026.03.05到期
+
+
+
+
+
+
+
+
+
+
+
+ Adult Card
+ 亲子卡
+
+
+
+ 有效期：2026.03.05到期
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VIP优惠
+ 每次打球立享折扣，运动更划算
+
+
+
+
+
+
+
+ 入场不限次
+ 凭有效凭证不限次进出场地，自由通行
+
+
+
+
+
+
+
+ 专属客服
+ 任何问题将由专属客服优先跟进处理
+
+
+
+
+
+
+
+
+
+ 权益说明
+ 更多会员专属权益与服务内容
+
+ · 这里是权益说明内容，这里是内容
+ · 这里是权益说明内容，这里是内容
+ · 这里是权益说明内容，这里是内容
+ · 这里是权益说明内容，这里是内容
+
+
+
+
+
+
+ 立即开通
+
+
+
+
+
+
+
+ 检测到您未填写相关信息，为不影响使用请尽快完善
+ 立即去完善
+
+
+
+
+
+
+
+ 会员购买
+
+
+
+ 月卡
+
+ ￥
+ 50.00
+
+ 指导价50元/月
+
+
+
+ 季卡
+
+ ￥
+ 128.00
+
+ 指导价128元/季
+
+
+
+ 年卡
+
+ ￥
+ 218.00
+
+ 指导价218元/年
+
+
+
+
+
+ 提示文字在此处显示提示文字在此处显示提示文字在此处显示提示文字在此处显示提示文字在此处显示
+
+
+ 立即开通
+
+
+
+
+
+
+
+
+
+ 确定
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bundle/combo/info.vue b/bundle/combo/info.vue
new file mode 100644
index 0000000..5a75208
--- /dev/null
+++ b/bundle/combo/info.vue
@@ -0,0 +1,371 @@
+
+
+
+
+
+
+
+
+ 基本信息 *
+
+
+
+ 姓名
+
+
+
+
+ 出生年月
+
+
+ {{ formData.birth || '请选择出生年月' }}
+
+
+
+
+
+
+ 身份证号
+
+
+
+
+
+
+
+ 随行子女信息 *
+
+
+
+ 姓名
+
+
+
+
+ 出生年月
+
+
+ {{ formData.childBirth || '请选择出生年月' }}
+
+
+
+
+
+
+ 身份证号
+
+
+
+
+
+
+
+ 联系方式 *
+
+
+
+ 联系电话
+
+
+
+
+
+
+ *提交表单申请，工作人员将在3个工作日内进行审核，如需及时了解，请直接电话咨询，我们将在第一时间解答
+
+
+
+
+
+
+
+
+
+
+
+ 信息提交成功
+ 请您耐心等候，我们将尽快为您审核
+ 好的
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/bundle/reserve/details.vue b/bundle/reserve/details.vue
index 435fd94..2202783 100644
--- a/bundle/reserve/details.vue
+++ b/bundle/reserve/details.vue
@@ -684,9 +684,7 @@ export default {
// 立即预约-提交订单
toReserve() {
-
let self = this
-
// 一进来就锁定，彻底防止高频点击
if (self.typeId == 1) {
if (self.selectedReserveTime.length === 0) {
@@ -702,10 +700,10 @@ export default {
});
try {
const start = self.selectedReserveTime[0].day_time + ' ' + self.selectedReserveTime[0].start_time;
- const end = self.selectedReserveTime[self.selectedReserveTime.length -1].day_time + ' ' + self.selectedReserveTime[self.selectedReserveTime.length -1].end_time;
// 转换为时间戳
const startTimestamp = Math.floor(Date.parse(start.replace(/-/g, '/')) / 1000);
- const endTimestamp = Math.floor(Date.parse(end.replace(/-/g, '/')) / 1000);
+ const endTimestamp = self.getMaxEndTime();
+
// let p = {
// app_id: self.getAppId(),
// ground_id: self.id,
@@ -850,6 +848,25 @@ export default {
}
}
},
+
+ // 获取选中时间中的最大结束时间
+ getMaxEndTime() {
+ if (!this.selectedReserveTime || this.selectedReserveTime.length === 0) return '';
+ let maxTimestamp = -1;
+ let maxItem = null;
+ this.selectedReserveTime.forEach(item => {
+ // 支持endTime格式为"HH:mm"或"YYYY-MM-DD HH:mm"
+ let endStr = item.end_time || '';
+ let dayStr = item.day_time || '';
+ let fullStr = endStr.length > 5 ? endStr : (dayStr ? dayStr + ' ' + endStr : endStr);
+ let ts = Date.parse(fullStr.replace(/-/g, '/'));
+ if (ts >= maxTimestamp) {
+ maxTimestamp = ts;
+ maxItem = item;
+ }
+ });
+ return maxItem ? Math.floor(Date.parse((maxItem.day_time + ' ' + maxItem.end_time).replace(/-/g, '/')) / 1000) : '';
+ },
}
};
diff --git a/bundle/setting/light.vue b/bundle/setting/light.vue
new file mode 100644
index 0000000..c9b99fb
--- /dev/null
+++ b/bundle/setting/light.vue
@@ -0,0 +1,108 @@
+
+
+
+
+ {{ field.name }}
+
+ {{ field.isOn ? '已开启' : '已关闭' }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1521cbf..4b68212 100644
--- a/pages.json
+++ b/pages.json
@@ -989,6 +989,12 @@
"subPackages": [{
"root": "bundle",
"pages": [
+ {
+ "path": "setting/light",
+ "style": {
+ "navigationBarTitleText": "设置灯光"
+ }
+ },
{
"path": "reserve/details",
"style": {
@@ -1042,6 +1048,24 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "combo/combo-list",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "combo/details",
+ "style": {
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "combo/info",
+ "style": {
+ "navigationStyle": "custom"
+ }
}
]
}],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9b0c15d..349f920 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -18,9 +18,17 @@
{{ setting.notice }}
-->
-
+
-
+
+
+
+
+
+
+
@@ -698,6 +706,13 @@ export default {
uni.navigateTo({
url: '/bundle/recharge/recharge'
});
+ },
+
+ // 跳转到充值界面
+ toCombo() {
+ uni.navigateTo({
+ url: '/bundle/combo/combo-list'
+ });
},
}
};
diff --git a/pages/user/index/index.vue b/pages/user/index/index.vue
index 3c290ad..4c92a8c 100644
--- a/pages/user/index/index.vue
+++ b/pages/user/index/index.vue
@@ -50,10 +50,17 @@
-->
+
+
+
+ 立即了解
+
+
+
- 场馆订单
+ 我的场馆订单
全部订单
@@ -719,4 +726,19 @@
background: #E5E5E5;
margin-top: 32rpx;
}
+
+ .kt-btn {
+ position: absolute;
+ right: 32rpx;
+ bottom: 22rpx;
+ width: 148rpx;
+ height: 46rpx;
+ line-height: 46rpx;
+ background: linear-gradient( 0deg, #FCF5D8 0%, #FFFFFF 100%);
+ box-shadow: 0rpx 4rpx 8rpx 2rpx #DCB56D;
+ border-radius: 23rpx 23rpx 23rpx 23rpx;
+ font-size: 24rpx;
+ color: #402201;
+ text-align: center;
+ }
diff --git a/static/icon/back3.png b/static/icon/back3.png
new file mode 100644
index 0000000..b754e2a
Binary files /dev/null and b/static/icon/back3.png differ