完善逻辑

pages/adminNfc/components/bindDialog.vue

@@ -9,25 +9,16 @@
         <!-- 头部标题和标签 -->
         <view class="dialog-header">
           <text class="title">{{ currentRow.name }}</text>
-          <!-- <u-tag class="tag" text="室内" mode="light" /> -->
+          <u-tag v-if="currentRow.areaType === '室内'" class="tag" text="室内" mode="light" />
-          <!-- <u-tag
+          <u-tag v-if="currentRow.areaType === '室外'" class="tag" text="室外" mode="light" type="success" />
-            class="tag"
+          <u-tag v-if="currentRow.areaType === '特殊'" class="tag" text="特殊" mode="light" type="warning" />
-            :text="areaType"
-            mode="light"
-            :type="
-              areaType === '室外'
-                ? 'success'
-                : areaType === '特殊'
-                ? 'warning'
-                : 'primary'
-            "
-          /> -->
         </view>
-
         <!-- 副标题 - 负责人 -->
         <!-- <view class="dialog-subtitle"> 区域主负责人：张三 </view> -->
         <view>传入参数：{{ showMsg }}</view>
         <view>接口返回结果：{{ resData }}</view>
+
+
         <!-- 已存在卡片时显示图片 -->
         <view class="dialog-image-container" v-if="isChange === true">
           <!-- 替换为实际的图片路径 -->
@@ -49,8 +40,6 @@
         <view v-if="step === 1">1.请将标签卡贴靠设备NFC识别处！</view>
         <view v-if="step === 2">2.如果确定将该卡片写入该区域,请将标签卡贴靠设备xNFC识别处，否则请退出！</view>
         <view v-if="step === 3">3.请再次将标签卡贴靠设备NFC识别处！</view>
-        <!-- <view v-if="step === 3">{{ lookData }}</view> -->
-        <!-- <view v-if="step === 4">{{ lookData }}</view> -->
       </view>
 
       <!-- 底部按钮 -->
@@ -82,6 +71,7 @@ export default {
     return {
       isChange: false,
       step: 0,
+      isAdd: false,
       lookData: {},
       resData: {},
       showMsg: ''
@@ -124,7 +114,7 @@ export default {
         const req = {
           "AreaId": data.areaId,
           "pwd": data.pwd,
-          "isAdd": !this.currentRow.state,
+          "isAdd": this.isAdd,
           // "isAdd": true,
         }
         console.log(req, '重置nfc--req')
@@ -168,9 +158,15 @@ export default {
         }
         return
       }
+      // 写入完成
       if (data.step === 4) {
+        uni.showToast({ title: '绑定成功', icon: 'none' })
         this.lookData = data
         this.step = 4
+        this.$emit('closeRes') // 兼容只使用 :visible 和 @close 的情况
+        return
+        this.isAdd = true
+        this.isChange = true
         // uni.showModal({
         //   title: '查看',
         //   content: JSON.stringify(data) || '未传入参数 initFn',

pages/adminNfc/index.vue

@@ -33,10 +33,10 @@
     <!-- 列表 -->
     <view class="list-box">
       <scroll-view :scroll-y="true" class="scroll-Y">
-        <view v-for="item in sonList" class="item-box">
+        <view v-for="item in sonList" class="item-box" @click="dialogShowFn(item)">
           <view class="item-title">{{ item.name }}</view>
-          <view v-if="item.state === true" class="btn-have btn" @click="dialogShowFn(item)">已绑定</view>
+          <view v-if="item.state === true" class="btn-have btn">已绑定</view>
-          <view v-if="item.state === false" class="btn-none btn" @click="dialogShowFn(item)">去绑定</view>
+          <view v-if="item.state === false" class="btn-none btn">去绑定</view>
         </view>
         <view v-if="!sonList.length" style="height:100rpx;"></view>
         <u-empty v-if="!sonList.length" text="数据为空" mode="list"></u-empty>
@@ -46,7 +46,7 @@
     <u-action-sheet :list="options" title="请选择" @click="changeFn" v-model:value="selectShow"></u-action-sheet>
     <!-- 弹窗 -->
     <bind-dialog ref="dialogRef" :visible="showDialog" @close="showDialog = false" :currentRow="currentRow"
-      @changeBinding="onChangeBinding" @confirm="onConfirm"></bind-dialog>
+      @changeBinding="onChangeBinding" @confirm="onConfirm" @closeRes="closeResFn"></bind-dialog>
 
     <u-tabbar :list="vuex_tabbar"></u-tabbar>
   </view>
@@ -151,6 +151,7 @@ export default {
       this.$refs.dialogRef.isChange = row.state // 重置弹窗状态
       this.$refs.dialogRef.resData = ''
       this.$refs.dialogRef.showMsg = ''
+      this.$refs.dialogRef.isAdd = !row.state
       this.$refs.dialogRef.step = 0 // 重置弹窗状态
       if (row.state === false) {
         this.$refs.dialogRef.step = 1 // 重置弹窗状态
@@ -172,6 +173,14 @@ export default {
         this.getSonAreaFn()
       }
     },
+    // 绑定成功
+    closeResFn() {
+      this.showDialog = false
+      uni.showToast({ title: '绑定成功', icon: 'none' })
+      setTimeout(() => {
+        this.getSonAreaFn()
+      }, 500)
+    },
     // 获取子区域列表
     async getSonAreaFn() {
       const req = {