pref: 绑定设备、匹配pk

src/pages/my-device.vue

@@ -8,7 +8,7 @@ import {
   bindDeviceAPI,
   getMyDevicesAPI,
   unbindDeviceAPI,
-  laserAimAPI,
+  laserAimAPI, bindDeviceAPIV2,
 } from "@/apis";
 import useStore from "@/store";
 import { storeToRefs } from "pinia";
@@ -20,6 +20,7 @@ const { updateDevice } = store;
 const { user, device } = storeToRefs(store);
 const justBind = ref(false);
 const calibration = ref(false);
+const token = ref(null);
 
 // 扫描二维码方法
 const handleScan = () => {
@@ -30,13 +31,14 @@ const handleScan = () => {
     scanType: ["qrCode"],
     success: async (res) => {
       try {
-        const base64Decode = (str) => {
-          // 将 base64 转换为 utf8 字符串
-          const bytes = wx.base64ToArrayBuffer(str);
-          return String.fromCharCode.apply(null, new Uint8Array(bytes));
-        };
-
-        addDevice.value = JSON.parse(base64Decode(res.result));
+        // const base64Decode = (str) => {
+        //   // 将 base64 转换为 utf8 字符串
+        //   const bytes = wx.base64ToArrayBuffer(str);
+        //   return String.fromCharCode.apply(null, new Uint8Array(bytes));
+        // };
+        //
+        // addDevice.value = JSON.parse(base64Decode(res.result));
+        token.value = res.result;
         confirmBindTip.value = true;
       } catch (err) {
         uni.showToast({
@@ -57,8 +59,8 @@ const handleScan = () => {
 };
 
 const confirmBind = async () => {
-  if (!justBind.value && addDevice.value.id) {
-    const result = await bindDeviceAPI(addDevice.value);
+  if (!justBind.value && token.value) {
+    const result = await bindDeviceAPIV2(token.value);
     confirmBindTip.value = false;
     if (result.binded) {
       return uni.showToast({
@@ -66,7 +68,7 @@ const confirmBind = async () => {
         icon: "none",
       });
     }
-    updateDevice(addDevice.value.id, addDevice.value.name);
+    updateDevice(result.deviceId, result.name);
     justBind.value = true;
     uni.showToast({
       title: "绑定成功",