设备扫码注册以及我的二维码修改

pages/device/APF/detail.vue

@@ -1,5 +1,5 @@
 <template>
-    <Cn-page :loading="loading" noPadding beforeRender>
+    <Cn-page :loading="loading" noPadding>
         <view slot="body">
             <view class="detail" :style="{ opacity: domLoading ? '0' : '1' }" style="overflow: hidden">
                 <view class="detail-header">
@@ -321,7 +321,7 @@ export default {
             this.client = mqtt.connect('wx://' + MQTT_IP, MQTT_OPTIONS)
             // #endif
             // #ifdef H5
-            this.client = mqtt.connect('ws://' + MQTT_IP, MQTT_OPTIONS)
+            this.client = mqtt.connect('wss://' + MQTT_IP, MQTT_OPTIONS)
             // #endif
             this.client
                 .on('connect', () => {

pages/device/new.vue

@@ -271,7 +271,7 @@ export default {
                 queryTopologyDiagramPage({
                     projectId: this.formData.projectId,
                 }).then((res) => {
-                    this.imageList = res.data.records.map(item=>{
+                    this.imageList = res.data.records.map(item => {
                         return {
                             ...item,
                             filePath: this.$config.static + item.filePath
@@ -297,12 +297,13 @@ export default {
         },
         scanCode() {
             uni.scanCode({
-                success(res) {
+                success: (res) => {
                     console.log('条码类型：' + res.scanType)
                     console.log('条码内容：' + res.result)
                     let content = JSON.parse(res.result)
+                    console.log(content)
                     if (content.type === 'NDID') {
-                        this.formData.nDid = content.nDid
+                        this.formData.nDid = content.data
                         this.register()
                     }
                 },