wangxiaowei/xiuhuwangqiu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善订单

Browse Source
This commit is contained in:
wangxiaowei
2025-12-09 18:03:40 +08:00
parent cba684d7f6
commit f0d16babf0
5 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bundle/reserve/details.vue
View File

@ -101,12 +101,12 @@
<view class="time mx-30rpx">营业时间：{{ venue.day_time }} {{ venue.start_time }}-{{ venue.end_time }}</view> <view class="time mx-30rpx">营业时间：{{ venue.day_time }} {{ venue.start_time }}-{{ venue.end_time }}</view>
<view class="line"></view> <view class="line"></view>
<view class="d-b-c mx-30rpx"> <view class="d-b-c mx-30rpx">
<view class="d-f"> <view class="d-f a-i-c">
<image style="width: 36rpx;height: 36rpx;margin-top: 4rpx;" src="@/static/icon/location2.png" <image style="width: 36rpx;height: 36rpx;margin-top: 4rpx;" src="@/static/icon/location2.png"
mode=""></image> mode=""></image>
<view class=""> <view class="">
<view class="address-time">{{ venue.address }}</view> <view class="address-time">{{ venue.address }}</view>
<view class="address-time">距您{{ venue.distance }}km</view> <!-- <view class="address-time">距您{{ venue.distance }}km</view> -->
</view> </view>
</view> </view>
<view class="d-f"> <view class="d-f">
@ -169,7 +169,8 @@
? 'cg-info-time-select' ? 'cg-info-time-select'
: 'cg-info-time-normal' : 'cg-info-time-normal'
]" > ]" >
￥{{ item3.price }} <template v-if="item3.price > 0">￥{{ item3.price }}</template>
<template v-else>免费</template>
</view> </view>
</view> </view>
</view> </view>
@ -600,14 +601,13 @@ export default {
} }
room_list.push({ room_list.push({
room_id: roomId, room_id: roomId,
day_time: this.selectedWeekDay, day_title: this.selectedWeekDay,
day_title: this.selectedWeekTimes, day_time: this.selectedWeekTimes,
start_time, start_time,
end_time, end_time,
}); });
}); });
}); });
console.log("🚀 ~ room_list:", room_list)
this.selectedReserveTime = room_list; this.selectedReserveTime = room_list;
console.log('🚀 ~ room_list:', this.selectedReserveTime); console.log('🚀 ~ room_list:', this.selectedReserveTime);

8
pages/index/index.vue
View File

@ -605,6 +605,14 @@ export default {
// 场馆预约 // 场馆预约
handleToReserve(id, typeId) { handleToReserve(id, typeId) {
if (typeId == 2) {
uni.showToast({
title: '场馆暂未开放',
duration: 2000,
icon: 'none'
});
return;
}
uni.navigateTo({ uni.navigateTo({
url: `/bundle/reserve/details?id=${id}&typeId=${typeId}` url: `/bundle/reserve/details?id=${id}&typeId=${typeId}`
}); });

73
pages/order/cg-my-order.vue
View File

@ -14,11 +14,17 @@
</navbar> </navbar>
<view class="top-tabbar"> <view class="top-tabbar">
<view :class="state_active == 0 ? 'tab-item active' : 'tab-item'" @click="stateFunc('all')">全部订单</view> <!-- <view :class="state_active == 0 ? 'tab-item active' : 'tab-item'" @click="stateFunc('all')">全部订单</view>
<view :class="state_active == 1 ? 'tab-item active' : 'tab-item'" @click="stateFunc(1)">待付款</view> <view :class="state_active == 1 ? 'tab-item active' : 'tab-item'" @click="stateFunc(1)">待付款</view>
<view :class="state_active == 2 ? 'tab-item active' : 'tab-item'" @click="stateFunc(2)">已预约</view> <view :class="state_active == 2 ? 'tab-item active' : 'tab-item'" @click="stateFunc(2)">已预约</view>
<view :class="state_active == 3 ? 'tab-item active' : 'tab-item'" @click="stateFunc(3)">已完成</view> <view :class="state_active == 3 ? 'tab-item active' : 'tab-item'" @click="stateFunc(3)">已完成</view>
<view :class="state_active == 4 ? 'tab-item active' : 'tab-item'" @click="stateFunc(4)">退订/退款</view> <view :class="state_active == 4 ? 'tab-item active' : 'tab-item'" @click="stateFunc(4)">退订/退款</view> -->
<view :class="state_active == 0 ? 'tab-item active' : 'tab-item'" @click="stateFunc(0)">全部订单</view>
<view :class="state_active == 1 ? 'tab-item active' : 'tab-item'" @click="stateFunc(1)">待付款</view>
<view :class="state_active == 2 ? 'tab-item active' : 'tab-item'" @click="stateFunc(2)">已预约</view>
<view :class="state_active == 3 ? 'tab-item active' : 'tab-item'" @click="stateFunc(3)">进行中</view>
<view :class="state_active == 4 ? 'tab-item active' : 'tab-item'" @click="stateFunc(4)">已完成</view>
<view :class="state_active == 5 ? 'tab-item active' : 'tab-item'" @click="stateFunc(5)">退订/退款</view>
</view> </view>
<view class="d-f a-i-c ball-type-box"> <view class="d-f a-i-c ball-type-box">
@ -247,20 +253,24 @@
if (typeof e.dataType != 'undefined') { if (typeof e.dataType != 'undefined') {
this.dataType = e.dataType; this.dataType = e.dataType;
} }
// state_active 是tab栏的下标，dataType是订单状态，两者不一致，需要转换
if (this.dataType == 'all') { if (this.dataType == 'all') {
// 全部订单
this.state_active = 0; this.state_active = 0;
} else if (this.dataType == 0) { } else if (this.dataType == 0) {
// 待付款
this.state_active = 1; this.state_active = 1;
} else if (this.dataType == 1) { } else if (this.dataType == 1) {
// 已预约
this.state_active = 2; this.state_active = 2;
} else if (this.dataType == 2) { } else if (this.dataType == 3) {
this.state_active = 3; // 已完成
} else if (this.dataType == 4) {
this.state_active = 4; 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() { mounted() {
this.init(); this.init();
@ -307,28 +317,41 @@
self.page = 1; self.page = 1;
self.loading = true; self.loading = true;
self.state_active = e; self.state_active = e;
switch (e) { switch (e) {
case 'all': case 0:
// 全部订单
self.listData = []; self.listData = [];
self.dataType = 'all'; self.dataType = 'all';
break; break;
case 1: case 1:
// 待付款
self.listData = []; self.listData = [];
self.dataType = 0; self.dataType = 0;
break; break;
case 2: case 2:
// 已预约
self.listData = []; self.listData = [];
self.dataType = 1; self.dataType = 1;
break; break;
case 3: case 3:
// 进行中
self.listData = []; self.listData = [];
self.dataType = 2; self.dataType = 2;
break; break;
case 4: case 4:
// 已完成
self.listData = []; self.listData = [];
self.dataType = 4; self.dataType = 3;
break;
case 5:
// 退订/退款
self.listData = [];
self.dataType = 5;
break; break;
} }
console.log("🚀 ~fff self.dataType:", self.dataType)
self.getData(); self.getData();
} }
}, },
@ -349,29 +372,10 @@
/*获取数据*/ /*获取数据*/
getData() { 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; let self = this;
self.loading = true; self.loading = true;
let dataType = self.dataType; let dataType = self.dataType;
console.log("🚀 ~ dataType:", dataType)
if (dataType == 'all') { if (dataType == 'all') {
dataType = ''; dataType = '';
} }
@ -511,7 +515,7 @@
order_id: self.order_id order_id: self.order_id
}, },
function(res) { function(res) {
this.cancelOrderPopup = false; self.cancelOrderPopup = false;
uni.hideLoading(); uni.hideLoading();
uni.showToast({ uni.showToast({
title: '操作成功', title: '操作成功',
@ -654,5 +658,12 @@
} }
.tab-item {
font-size: 26rpx;
}
.tab-item.active {
color: #365A9A;
font-size: 30rpx;
}
</style> </style>

4
pages/order/cg-order-detail.vue
View File

@ -91,8 +91,8 @@
<view class="cg-reserve"> <view class="cg-reserve">
<view class="cg-title">预约信息</view> <view class="cg-title">预约信息</view>
<!-- todo 这里的状态如果是交易完成、订单取消、退款成功则将下面的预约改为使用 --> <!-- todo 这里的状态如果是交易完成、订单取消、退款成功则将下面的预约改为使用 -->
<view class="cg-desc1">预约时间：2025-03-18 09:00-12:00</view> <view class="cg-desc1">预约时间：{{ detail.day_time }}</view>
<view class="cg-desc2">预约时长：3小时</view> <view class="cg-desc2">预约时长：{{ detail.hours }}小时</view>
<template v-if="ballType == 1"> <template v-if="ballType == 1">
<view class="cg-desc2">场地信息：</view> <view class="cg-desc2">场地信息：</view>
<view class="desc" v-for="(item, index) in detail.trade" :key="index"> <view class="desc" v-for="(item, index) in detail.trade" :key="index">

4
pages/user/index/index.vue
View File

@ -74,7 +74,7 @@
</view> </view>
<text class="">已预约</text> <text class="">已预约</text>
</view> </view>
<view class="item" @click="jumpPage('/pages/order/cg-my-order?dataType=2')"> <view class="item" @click="jumpPage('/pages/order/cg-my-order?dataType=3')">
<view class="icon-box pr"> <view class="icon-box pr">
<image src="/static/icon/ywc.png" mode=""></image> <image src="/static/icon/ywc.png" mode=""></image>
<!-- <text class="dot d-c-c" <!-- <text class="dot d-c-c"
@ -82,7 +82,7 @@
</view> </view>
<text>已完成</text> <text>已完成</text>
</view> </view>
<view class="item" @click="jumpPage('/pages/order/cg-my-order?dataType=4')"> <view class="item" @click="jumpPage('/pages/order/cg-my-order?dataType=5')">
<view class="icon-box pr"> <view class="icon-box pr">
<image src="/static/icon/tk.png" mode=""></image> <image src="/static/icon/tk.png" mode=""></image>
<!-- <text class="dot d-c-c" <!-- <text class="dot d-c-c"