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
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+
+
+
+ 用户昵称: {{ scope.row.user.nickName }}
+
+
+
+
+
+
+ 白银卡
+ 黄金卡
+ 铂金卡
+ 钻石卡
+ 至尊卡
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- 商城设置
-
-
-
-
首页设置
-
-
-
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
充值设置
+
+
+
+
+ 折
+
+
+
+
+
+
+ 折
+
+
+
+
+
+
+ 折
+
+
+
+
+
+
+ 折
+
+
+
+
+
+
+ 折
+
-
联系我们
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 经纬度获取，可通过地图软件获取，例如: http://jingweidu.757dy.com/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 政策协议
-
-
-
-
-
-
提交
-
-
+
+
+ 上传图片
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
@@ -10,7 +10,7 @@
-
+
充值
- 编辑
- 等级
- 标签
- 删除
+ v-auth="'/user/user/rechargeCard'">查看
@@ -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 @@
+
+
+
用户信息
+
+
+ {{ order.nickName }}
+
+
+ ![]()
+
+
+
+
费用明细
+
+
+ 灯光价格: ￥{{ order.light_price }}
+ 灯光总价: ￥{{ order.light_all_price }}
+
+
+ 场地价格: ￥{{ order.room_price }}
+ 场地总价: ￥{{ order.room_all_price }}
+
+
+ ￥{{ order.order_amount }}
+
+
+
+
订单信息
+
+
+
+
+ {{ order.order_sn }}
+
+
+ 待付款
+ 已预约
+ 进行中
+ 已完结
+ 已取消
+ 退订/退款
+
+
+ 余额支付-{{ cardType(order.pay_type) }}
+ 微信支付
+
+
+
+
预定信息
+
+
+ {{ order.name }}
+
+
+
+ {{ order.day_time }}
+
+
+
+
+
{{ index }}
+
+
+ {{ item2.start_time }}-{{ item2.end_time }}
+
+
+
+
+
+
+
+
-
-
-
+
+
@@ -21,6 +24,18 @@
end-placeholder="结束日期">
+
+
+
查询
@@ -28,10 +43,6 @@
导出
-
- 批量发货
-
@@ -46,109 +57,45 @@
-
-
+
+
-
- {{ scope.row.order_source_text }}
- 订单号：{{ scope.row.order_no }}
- 下单时间：{{ scope.row.create_time }}
-
- 取消申请中
-
-
-
-
-
-
- {{ item.product_name }}
-
-
{{ item.product_attr }}
-
{{ item.refund.type.text }}-{{
- item.refund.status.text }}
-
-
-
-
￥ {{ item.product_price }}
-
x{{ item.total_num }}
-
-
用户昵称: {{ scope.row.nickName }}
+
-
-
- {{ scope.row.pay_price }}
- 定金：{{ scope.row.advance.pay_price }}
- 尾款：{{ scope.row.pay_price }}
- (含运费：{{ scope.row.express_price }})
+
+
+
+
+
+ 待付款
+ 已预约
+ 进行中
+ 已完结
+ 已取消
+ 退订/退款
+
+
+
+
+ ￥{{ scope.row.order_amount }}
+
+
-
-
-
-
- {{ scope.row.user ? scope.row.user.nickName : '--' }}
- ID：({{ scope.row.user ? scope.row.user.user_id : '--' }})
-
-
-
-
- {{ scope.row.state_text }}
-
-
-
-
- {{ scope.row.pay_type.text }}
-
-
-
-
- {{ scope.row.delivery_type.text }}
- 手机号:{{ scope.row.user ? scope.row.user.mobile : '--' }}
-
-
-
-
- 未评价
- 已评价
-
-
-
-
+
+
+ 详情
+
+
+
@@ -158,22 +105,6 @@
:total="totalDataNumber">
-
- 1、先按未发货条件筛选后，导出订单
- 2、在导出excel中填写物流公司、物流单号，然后点批量发货导入填好的excel文件
- 3、请检查物流公司是否已经添加到系统，查看
-
-
-
- 上传发货表格
-
-
-
-
-
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 @@
-
@@ -21,8 +21,31 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -72,8 +95,11 @@ export default {
img: '',
title: '',
price: '',
+ holiday_price: '',
light_price: '',
status: '',
+ holiday: '',
+ free_time: []
},
formRules: {
ground_id: [{
@@ -93,9 +119,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: '请输入灯光价格',
@@ -114,13 +155,27 @@ export default {
loading: false,
/*是否上传图片*/
isupload: false,
- veuneList: []
+ veuneList: [],
+ options: [],
+
};
},
props: ['open_edit', 'editform'],
created() {
this.getVeuneList()
+ // 生成 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.dialogVisible = this.open_edit;
console.log(this.editform.model);
this.form.id = this.editform.id;
@@ -128,6 +183,18 @@ export default {
this.form.img = this.editform.img_id;
this.form.title = this.editform.title;
this.form.price = this.editform.price;
+ this.form.holiday_price = this.editform.holiday_price;
+ // 将字符串日期转为 Date 对象，适配 el-date-picker
+ this.form.holiday = this.editform.holiday.split(',').map(str => {
+ // 支持 'YYYY-MM-DD' 格式转 Date
+ if (/^\d{4}-\d{2}-\d{2}$/.test(str)) {
+ return new Date(str.replace(/-/g, '/'));
+ }
+ // 其它格式直接尝试 new Date
+ return new Date(str);
+ });
+ console.log("🚀 ~ this.form.holiday:", this.form.holiday)
+ this.form.free_time = this.editform.free_time;
this.form.light_price = this.editform.light_price;
this.form.status = this.editform.status;
console.log("🚀 ~ this.form:", this.form)
@@ -152,6 +219,19 @@ export default {
addUser() {
let self = this;
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) {
diff --git a/src/views/venue/venue/Add.vue b/src/views/venue/venue/Add.vue
index cfab5a10..5c055615 100644
--- a/src/views/venue/venue/Add.vue
+++ b/src/views/venue/venue/Add.vue
@@ -51,12 +51,12 @@
-
+
diff --git a/src/views/venue/venue/Edit.vue b/src/views/venue/venue/Edit.vue
index 083ea113..e259ddbf 100644
--- a/src/views/venue/venue/Edit.vue
+++ b/src/views/venue/venue/Edit.vue
@@ -51,12 +51,12 @@
-
+