|
|
|
@ -99,7 +99,7 @@ |
|
|
|
<view class="op-time"> |
|
|
|
<text>开始时间</text> |
|
|
|
<view> |
|
|
|
<input placeholder="选择时间" disabled :value="tempTimer.start" /> |
|
|
|
<input placeholder="选择时间" disabled :value="tempTimer.start || periodInfo.start" /> |
|
|
|
<image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -108,7 +108,7 @@ |
|
|
|
<view class="op-time"> |
|
|
|
<text>截止时间</text> |
|
|
|
<view> |
|
|
|
<input placeholder="选择时间" disabled :value="tempTimer.end" /> |
|
|
|
<input placeholder="选择时间" disabled :value="tempTimer.end || periodInfo.end" /> |
|
|
|
<image mode="aspectFit" src="/static/images/icon/arrow_b2.png"></image> |
|
|
|
</view> |
|
|
|
</view> |
|
|
|
@ -310,8 +310,8 @@ |
|
|
|
let _obj = { start: '', end: '' }; |
|
|
|
|
|
|
|
if(type == 3 ){ |
|
|
|
_obj['start']=util.formatDate({}); |
|
|
|
_obj['end'] = util.formatDate({date: _afterSeven}); |
|
|
|
_obj['start']=util.formatDate({date: _beforeSeven}); |
|
|
|
_obj['end'] = util.formatDate({}); |
|
|
|
} |
|
|
|
|
|
|
|
if(type == 4 || type == 1){ |
|
|
|
@ -344,13 +344,20 @@ |
|
|
|
}, |
|
|
|
confirmPeriod(){ |
|
|
|
let { start, end } = this.tempTimer; |
|
|
|
let { tempTimer, periodInfo } = this; |
|
|
|
let _start = tempTimer.start || periodInfo.start || ''; |
|
|
|
let _end = tempTimer.end || periodInfo.end || ''; |
|
|
|
this.periodInfo = { |
|
|
|
start: _start, |
|
|
|
end: _end, |
|
|
|
}; |
|
|
|
|
|
|
|
if( |
|
|
|
!start || !end || |
|
|
|
new Date(start.replace(/\-/g,'/')).getTime()>=new Date(end.replace(/\-/g,'/')).getTime() |
|
|
|
// !start || !end || |
|
|
|
new Date(start.replace(/\-/g,'/')).getTime()> new Date(end.replace(/\-/g,'/')).getTime() |
|
|
|
)return util.showNone('请选择合理时间！'); |
|
|
|
|
|
|
|
this.periodInfo = { ...this.tempTimer }; |
|
|
|
|
|
|
|
this.hidePeriodModal(); |
|
|
|
this.$nextTick(this.refreshList); |
|
|
|
}, |
|
|
|
@ -564,13 +571,13 @@ |
|
|
|
case 9: // 咖啡机 筛选 status ： 全部 1,4 交易成功 1 退款完成 4 |
|
|
|
return [ {id: '1,4', name: '全部'}, {id: 1, name: '交易成功'}, {id: 4, name: '退款完成 '}]; |
|
|
|
case 7: // 储物柜 筛选 status ： 全部 1,2,4 寄存中 1 已完成 2 退款完成 4 |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成 '}]; |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '寄存中'}, {id: 2, name: '已完成'}, {id: 4, name: '退款完成'}]; |
|
|
|
case 14: // 赛事订单列表 订单状态 全部1,2,4 1=进行中 4=已退款 2=已完成 |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款 '}]; |
|
|
|
case 2: // 商城订单 0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款 商家助手全部1,2,3,6 |
|
|
|
return [ {id: '1,2,3,6', name: '全部'}, {id: 0, name: '待支付'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '已完成 '}, {id: 4, name: '已关闭 '}, {id: 5, name: '退款中 '}, {id: 6, name: '已退款 '}]; |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '进行中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'}]; |
|
|
|
case 2: // 商城订单 0/1/2/3/4/5/6 - 待支付/待发货/已发货/已完成/已关闭/退款中/已退款 商家助手全部1,2,3,6 // 测试： 不显示全部分组 |
|
|
|
return [ {id: '0,1,2,3,4,5,6', name: '全部'}, {id: 1, name: '待发货'}, {id: 2, name: '已发货'}, {id: 3, name: '交易完成'}, {id: 5, name: '申请售后中'}, {id: 6, name: '退款完成'}]; |
|
|
|
case 8: // 租售柜 筛选的 status 全部 1,2,4 租用中 1 已完成 2 已退款4 已购买5 |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成 '}, {id: 4, name: '已退款 '},{id: 5, name: '已购买 '}]; |
|
|
|
return [ {id: '1,2,4', name: '全部'}, {id: 1, name: '租用中'}, {id: 2, name: '已完成'}, {id: 4, name: '已退款'},{id: 5, name: '已购买'}]; |
|
|
|
default: |
|
|
|
return [] |
|
|
|
} |
|
|
|
|
