From 64985934b6b7378d1c101313083b456a231c7fd5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 03 十二月 2024 17:36:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/polling/detail.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 4d986a3..41553c2 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -7,13 +7,12 @@
<image v-if="info.status == 2" class="icon" src="@/static/side/ic_dabiaoed.png" mode=""></image>
<image v-if="info.status == 3" class="icon" src="@/static/side/ic_dabiao.png" mode=""></image>
<view class="head">
- <view class="name">{{ info.title }}</view>
+ <view class="name">{{ info.title || info.planTitle }}</view>
<view class="status" v-if="info.status || info.status == 0" :style="{color: statusM[info.status].color}">{{statusM[info.status].name}}</view>
</view>
<view class="line">
<view class="la">浠诲姟鏃ユ湡锛�</view>
- <view class="val" v-if="info.startDate && info.endDate">{{ info.startDate.slice(0, 11) }} 鑷�
- {{ info.endDate.slice(0, 11) }}</view>
+ <view class="val" v-if="info.startDate">{{ info.startDate.slice(0, 10) }}</view>
</view>
<view class="line">
<view class="la">鎵ц鏃堕棿锛�</view>
@@ -22,7 +21,7 @@
</view>
<view class="line">
<view class="la">瀹屾垚鎯呭喌锛�</view>
- <view class="val">{{info.finishNum}}/{{info.patrolNum}}</view>
+ <view class="val">{{info.finishNum || 0}}/{{info.patrolNum}}</view>
</view>
</view>
<view class="title">宸℃鐐瑰垪琛�({{list.length}})</view>
@@ -48,7 +47,7 @@
</view>
</view>
</view>
- <view class="footer">
+ <view class="footer" v-if="flag">
<view class="sub_btn">鎵爜宸℃</view>
</view>
</view>
@@ -58,13 +57,15 @@
import {
ywPatrolDetail,
ywPatrolTaskRecord
- } from '@/api'
+ } from '@/api'
+ import dayjs from 'dayjs';
export default {
data() {
return {
id: '',
info: {},
list: [],
+ flag: false,
statusM: [
{ color: '#4593f7', name: '寰呭紑濮�' },
{ color: '#73e09a', name: '杩涜涓�' },
@@ -81,7 +82,8 @@
this.getDetail()
},
methods: {
- itemClick(item) {
+ itemClick(item) {
+ if(!this.flag) return
uni.navigateTo({
url: '/pages/polling/point?id=' + item.id
})
@@ -91,7 +93,9 @@
id
} = this
ywPatrolDetail(id).then(res => {
- this.info = res.data
+ this.info = res.data
+ let time = new Date(res.data.startDate.slice(0, 10) + ' 00:00:00').getTime()
+ this.flag = new Date().getTime() > time
})
ywPatrolTaskRecord({
capacity: 999,
--
Gitblit v1.9.3