APP
/
ox_zhiNengZhuShou
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

fix all

course
刘嘉炜 4 years ago
parent
3bf1705126
commit
461ad1cd8d
3 changed files with 19 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/components/site/order_modal/order_modal.vue
  2. 3
      src/pages/index/index.vue
  3. 8
      src/pages/site/manage/manage.vue

25
src/components/site/order_modal/order_modal.vue
View File

@ -11,25 +11,25 @@
<view class="om-info-line"> <view class="om-info-line">
<view class="oil-view">订单编号：</view> <view class="oil-view">订单编号：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.order_no || '-' }}</view>
<view class="ov-view">{{ orderInfo.order_no || '' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line" v-if="orderInfo.type != 'take_up_venue'"> <view class="om-info-line" v-if="orderInfo.type != 'take_up_venue'">
<view class="oil-view">创建时间：</view> <view class="oil-view">创建时间：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.created_at || '-' }}</view>
<view class="ov-view">{{ orderInfo.created_at || ' ' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line" v-if="orderInfo.type != 'take_up_venue'"> <view class="om-info-line" v-if="orderInfo.type != 'take_up_venue'">
<view class="oil-view">验证码：</view> <view class="oil-view">验证码：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.verifyt_code || '-' }}</view>
<view class="ov-view">{{ orderInfo.verifyt_code || ' ' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line" v-if="orderInfo.type == 'mini_program'"> <view class="om-info-line" v-if="orderInfo.type == 'mini_program'">
<view class="oil-view">手机号码：</view> <view class="oil-view">手机号码：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.mobile || '-' }}</view>
<view class="ov-view">{{ orderInfo.mobile || ' ' }}</view>
</view> </view>
</view> </view>
@ -49,13 +49,13 @@
<view class="om-info-line"> <view class="om-info-line">
<view class="oil-view">占用原因：</view> <view class="oil-view">占用原因：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.reason || '-' }}</view>
<view class="ov-view">{{ orderInfo.reason || ' ' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line"> <view class="om-info-line">
<view class="oil-view">操作人：</view> <view class="oil-view">操作人：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.operator || '-' }}</view>
<view class="ov-view">{{ orderInfo.operator || ' ' }}</view>
</view> </view>
</view> </view>
</block> </block>
@ -69,13 +69,13 @@
<view class="om-info-line"> <view class="om-info-line">
<view class="oil-view">预订项目：</view> <view class="oil-view">预订项目：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.stadium_name || '-' }}</view>
<view class="ov-view">{{ orderInfo.stadium_name || ' ' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line"> <view class="om-info-line">
<view class="oil-view">预订日期：</view> <view class="oil-view">预订日期：</view>
<view class="oil-view"> <view class="oil-view">
<view class="ov-view">{{ orderInfo.date || '-' }}</view>
<view class="ov-view">{{ orderInfo.date || ' ' }}</view>
</view> </view>
</view> </view>
<view class="om-info-line"> <view class="om-info-line">
@ -103,8 +103,9 @@
</view> </view>
<!-- 固定场 --> <!-- 固定场 -->
<view class="om-btns" v-if="orderInfo.type == 'fixed_venue'"> <view class="om-btns" v-if="orderInfo.type == 'fixed_venue'">
<view class="ob-view" @click="toOrderInfo">订单详情</view>
<view class="ob-view red" @click="cancelOccupy">取消订场</view>
<!-- 测试：固定场地没有详情 -->
<view class="ob-view" v-if="orderInfo.pay_status != 0" @click="toOrderInfo">订单详情</view>
<view class="ob-view red" @click="cancelOccupy" v-if="orderInfo.pay_status!=2">取消订场</view>
<!-- <view class="ob-view red">退款</view> --> <!-- <view class="ob-view red">退款</view> -->
</view> </view>
</view> </view>
@ -121,6 +122,7 @@ export default {
// 是否显示使用状态 // 是否显示使用状态
isShowStatus(){ isShowStatus(){
let { orderInfo } = this; let { orderInfo } = this;
// 测试： 固定场地没有状态
return orderInfo.type == 'mini_program' || orderInfo.type == 'fixed_venue' return orderInfo.type == 'mini_program' || orderInfo.type == 'fixed_venue'
}, },
@ -142,7 +144,6 @@ export default {
} }
}, },
mounted(){ mounted(){
console.warn('2222222222222222222222', this.queryInfo)
this.getOrderInfo(); this.getOrderInfo();
}, },
methods: { methods: {
@ -187,7 +188,7 @@ export default {
case 0: case 0:
return '待扣款' return '待扣款'
case 1: case 1:
return '使用中'
return '待使用'
case 2: case 2:
return '已完成' return '已完成'
case 8: case 8:

3
src/pages/index/index.vue
View File

@ -110,7 +110,8 @@
{ {
id: 5, id: 5,
name: '场地管理', name: '场地管理',
path: '/pages/site/order_list/order_list',
// path: '/pages/site/order_list/order_list', // 20210804 不要占用列表
path: '/pages/site/manage/manage',
serverKey: 1009 // 后端对应权限编号 serverKey: 1009 // 后端对应权限编号
}, },
{ {

8
src/pages/site/manage/manage.vue
View File

@ -83,7 +83,7 @@
<!-- <view class="sfb-continuity-tip">9点至10点为连场预订,请谅解</view> --> <!-- <view class="sfb-continuity-tip">9点至10点为连场预订,请谅解</view> -->
<view class="sfb-selected-section"> <view class="sfb-selected-section">
<view class="sss-bar"> <view class="sss-bar">
<view>已选择场次<text>4</text></view>
<view>已选择场次<text>{{ selectedVenueList.length || 0 }}</text></view>
<view @click="clearSelectedList">清空</view> <view @click="clearSelectedList">清空</view>
</view> </view>
<scroll-view class="sss-list" scroll-y> <scroll-view class="sss-list" scroll-y>
@ -229,11 +229,12 @@ export default {
let _selectedDateTimestamp = new Date(_value.replace(/\-/g, '/')).getTime(); // 选择当天0点时间戳 let _selectedDateTimestamp = new Date(_value.replace(/\-/g, '/')).getTime(); // 选择当天0点时间戳
let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点 let _todayTimestamp = new Date(new Date().toLocaleDateString().replace(/\-/g, '/')).getTime(); // 当天0点
let _oneDateTimestamp = 24*60*60*1000; 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 _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(); let _endTimestamp = _type == 'end' ? _selectedDateTimestamp: new Date(dateList[dateList.length-1].dateStr.replace(/\-/g, '/')).getTime();
if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！'); if(_endTimestamp<_startTimestamp)return util.showNone('请选择正常范围！');
let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed()); let _dateLength = +(((_endTimestamp - _startTimestamp) /_oneDateTimestamp + 1).toFixed());
if(_dateLength>7)return util.showNone('不能超过7天范围！');
let _dateArr = this.getDateList({ let _dateArr = this.getDateList({
startTimestamp: _startTimestamp, startTimestamp: _startTimestamp,
length: _dateLength length: _dateLength
@ -243,7 +244,6 @@ export default {
this.$nextTick(_=>this.refreshVenues()); this.$nextTick(_=>this.refreshVenues());
// if(_type=='end'&&_selectedDateTimestamp-_todayTimestamp<_oneDateTimestamp)return util.showNone('时间段最小一天！'); // if(_type=='end'&&_selectedDateTimestamp-_todayTimestamp<_oneDateTimestamp)return util.showNone('时间段最小一天！');
console.warn(e);
}, },
timeSlotChange(e){ timeSlotChange(e){
console.log(e); console.log(e);
@ -692,7 +692,7 @@ export default {
border-color: #4F7CC7; border-color: #4F7CC7;
background-color: #4F7CC7; background-color: #4F7CC7;
} }
.pistac{
&.pistac{
color: #fff; color: #fff;
background-color: #68C43B; background-color: #68C43B;
border-color: #68C43B; border-color: #68C43B;

Write Preview
Loading…
Cancel
Save