From 54513201928b78e24ee9b0ce686264985f3cb479 Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Thu, 11 Dec 2025 01:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/venue.js | 13 +- src/views/recharge/recharge/index.vue | 315 +++++++++++++++++++- src/views/setting/store/index.vue | 298 +++++++++++++++--- src/views/user/user/dialog/RechargeCard.vue | 176 +++++++++++ src/views/user/user/dialog/Record.vue | 197 ++++++++++++ src/views/user/user/index.vue | 32 +- src/views/venue/order/detail.vue | 142 +++++++++ src/views/venue/order/index.vue | 226 ++++++-------- src/views/venue/room/Add.vue | 85 +++++- src/views/venue/room/Edit.vue | 90 +++++- src/views/venue/venue/Add.vue | 4 +- src/views/venue/venue/Edit.vue | 4 +- 12 files changed, 1356 insertions(+), 226 deletions(-) create mode 100644 src/views/user/user/dialog/RechargeCard.vue create mode 100644 src/views/user/user/dialog/Record.vue create mode 100644 src/views/venue/order/detail.vue diff --git a/src/api/venue.js b/src/api/venue.js index 474700b5..155b65c7 100644 --- a/src/api/venue.js +++ b/src/api/venue.js @@ -50,7 +50,18 @@ let VenueApi = { /*场馆订单列表*/ orderGroundList(data, errorback) { return request._post('/shop/order.orderGround/orderGroundList', data, errorback); - }, + }, + + /*场馆订单详情*/ + orderGroundDetails(data, errorback) { + return request._post('/shop/order.orderGround/orderGroundDetails', data, errorback); + }, + + /*余额支付明细*/ + balaceLog(data, errorback) { + return request._post('/shop/user.balance/log', data, errorback); + }, + } export default VenueApi; diff --git a/src/views/recharge/recharge/index.vue b/src/views/recharge/recharge/index.vue index a238d48c..98979b1d 100644 --- a/src/views/recharge/recharge/index.vue +++ b/src/views/recharge/recharge/index.vue @@ -1,3 +1,314 @@ \ No newline at end of file +
+ +
+ + + + + + + + +
+ + +
+ + + + 查询 + + + +
+ +
+
+ + + + + + + + + + + + + + + +
+ + +
+
+ + + diff --git a/src/views/setting/store/index.vue b/src/views/setting/store/index.vue index 36958f63..019a51f5 100644 --- a/src/views/setting/store/index.vue +++ b/src/views/setting/store/index.vue @@ -1,64 +1,148 @@ + diff --git a/src/views/user/user/dialog/RechargeCard.vue b/src/views/user/user/dialog/RechargeCard.vue new file mode 100644 index 00000000..9126c831 --- /dev/null +++ b/src/views/user/user/dialog/RechargeCard.vue @@ -0,0 +1,176 @@ + + + + + diff --git a/src/views/user/user/dialog/Record.vue b/src/views/user/user/dialog/Record.vue new file mode 100644 index 00000000..8f47e9e4 --- /dev/null +++ b/src/views/user/user/dialog/Record.vue @@ -0,0 +1,197 @@ + + + + + diff --git a/src/views/user/user/index.vue b/src/views/user/user/index.vue index a70afbb8..3b63574c 100644 --- a/src/views/user/user/index.vue +++ b/src/views/user/user/index.vue @@ -2,7 +2,7 @@
@@ -10,7 +10,7 @@ - + @@ -72,18 +64,21 @@
- - - + + + + + - + @@ -92,12 +87,14 @@ import UserApi from '@/api/user.js'; import Grade from './dialog/Grade.vue'; import Recharge from './dialog/Recharge.vue'; +import RechargeCard from './dialog/RechargeCard.vue'; import Tag from './dialog/Tag.vue'; export default { components: { /*编辑组件*/ Grade, Recharge, + RechargeCard, Tag }, data() { @@ -208,6 +205,7 @@ export default { /*关闭弹窗*/ closeDialogFunc(e, f) { + console.log("🚀 ~ e, f:", e, f) if (f == 'add') { this.open_add = e.openDialog; if (e.type == 'success') { diff --git a/src/views/venue/order/detail.vue b/src/views/venue/order/detail.vue new file mode 100644 index 00000000..1f9bce65 --- /dev/null +++ b/src/views/venue/order/detail.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/views/venue/order/index.vue b/src/views/venue/order/index.vue index 46636c22..09739f9c 100644 --- a/src/views/venue/order/index.vue +++ b/src/views/venue/order/index.vue @@ -8,11 +8,14 @@
+ + + + - - - + +
@@ -21,6 +24,18 @@ end-placeholder="结束日期">
+ + + 查询 @@ -28,10 +43,6 @@ 导出 - - 批量发货 -
@@ -46,109 +57,45 @@ - - + + - - - - - - - - - - - - - - - - - - - - diff --git a/src/views/venue/room/Add.vue b/src/views/venue/room/Add.vue index 8c15ec1f..4bd77046 100644 --- a/src/views/venue/room/Add.vue +++ b/src/views/venue/room/Add.vue @@ -21,13 +21,36 @@ - - + + + + + + + + + + + + + + + + + + - + @@ -72,8 +95,15 @@ export default { img: '', title: '', price: '', + holiday_price: '', light_price: '', - status: '', + status: 1, + holiday: '', + free_time: [ + '06:00-07:00', + '07:00-08:00', + '08:00-09:00', + ] }, formRules: { ground_id: [{ @@ -93,9 +123,24 @@ export default { }], price: [{ required: true, - message: '请输入场地价格', + message: '普通日期场地价格', + trigger: 'blur' + }], + holiday_price: [{ + required: true, + message: '请输入节假日场地价格', trigger: 'blur' }], + holiday: [{ + required: true, + message: '请选择节假日', + trigger: 'blur' + }], + free_time: [{ + required: true, + message: '请选择免费时间段', + trigger: 'blur' + }], light_price: [{ required: true, message: '请输入灯光价格', @@ -107,6 +152,7 @@ export default { trigger: 'blur' }], }, + options: [], /*左边长度*/ formLabelWidth: '120px', /*是否显示*/ @@ -120,7 +166,17 @@ export default { props: ['open_add', 'addform'], created() { this.dialogVisible = this.open_add; - // this.veuneList + // 生成 6:00-22:00 的时间段，格式为 { value: '06:00-07:00', label: '06:00 - 07:00' } + const start = 6, end = 22; + this.options = []; + for (let i = start; i < end; i++) { + const h1 = i < 10 ? `0${i}` : `${i}`; + const h2 = i + 1 < 10 ? `0${i + 1}` : `${i + 1}`; + this.options.push({ + value: `${h1}:00-${h2}:00`, + label: `${h1}:00 - ${h2}:00` + }); + } this.getVeuneList() }, methods: { @@ -140,8 +196,21 @@ export default { /*添加场地*/ addUser() { let self = this; - let params = self.form; - + // 复制表单数据 + let params = { ...self.form }; + // 处理节假日日期格式 + if (Array.isArray(params.holiday)) { + params.holiday = params.holiday.map(date => { + if (typeof date === 'string') return date; + const d = new Date(date); + const y = d.getFullYear(); + const m = (d.getMonth() + 1).toString().padStart(2, '0'); + const day = d.getDate().toString().padStart(2, '0'); + return `${y}-${m}-${day}`; + }); + params.holiday = params.holiday.join(','); + } + self.$refs.form.validate((valid) => { if (valid) { self.loading = true; diff --git a/src/views/venue/room/Edit.vue b/src/views/venue/room/Edit.vue index c23da6f7..23271dc7 100644 --- a/src/views/venue/room/Edit.vue +++ b/src/views/venue/room/Edit.vue @@ -1,5 +1,5 @@