Commit a7790e06 authored by Facius's avatar Facius

详情页面是否显示倒计时bug

parent 3d14258b
......@@ -282,10 +282,10 @@
// title:标题,showCountTime:是否显示倒计时。详情页面情况太多,提前传值可以避免页面晃动
handleClick() {
// if (this.buttonDisabled) return
this.$emit('action', this.orderData, this.title, this.showCountTime)
this.$emit('action', this.orderData, this.title, this.showCountTime ? 'show' : '')
},
handleClickCell() {
this.$emit('click', this.orderData, this.title, this.showCountTime)
this.$emit('click', this.orderData, this.title, this.showCountTime ? 'show' : '')
},
handleChange(timestamp) {
if (this.timeout) this.$refs['order-count-down'].seconds += 2
......
......@@ -2,7 +2,7 @@
<view class="order-wrap">
<u-navbar :title="title" title-color="#FFFFFF" title-size="32" back-icon-color="#FFFFFF" :background="background" :border-bottom="false" title-bold></u-navbar>
<view class="content">
<view class="header" v-if="showCountTime || (order.currentOverTime && showTimeOut)">
<view class="header" v-if="showCountTime || (order.currentOverTime && showTimeOut)">
<image class="bottom-tag-view" :src="tagImage"></image>
<!-- 倒计时 -->
<view class="title">
......@@ -176,10 +176,10 @@
if (option && option.id) {
this.orderId = option.id
}
if (option) {
if (option && option.showCountTime) { // 是否显示倒计时,上个页面传入,可以快速显示避免页面跳动太大;跟后台获取数据之后再根据其他条件判断一次
this.showCountTime = option.showCountTime
}
if (option && option.title) {
if (option && option.title) { // 上个页面传入,可以快速显示避免页面跳动太大
this.title = decodeURIComponent(option.title)
} else {
this.title = "订单信息"
......@@ -566,14 +566,17 @@
this.isAllowDianhuaAndDaohang = true
this.title = '审核中',
this.showFile = true
this.showTimeOut=false
} else if (orderStatus == 86 || orderStatus == 88) { // 异常单
this.isAllowDianhuaAndDaohang = true
this.title = '异常单',
this.showFile = true
this.showTimeOut=false
} else if ([80, 81, 89, 110].indexOf(orderStatus) != -1) { // 已完工
this.isAllowDianhuaAndDaohang = true
this.title = '已完工',
this.showFile = true
this.showTimeOut=false
} else {
this.isAllowDianhuaAndDaohang = true
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment