diff --git a/bundle/reserve/details.vue b/bundle/reserve/details.vue
index 3aa1543..3b8d4de 100644
--- a/bundle/reserve/details.vue
+++ b/bundle/reserve/details.vue
@@ -101,12 +101,12 @@
营业时间：{{ venue.day_time }} {{ venue.start_time }}-{{ venue.end_time }}
-
+
{{ venue.address }}
- 距您{{ venue.distance }}km
+
@@ -169,7 +169,8 @@
? 'cg-info-time-select'
: 'cg-info-time-normal'
]" >
- ￥{{ item3.price }}
+ ￥{{ item3.price }}
+ 免费
@@ -600,14 +601,13 @@ export default {
}
room_list.push({
room_id: roomId,
- day_time: this.selectedWeekDay,
- day_title: this.selectedWeekTimes,
+ day_title: this.selectedWeekDay,
+ day_time: this.selectedWeekTimes,
start_time,
end_time,
});
});
});
- console.log("🚀 ~ room_list:", room_list)
this.selectedReserveTime = room_list;
console.log('🚀 ~ room_list:', this.selectedReserveTime);
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c8a95ba..819cb52 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -605,6 +605,14 @@ export default {
// 场馆预约
handleToReserve(id, typeId) {
+ if (typeId == 2) {
+ uni.showToast({
+ title: '场馆暂未开放',
+ duration: 2000,
+ icon: 'none'
+ });
+ return;
+ }
uni.navigateTo({
url: `/bundle/reserve/details?id=${id}&typeId=${typeId}`
});
diff --git a/pages/order/cg-my-order.vue b/pages/order/cg-my-order.vue
index e70a820..8d6ed4b 100644
--- a/pages/order/cg-my-order.vue
+++ b/pages/order/cg-my-order.vue
@@ -14,11 +14,17 @@
- 全部订单
+
+ 全部订单
+ 待付款
+ 已预约
+ 进行中
+ 已完成
+ 退订/退款
@@ -247,20 +253,24 @@
if (typeof e.dataType != 'undefined') {
this.dataType = e.dataType;
}
+
+ // state_active 是tab栏的下标，dataType是订单状态，两者不一致，需要转换
if (this.dataType == 'all') {
+ // 全部订单
this.state_active = 0;
} else if (this.dataType == 0) {
+ // 待付款
this.state_active = 1;
} else if (this.dataType == 1) {
+ // 已预约
this.state_active = 2;
- } else if (this.dataType == 2) {
- this.state_active = 3;
- } else if (this.dataType == 4) {
+ } else if (this.dataType == 3) {
+ // 已完成
this.state_active = 4;
+ } else if (this.dataType == 5) {
+ // 退订/退款
+ this.state_active = 5;
}
- console.log("🚀 ~ this.dataType:", this.dataType)
- console.log("🚀 ~ this.dataType:", this.state_active)
-
},
mounted() {
this.init();
@@ -307,28 +317,41 @@
self.page = 1;
self.loading = true;
self.state_active = e;
+
switch (e) {
- case 'all':
+ case 0:
+ // 全部订单
self.listData = [];
self.dataType = 'all';
break;
case 1:
+ // 待付款
self.listData = [];
self.dataType = 0;
break;
case 2:
+ // 已预约
self.listData = [];
self.dataType = 1;
break;
case 3:
+ // 进行中
self.listData = [];
self.dataType = 2;
break;
case 4:
+ // 已完成
self.listData = [];
- self.dataType = 4;
+ self.dataType = 3;
+ break;
+ case 5:
+ // 退订/退款
+ self.listData = [];
+ self.dataType = 5;
break;
}
+ console.log("🚀 ~fff self.dataType:", self.dataType)
+
self.getData();
}
},
@@ -349,29 +372,10 @@
/*获取数据*/
getData() {
- // let self = this;
- // self.loading = true;
- // let dataType = self.dataType;
- // self._get(
- // 'user.order/lists', {
- // dataType: dataType,
- // page: self.page,
- // list_rows: self.list_rows
- // },
- // function(res) {
- // self.loading = false;
- // self.listData = self.listData.concat(res.data.list.data);
- // self.last_page = res.data.list.last_page;
- // if (res.data.list.last_page <= 1) {
- // self.no_more = true;
- // } else {
- // self.no_more = false;
- // }
- // }
- // );
let self = this;
self.loading = true;
let dataType = self.dataType;
+ console.log("🚀 ~ dataType:", dataType)
if (dataType == 'all') {
dataType = '';
}
@@ -511,7 +515,7 @@
order_id: self.order_id
},
function(res) {
- this.cancelOrderPopup = false;
+ self.cancelOrderPopup = false;
uni.hideLoading();
uni.showToast({
title: '操作成功',
@@ -654,5 +658,12 @@
}
+.tab-item {
+ font-size: 26rpx;
+}
+.tab-item.active {
+ color: #365A9A;
+ font-size: 30rpx;
+}
diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue
index a82d7a9..e9074c5 100644
--- a/pages/order/cg-order-detail.vue
+++ b/pages/order/cg-order-detail.vue
@@ -91,8 +91,8 @@
预约信息
- 预约时间：2025-03-18 09:00-12:00
- 预约时长：3小时
+ 预约时间：{{ detail.day_time }}
+ 预约时长：{{ detail.hours }}小时
场地信息：
diff --git a/pages/user/index/index.vue b/pages/user/index/index.vue
index 7eec61a..a2243c4 100644
--- a/pages/user/index/index.vue
+++ b/pages/user/index/index.vue
@@ -74,7 +74,7 @@
已预约
-
+