From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
h5/pages/polling/detail.vue | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 2f2620a..228733e 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -42,7 +42,7 @@
<template v-if="item.status == 1">
<view class="line">
<view class="la">宸℃缁撴灉锛�</view>
- <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : '寮傚父' }}</view>
+ <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '姝ｅ父' : item.dealStatus == 1 ? '寮傚父' : '-' }}</view>
</view>
<view class="line">
<view class="la">宸℃鏃堕棿锛�</view>
@@ -83,7 +83,8 @@
id: '',
info: {},
list: [],
- flag: false,
+ flag: false,
+ userInfo: uni.getStorageSync('userInfo') || {},
statusM: [{
color: '#4593f7',
name: '寰呭紑濮�'
@@ -180,8 +181,10 @@
ywPatrolDetail(id).then(res => {
this.info = res.data
let time = new Date(res.data.startDate).getTime()
- console.log('res.data.startDate', new Date().getTime());
- this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1)
+ console.log('res.data.startDate', new Date().getTime());
+ if(res.data.userIds.indexOf(this.userInfo.id) > -1){
+ this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)
+ }
})
ywPatrolTaskRecord({
capacity: 999,
--
Gitblit v1.9.3