From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/polling/detail.vue | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 383395d..45ad7fb 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -34,7 +34,10 @@
<view class="content">
<view class="head">
<view>{{item.pointName}}</view>
- <view class="status" :class="{ gray: item.status == 1 }">{{ item.status == 1 ? '宸插贰妫�' : '寰呭贰妫�' }}</view>
+ <view class="status" :class="{ gray: item.status == 1 }">
+ <image v-if="item.status == 1" src="@/static/plan_ic_finish@2x.png" class="icon" mode=""></image>
+ <text>{{ item.status == 1 ? '宸插贰妫�' : '寰呭贰妫�' }}</text>
+ </view>
</view>
<template v-if="item.status == 1">
<view class="line">
@@ -43,7 +46,10 @@
</view>
<view class="line">
<view class="la">宸℃鏃堕棿锛�</view>
- <view class="val">{{item.dealDate}}</view>
+ <view class="val">
+ <text>{{item.dealDate}}</text>
+ <text v-if="item.status == 1" class="detail">鏌ョ湅璇︽儏</text>
+ </view>
</view>
</template>
<view class="desc" v-else>{{item.content}}</view>
@@ -100,11 +106,11 @@
},
onLoad(option) {
this.id = option.id
+ // this.getDetail()
+ },
+ onShow() {
this.getDetail()
},
- // onShow() {
- // this.getDetail()
- // },
methods: {
openSc() {
this.isScaning = true;
@@ -164,7 +170,7 @@
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.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1)
})
ywPatrolTaskRecord({
capacity: 999,
@@ -268,14 +274,15 @@
margin-bottom: 20rpx;
.la {
- color: #666666;
+ color: #666666;
+
}
}
.list {
- height: calc(100vh - 720rpx);
- overflow: auto;
-
+ height: calc(100vh - 490rpx);
+ overflow: auto;
+ padding-bottom: 160rpx;
.item {
width: 690rpx;
height: 188rpx;
@@ -288,7 +295,18 @@
margin-bottom: 20rpx;
.line {
- margin-bottom: 10rpx;
+ margin-bottom: 10rpx;
+ width: 100%;
+ .val{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex: 1;
+ .detail{
+ color: $primaryColor;
+ font-size: 26rpx;
+ }
+ }
}
.icon {
@@ -311,9 +329,19 @@
margin-bottom: 16rpx;
.status {
- offset-anchor: 28rpx;
+ font-size: 28rpx;
color: $primaryColor;
- font-weight: 400;
+ font-weight: 400;
+ display: flex;
+ align-items: center;
+ .icon{
+ width: 40rpx;
+ height: 40rpx;
+ // border-radius: 50%;
+ // overflow: hidden;
+ background: none;
+ }
+
}
.gray {
--
Gitblit v1.9.3