From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
h5/pages/polling/detail.vue | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/h5/pages/polling/detail.vue b/h5/pages/polling/detail.vue
index 45ad7fb..2f2620a 100644
--- a/h5/pages/polling/detail.vue
+++ b/h5/pages/polling/detail.vue
@@ -48,7 +48,7 @@
<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 {
--
Gitblit v1.9.3