NFC

src/pages/business/polling/optionDetail.vue

@@ -94,10 +94,20 @@
                                         <view>{{ item.pointName }}</view>
                                     </view>
                                     <!-- #ifdef APP-PLUS -->
-                                    <view class="r-right"  @click.stop="initNFC(item,index)">
+                                    <view class="r-right r-active" v-if="item.resultContent"  @click.stop="initNFC(item,index)">
+                                        <img :src="'static/images/polling/icon-NFCcode-b.png'" class="img-nfc" />
+                                        <view>识别成功<view class="r-font">点击再次识别</view></view>
+                                    </view>
+                                    <view class="r-right" v-else  @click.stop="initNFC(item,index)">
                                         <img :src="'static/images/polling/icon-NFCcode.png'" class="img-nfc" /> 开始识别
                                     </view>
                                     <!-- #endif -->
+                                    <!-- #ifndef APP-PLUS -->
+                                    <view class="r-right r-active">
+                                        <img :src="'static/images/polling/icon-NFCcode-b.png'" class="img-nfc" />
+                                        <view>识别成功</view>
+                                    </view>
+                                    <!-- #endif -->
                                 </view>
                             </block>
                             <!-- 扫码 -->
@@ -204,17 +214,21 @@
         @close="handlePreviewClose"
     ></mediaPreview>
 
-    <!-- NFC 弹窗 -->
-    <NFCTemplate v-if="nfcShow" ref="nfcTemplateRef"
-       @close="nfcClose"
-       @confirm="nfcConfirm"
-    ></NFCTemplate>
+
+    <!-- NFC 数据读取 -->
+    <NFCTemplate 
+        v-if="nfcShow" 
+        ref="nfcReaderRef" 
+        @changeNfc="handleNfcData"
+        @close="nfcClose"
+     />
 </view>
 </template>
 <script setup>
 import { ref,onMounted,onUnmounted,nextTick,computed,reactive,getCurrentInstance } from 'vue'
 import { onLoad,onHide} from '@dcloudio/uni-app';
 import { MINIO_KEY } from '@/enums/cacheEnums';
+
 import customHeader from '@/components/customHeader.vue';
 import MescrollUni from 'mescroll-uni/mescroll-uni.vue';
 import multipleSelect from "@/components/multipleSelect.vue";
@@ -222,6 +236,7 @@ import pollingShowModal from "@/components/pollingShowModal.vue";
 import customShowModal from "@/components/customShowModal.vue"
 import mediaPreview from "@/components/mediaPreview.vue"
 import NFCTemplate from "@/components/NFCTemplate.vue"
+
 import { parseTime } from '@/utils/datetime.js';
 import { formatTaskStatus } from '@/utils/status.js';
 import { taskGroupDetail,submitResult,minioUpload } from '@/api/polling.js'
@@ -370,7 +385,11 @@ const chooseImage = (item) => {
                     minioUpload(param).then(res=>{
                         let data = res.data;
                         // console.log("444图片上传成功=>",data)
-                        imgArr2.value.push(data.fileUrl)
+                        // imgArr2.value.push(data.fileUrl)
+                        imgArr2.value.push({
+                            shortUrl:minioObj.minioThumbUrl +"/"+data.fileName,
+                            url:minioObj.minioUrl +"/"+data.fileName,
+                        })
                         imgArr.value.push(data.fileName)//传给后台的路径
                         item.resultContent = imgArr.value.join(",")
                     })
@@ -432,7 +451,7 @@ let isVisible= ref(false);//放大处理
 let mediaUrl= ref('');//放大地址
 let videoShow = ref(true);
 const showMediaPreview=(item)=>{
-    console.log("showMediaPreview===")
+    // console.log("showMediaPreview===")
     isVisible.value = true;
     videoShow.value = false;
     mediaUrl.value = item.url
@@ -443,10 +462,8 @@ const handlePreviewClose=()=>{
 }
 
 // nfc 处理
-let cardUID = ref('');
-let cardValue = ref('');
 let nfcShow = ref(false);
-const nfcTemplateRef = ref(null);
+const nfcReaderRef = ref(null);
 // optionObj.pointList
 let nfcIndex = ref(0);
 const initNFC = async(item,index) => {
@@ -455,19 +472,22 @@ const initNFC = async(item,index) => {
     // uni.navigateTo({url:'/pages/business/polling/nfcTest/index'})
     // #ifdef APP-PLUS
     setTimeout(()=>{
-        // console.log("nfcTemplateRef==",nfcTemplateRef.value)
-        if (nfcTemplateRef.value) {
-            nfcTemplateRef.value.listenNFCStatus();
+        if(nfcReaderRef.value){
+            nfcReaderRef.value.open();
         }
-    },500)
+    },50)
     // #endif
 }
 const nfcClose = async(item) => {
     nfcShow.value = false;
 }
-const nfcConfirm=(result)=>{
-    console.log("confirm=>",result)
-    optionObj.pointList[nfcIndex].resultContent = result
+
+const handleNfcData=(data)=>{
+    console.log("NFC数据:", data);
+    console.log("NFC数据1111:",  optionObj.value.pointList,nfcIndex.value)
+    optionObj.value.pointList[nfcIndex.value].resultContent = data;
+    console.log("NFC数据1111:",  optionObj.value.pointList[nfcIndex.value])
+    // nfcShow.value = false;
 }
 
 // 扫二维码