diff --git a/src/api/venue.js b/src/api/venue.js index 155b65c7..84f82072 100644 --- a/src/api/venue.js +++ b/src/api/venue.js @@ -62,6 +62,10 @@ let VenueApi = { return request._post('/shop/user.balance/log', data, errorback); }, + /*场地使用率*/ + groundRoomRate(data, errorback) { + return request._post('/shop/ground.groundRoom/groundRoomRate', data, errorback); + }, } export default VenueApi; diff --git a/src/views/venue/order/detail.vue b/src/views/venue/order/detail.vue index 1f9bce65..9e25882a 100644 --- a/src/views/venue/order/detail.vue +++ b/src/views/venue/order/detail.vue @@ -13,11 +13,11 @@
费用明细
-
灯光价格: ¥{{ order.light_price }}
+
灯光价格: ¥{{ order.light_price }}/小时
灯光总价: ¥{{ order.light_all_price }}
-
场地价格: ¥{{ order.room_price }}
+
场地价格: ¥{{ order.room_price }}/小时
场地总价: ¥{{ order.room_all_price }}
@@ -37,8 +37,8 @@ 待付款 已预约 - 进行中 - 已完结 + 进行中 + 已完结 已取消 退订/退款 diff --git a/src/views/venue/room/Add.vue b/src/views/venue/room/Add.vue index 4bd77046..c71b8243 100644 --- a/src/views/venue/room/Add.vue +++ b/src/views/venue/room/Add.vue @@ -48,6 +48,17 @@ + + + + + + + @@ -103,7 +114,8 @@ export default { '06:00-07:00', '07:00-08:00', '08:00-09:00', - ] + ], + hit_time:[] }, formRules: { ground_id: [{ @@ -140,6 +152,11 @@ export default { required: true, message: '请选择免费时间段', trigger: 'blur' + }], + hit_time: [{ + required: true, + message: '请选择高峰时间段', + trigger: 'blur' }], light_price: [{ required: true, diff --git a/src/views/venue/room/Data.vue b/src/views/venue/room/Data.vue new file mode 100644 index 00000000..a51e705b --- /dev/null +++ b/src/views/venue/room/Data.vue @@ -0,0 +1,126 @@ + + + + + diff --git a/src/views/venue/room/Edit.vue b/src/views/venue/room/Edit.vue index 23271dc7..5015018a 100644 --- a/src/views/venue/room/Edit.vue +++ b/src/views/venue/room/Edit.vue @@ -47,6 +47,17 @@ + + + + + + + @@ -99,7 +110,8 @@ export default { light_price: '', status: '', holiday: '', - free_time: [] + free_time: [], + hit_time: [], }, formRules: { ground_id: [{ @@ -136,7 +148,12 @@ export default { required: true, message: '请选择免费时间段', trigger: 'blur' - }], + }], + hit_time: [{ + required: true, + message: '请选择高峰期时间段', + trigger: 'blur' + }], light_price: [{ required: true, message: '请输入灯光价格', @@ -195,6 +212,7 @@ export default { }); console.log("🚀 ~ this.form.holiday:", this.form.holiday) this.form.free_time = this.editform.free_time; + this.form.hit_time = this.editform.hit_time; this.form.light_price = this.editform.light_price; this.form.status = this.editform.status; console.log("🚀 ~ this.form:", this.form) diff --git a/src/views/venue/room/index.vue b/src/views/venue/room/index.vue index 8e84d8ce..15e048c6 100644 --- a/src/views/venue/room/index.vue +++ b/src/views/venue/room/index.vue @@ -48,6 +48,8 @@ v-auth="'/venue/room/edit'">编辑 删除 + 使用率 @@ -65,6 +67,8 @@ + + @@ -73,12 +77,14 @@ import UserApi from '@/api/user.js'; import VenueApi from '@/api/venue.js'; import Add from './Add.vue'; import Edit from './Edit.vue'; +import Data from './Data.vue'; export default { components: { /*编辑组件*/ Edit, - Add + Add, + Data }, data() { return { @@ -102,6 +108,7 @@ export default { open_add: false, /*是否打开编辑弹窗*/ open_edit: false, + open_data: false, /*当前编辑的对象*/ venueModel: {}, veuneList: {} @@ -208,6 +215,12 @@ export default { this.getTableList(); } } + if (f == 'data') { + this.open_add = e.openDialog; + if (e.type == 'success') { + this.getTableList(); + } + } }, /*删除场地*/ @@ -246,7 +259,13 @@ export default { .catch(() => { self.loading = false; }); - } + }, + + // 打开使用率 + dataClick(item) { + this.open_data = true; + this.venueModel = item; + }, } }; diff --git a/src/views/venue/venue/index.vue b/src/views/venue/venue/index.vue index e4fd9f1e..81116395 100644 --- a/src/views/venue/venue/index.vue +++ b/src/views/venue/venue/index.vue @@ -29,7 +29,7 @@ 编辑 删除 + v-auth="'/venue/venue/delete'">删除 @@ -55,12 +55,14 @@ import UserApi from '@/api/user.js'; import VenueApi from '@/api/venue.js'; import Add from './Add.vue'; import Edit from './Edit.vue'; +import Data from './Edit.vue'; export default { components: { /*编辑组件*/ Edit, - Add + Add, + Data }, data() { return {