刷卡功能对接中

api/apiAdmin.js

@@ -13,4 +13,8 @@ export const GetAreaListApi = (data) =>
 
 // 用户数据
 export const GetUserDataApi = (data) =>
-  request.get("/api/AdminApp/GetUserData", data);
+  request.get("/api/AdminApp/GetUserData", data);
+
+// Nfc重置
+export const ResetNFCApi = (data) =>
+  request.post("/api/Region/ResetNFC", data);

pages/adminHome/index.vue

@@ -29,7 +29,7 @@
           <image class="card-img" style="width: 130rpx; height: 130rpx" src="/static/adminImg/card4.png"></image>
         </view>
       </view>
-      <view v-if="true" style="display: flex">
+      <view v-if="false" style="display: flex">
         <u-button type="error" @click="testFn">调试录入卡片</u-button>
       </view>
     </view>

pages/adminNfc/components/bindDialog.vue

@@ -9,7 +9,7 @@
         <!-- 头部标题和标签 -->
         <view class="dialog-header">
           <text class="title">{{ currentRow.name }}</text>
-          <u-tag class="tag" text="室内" mode="light" />
+          <!-- <u-tag class="tag" text="室内" mode="light" /> -->
           <!-- <u-tag
             class="tag"
             :text="areaType"
@@ -25,8 +25,9 @@
         </view>
 
         <!-- 副标题 - 负责人 -->
-        <view class="dialog-subtitle"> 区域主负责人：{{ "张三" }} </view>
-
+        <!-- <view class="dialog-subtitle"> 区域主负责人：张三 </view> -->
+        <view>传入参数：{{ showMsg }}</view>
+        <view>接口返回结果：{{ resData }}</view>
         <!-- 已存在卡片时显示图片 -->
         <view class="dialog-image-container" v-if="isChange === true">
           <!-- 替换为实际的图片路径 -->
@@ -48,7 +49,8 @@
         <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 === 4">{{ lookData }}</view>
+        <!-- <view v-if="step === 3">{{ lookData }}</view> -->
+        <!-- <view v-if="step === 4">{{ lookData }}</view> -->
       </view>
 
       <!-- 底部按钮 -->
@@ -60,7 +62,7 @@
 </template>
 
 <script>
-import { loginApi } from '@/api/apiList'
+import { ResetNFCApi } from '@/api/apiAdmin'
 export default {
   props: {
     // 控制弹窗显示/隐藏
@@ -80,20 +82,35 @@ export default {
     return {
       isChange: false,
       step: 0,
-      lookData: {}
+      lookData: {},
+      resData: {},
+      showMsg: ''
     }
   },
   mounted() {
-    window.nfcInitFn = this.nfcInitFn
+    // window.nfcInitFn = this.nfcInitFn
   },
   onLoad() { },
   methods: {
-    nfcInitFn(data) {
+    async nfcInitFn(data) {
       if (!data) {
-        return uni.showToast({ title: '未传入参数 initFn', icon: 'none' })
+        uni.showToast({ title: '未传入参数nfcInitFn', icon: 'none' })
+        return
+      }
+      this.showMsg = data
+      // uni.showModal({
+      //   title: "提示",
+      //   content: JSON.stringify(data) || '未传入参数',
+      //   success: function (res) {
+      //   },
+      // });
+      if (data.step === 8) {
+        uni.showToast({ title: '刷卡失败', icon: 'none' })
+        return
       }
       if (this.isChange === true) {
-        return uni.showToast({ title: '请点击更换绑定后刷卡', icon: 'none' })
+        uni.showToast({ title: '请点击更换绑定后刷卡', icon: 'none' })
+        return
       }
       if (data.step === 1) {
         this.step = 1
@@ -103,6 +120,53 @@ export default {
       }
       if (data.step === 3) {
         this.step = 3
+        this.lookData = data
+        const req = {
+          "AreaId": data.areaId,
+          "pwd": data.pwd,
+          "isAdd": !this.currentRow.state,
+          // "isAdd": true,
+        }
+        console.log(req, '重置nfc--req')
+        console.log(666);
+
+        // uni.showLoading({ title: '加载中...' })
+        const res = await ResetNFCApi(req).catch(e => e)
+        if (!res.succeed) {
+          uni.showToast({ title: res.error || '绑定失败', icon: 'none' })
+        }
+        this.resData = res;
+        try {
+          if (isAndroid && AndroidJs) {
+            console.log("%c%s", "color:red", "安卓--调用方法");
+            const reqRow = {
+              name: "resetNFCRes",
+              data: res,
+            };
+            console.log(reqRow, 'reqRow--')
+            AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参
+          } else {
+            console.log("%c%s", "color:red", "苹果--调用方法");
+            const reqRow = {
+              name: "back-iphone",
+              data: "",
+            };
+            window.webkit.messageHandlers.func.postMessage(JSON.stringify(reqRow)); // 给ios 传参
+          }
+        } catch (e) {
+          console.log(e, "e-----判断安卓苹果类型出错");
+        }
+        return
+        // uni.hideLoading()
+        console.log(res, '重置nfc')
+        this.resData = res;
+        if (res.succeed) {
+          uni.showToast({ title: '绑定成功', icon: 'none' })
+        } else {
+
+          uni.showToast({ title: res.error || '绑定失败', icon: 'none' })
+        }
+        return
       }
       if (data.step === 4) {
         this.lookData = data
@@ -124,17 +188,21 @@ export default {
     nfcChange() {
       this.isChange = false
       this.step = 1
+      console.log(this.currentRow, 'this.currentRow--')
+      // 给安卓传参
+      let u = navigator.userAgent;
+      let isAndroid = u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
       try {
         if (isAndroid && AndroidJs) {
           console.log("%c%s", "color:red", "安卓--调用方法");
           const reqRow = {
             name: "area",
             data: {
-              state: this.currentRow.state,
+              // state: this.currentRow.state,
+              state: true,
               areaId: this.currentRow.id,
             },
           };
-          console.log(reqRow, 'reqRow--')
           AndroidJs.func(JSON.stringify(reqRow)); // 给安卓传参
         } else {
           console.log("%c%s", "color:red", "苹果--调用方法");

pages/adminNfc/index.vue

@@ -117,6 +117,7 @@ export default {
       // 给安卓传参
       let u = navigator.userAgent;
       let isAndroid = u.indexOf("Android") > -1 || u.indexOf("Adr") > -1; //android
+      console.log(row.state, 'row.state--')
       // 添加的时候给安卓传参
       if (row.state === false) {
         try {
@@ -125,7 +126,8 @@ export default {
             const reqRow = {
               name: "area",
               data: {
-                state: row.state,
+                // state: row.state,
+                state: true,
                 areaId: row.id,
               },
             };
@@ -147,6 +149,8 @@ export default {
       console.log(JSON.parse(JSON.stringify(row)), 'row--')
       this.currentRow = row
       this.$refs.dialogRef.isChange = row.state // 重置弹窗状态
+      this.$refs.dialogRef.resData = ''
+      this.$refs.dialogRef.showMsg = ''
       this.$refs.dialogRef.step = 0 // 重置弹窗状态
       if (row.state === false) {
         this.$refs.dialogRef.step = 1 // 重置弹窗状态

pages/login/login.vue

@@ -18,6 +18,7 @@
 </template>
 <script>
 import bcrypt from "bcryptjs";
+import { jwtDecode } from "jwt-decode";
 import { loginApi } from "@/api/apiList";
 export default {
   data() {
@@ -74,6 +75,8 @@ export default {
       }
       let token = res.data;
       uni.setStorageSync("token", "Bearer " + token);
+      console.log(jwtDecode(token), "解析的token信息");
+      // return
       console.log(type, "type--");
       if (type === "user") {
         const normalTabBar = [