From 17d7043f10d55429db919238fe639bff1b51ec0e Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 07 二月 2025 15:59:37 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
h5/pages/polling/detail.vue | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 45ad7fb..202dfeb 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -42,13 +42,13 @@
<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>
<view class="val">
<text>{{item.dealDate}}</text>
- <text v-if="item.status == 1" class="detail">鏌ョ湅璇︽儏</text>
+ <text @click="detailClick(item)" v-if="item.status == 1" class="detail">鏌ョ湅璇︽儏</text>
</view>
</view>
</template>
@@ -60,6 +60,7 @@
<view class="sub_btn">鎵爜宸℃</view>
</view>
<!-- -->
+
<view class="reader-box" @click="stopScan" v-if="isScaning">
<view class="reader" id="reader"></view>
</view>
@@ -101,7 +102,9 @@
},
],
html5Qrcode: null,
- isScaning: false,
+ isScaning: false,
+
+
};
},
onLoad(option) {
@@ -126,10 +129,12 @@
},
(decodeText, decodeResult) => {
if (decodeText) { //杩欓噷decodeText灏辨槸閫氳繃鎵弿浜岀淮鐮佸緱鍒扮殑鍐呭
- this.stopScan(); //鍏抽棴鎵爜鍔熻兘
+ this.stopScan(); //鍏抽棴鎵爜鍔熻兘
+ const index = decodeText.indexOf('ywid')
+ let pointCode = decodeText.slice(index + 5)
getPointRecordByCode({
taskId: this.id,
- pointCode: decodeText
+ pointCode
}).then(ress => {
if (ress.data) {
uni.navigateTo({
@@ -155,12 +160,18 @@
if (this.html5Qrcode) {
this.html5Qrcode.stop();
}
- },
+ },
+
itemClick(item) {
if (!this.flag) return
uni.navigateTo({
url: '/pages/polling/point?id=' + item.id
})
+ },
+ detailClick(item) {
+ uni.navigateTo({
+ url: '/pages/polling/point?id=' + item.id
+ })
},
getDetail() {
const {
@@ -170,7 +181,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.info.status == 0 || this.info.status == 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