diff --git a/src/components/site/order_modal/order_modal.vue b/src/components/site/order_modal/order_modal.vue
index f176d05..a86176c 100644
--- a/src/components/site/order_modal/order_modal.vue
+++ b/src/components/site/order_modal/order_modal.vue
@@ -11,25 +11,25 @@
订单编号：
- {{ orderInfo.order_no || '-' }}
+ {{ orderInfo.order_no || '' }}
创建时间：
- {{ orderInfo.created_at || '-' }}
+ {{ orderInfo.created_at || ' ' }}
验证码：
- {{ orderInfo.verifyt_code || '-' }}
+ {{ orderInfo.verifyt_code || ' ' }}
手机号码：
- {{ orderInfo.mobile || '-' }}
+ {{ orderInfo.mobile || ' ' }}
@@ -49,13 +49,13 @@
占用原因：
- {{ orderInfo.reason || '-' }}
+ {{ orderInfo.reason || ' ' }}
操作人：
- {{ orderInfo.operator || '-' }}
+ {{ orderInfo.operator || ' ' }}
@@ -69,13 +69,13 @@
预订项目：
- {{ orderInfo.stadium_name || '-' }}
+ {{ orderInfo.stadium_name || ' ' }}
预订日期：
- {{ orderInfo.date || '-' }}
+ {{ orderInfo.date || ' ' }}
@@ -103,8 +103,9 @@
- 订单详情
- 取消订场
+
+ 订单详情
+ 取消订场
@@ -121,6 +122,7 @@ export default {
// 是否显示使用状态
isShowStatus(){
let { orderInfo } = this;
+ // 测试： 固定场地没有状态
return orderInfo.type == 'mini_program' || orderInfo.type == 'fixed_venue'
},
@@ -142,7 +144,6 @@ export default {
}
},
mounted(){
- console.warn('2222222222222222222222', this.queryInfo)
this.getOrderInfo();
},
methods: {
@@ -187,7 +188,7 @@ export default {
case 0:
return '待扣款'
case 1:
- return '使用中'
+ return '待使用'
case 2:
return '已完成'
case 8:
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index b71754f..a7d727d 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -110,7 +110,8 @@
{
id: 5,
name: '场地管理',
- path: '/pages/site/order_list/order_list',
+ // path: '/pages/site/order_list/order_list', // 20210804 不要占用列表
+ path: '/pages/site/manage/manage',
serverKey: 1009 // 后端对应权限编号
},
{
diff --git a/src/pages/site/manage/manage.vue b/src/pages/site/manage/manage.vue
index 174c47b..35b1e25 100644
--- a/src/pages/site/manage/manage.vue
+++ b/src/pages/site/manage/manage.vue
@@ -83,7 +83,7 @@
- 已选择场次4
+ 已选择场次{{ selectedVenueList.length || 0 }}
清空
@@ -229,11 +229,12 @@ export default {
let _selectedDateTimestamp = new Date(_value.replace(/\-/g, '/')).getTime(); // 选择当天0点时间戳
let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点
let _oneDateTimestamp = 24*60*60*1000;
- if(_selectedDateTimestamp<_todayTimestamp)return util.showNone(`请选择${new Date().toLocaleDateString().replace(/\-/g, '/')}之后日期`);
+ // if(_selectedDateTimestamp<_todayTimestamp)return util.showNone(`请选择${new Date().toLocaleDateString().replace(/\-/g, '/')}之后日期`);
let _startTimestamp = _type == 'start' ? _selectedDateTimestamp : new Date(dateList[0].dateStr.replace(/\-/g, '/')).getTime();
let _endTimestamp = _type == 'end' ? _selectedDateTimestamp: new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime();
if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！');
let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed());
+ if(_dateLength>7)return util.showNone('不能超过7天范围！');
let _dateArr = this.getDateList({
startTimestamp: _startTimestamp,
length: _dateLength
@@ -243,7 +244,6 @@ export default {
this.$nextTick(_=>this.refreshVenues());
// if(_type=='end'&&_selectedDateTimestamp-_todayTimestamp<_oneDateTimestamp)return util.showNone('时间段最小一天！');
- console.warn(e);
},
timeSlotChange(e){
console.log(e);
@@ -692,7 +692,7 @@ export default {
border-color: #4F7CC7;
background-color: #4F7CC7;
}
- .pistac{
+ &.pistac{
color: #fff;
background-color: #68C43B;
border-color: #68C43B;