更新配网添加二维码检测

api/device/device.js

@@ -96,7 +96,13 @@ export function getDevcieByQrcode(id){
         method: 'get',
     })
 }
-
+//根据二维码ID找到设备详情
+export function getDevcieByQrcodeID(id){
+    return request({
+        url: '/iot/device/getDeviceByQrcodeId?qrcodeId='+id,
+        method: 'get',
+    })
+}
 //绑定设备
 export function bindDevice(device){
     return request({

pages/bluetooth/index/index.vue

@@ -159,6 +159,7 @@ const ecUI = require('@/utils/ecUI.js')
 const ecBLE = require('@/utils/ecBLE/ecBLE.js')
 // #endif
 import i18 from '@/utils/i18.js'
+import {getDevcieByQrcodeID} from "@/api/device/device";
 	let ctx
 	let deviceListData = []
 	export default {
@@ -429,6 +430,8 @@ import i18 from '@/utils/i18.js'
           });
           return;
         }
+
+
         /**
          * ID:XXX+回车换行(设备编号)
          * QR:XXXX+回车换行(二维码ID)
@@ -437,30 +440,37 @@ import i18 from '@/utils/i18.js'
          * 最后+OK
          */
         let self = this;
-        let endStr = "$$";
-        ecUI.showLoading("正在配置网络信息")
-        setTimeout(function(){
-          self.sendBlueData("ID:"+self.deviceno+endStr);
-        },200);
-        setTimeout(function(){
-          self.sendBlueData("QR:"+self.qrcodeid+endStr);
-        },400);
-
-        setTimeout(function(){
-          self.sendBlueData("ssid:"+self.SSID+endStr);
-        },600);
-
-        setTimeout(function(){
-          self.sendBlueData("psd:"+self.password+endStr);
-        },800);
-
-        setTimeout(function(){
-          self.sendBlueData("pid:"+self.productId+endStr);
-        },1000);
+        getDevcieByQrcodeID(this.qrcodeid).then(res=>{
+          if(res.data != null){
+            self.$modal.showToast("当前二维码已经配置设备");
+          }else{
+            let endStr = "$$";
+            ecUI.showLoading("正在配置网络信息")
+            setTimeout(function(){
+              self.sendBlueData("ID:"+self.deviceno+endStr);
+            },200);
+            setTimeout(function(){
+              self.sendBlueData("QR:"+self.qrcodeid+endStr);
+            },400);
+
+            setTimeout(function(){
+              self.sendBlueData("ssid:"+self.SSID+endStr);
+            },600);
+
+            setTimeout(function(){
+              self.sendBlueData("psd:"+self.password+endStr);
+            },800);
+
+            setTimeout(function(){
+              self.sendBlueData("pid:"+self.productId+endStr);
+            },1000);
+
+            setTimeout(function(){
+              self.sendBlueData("OK");
+            },1200);
+          }
+        })
 
-        setTimeout(function(){
-          self.sendBlueData("OK");
-        },1200);