From 34b40610533fe4908450b87712ec7b7bfb45aa63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Thu, 31 Aug 2023 11:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=89=AB=E7=A0=81=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E4=BB=A5=E5=8F=8A=E6=88=91=E7=9A=84=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/mqtt.js           |  2 +-
 pages/device/APF/detail.vue |  4 +--
 pages/device/new.vue        |  7 +++--
 pages/user/erweima.vue      | 56 ++++++++++++++++++++-----------------
 4 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/common/js/mqtt.js b/common/js/mqtt.js
index 951f5ea..b61ef3c 100644
--- a/common/js/mqtt.js
+++ b/common/js/mqtt.js
@@ -1,5 +1,5 @@
 // export const MQTT_IP = '192.168.1.18:8083/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
-export const MQTT_IP = 'pqmcn.com:8085/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
+export const MQTT_IP = 'pqmcn.com:8884/mqtt'//mqtt地址端口, 使用emqx时一定要加mqtt
 
 const MQTT_USERNAME = 't_user'//mqtt用户名
 const MQTT_PASSWORD = 'njcnpqs'//密码
diff --git a/pages/device/APF/detail.vue b/pages/device/APF/detail.vue
index b4b2cef..c7a4ef5 100644
--- a/pages/device/APF/detail.vue
+++ b/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', () => {
diff --git a/pages/device/new.vue b/pages/device/new.vue
index e138db4..fea10bc 100644
--- a/pages/device/new.vue
+++ b/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()
                     }
                 },
diff --git a/pages/user/erweima.vue b/pages/user/erweima.vue
index a5b7b79..c0ccc19 100644
--- a/pages/user/erweima.vue
+++ b/pages/user/erweima.vue
@@ -1,31 +1,33 @@
 <template>
-    <view class="transfer">
-        <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
-        <Cn-htmlToImg domId="content" @renderFinish="renderFinish" style="display: flex">
-            <view class="content" id="content">
-                <view class="user-info">
-                    <image class="avatar" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
-                    <image class="avatar" src="/static/head.png" v-else></image>
-                    <view class="right">
-                        <view class="user-info-name">{{ userInfo.nickname }}</view>
-                        <view class="user-info-role">{{ roleName }}</view>
+    <Cn-page :loading="loading" before-render>
+        <view class="transfer" slot="body">
+            <!-- <div class="transfer-img" ref="qrCodeUrl" /> -->
+            <Cn-htmlToImg domId="content" @renderFinish="renderFinish" style="display: flex">
+                <view class="content" id="content">
+                    <view class="user-info">
+                        <image class="avatar" :src="userInfo.avatar" v-if="userInfo.avatar"></image>
+                        <image class="avatar" src="/static/head.png" v-else></image>
+                        <view class="right">
+                            <view class="user-info-name">{{ userInfo.nickname }}</view>
+                            <view class="user-info-role">{{ roleName }}</view>
+                        </view>
                     </view>
+                    <uqrcode size="260" ref="uqrcode" canvas-id="qrcode" :value="content" @complete="loading = false"
+                             :loading="false"></uqrcode>
                 </view>
-                <uqrcode size="260" ref="uqrcode" canvas-id="qrcode" :value="content"
-                         :loading="false"></uqrcode>
+            </Cn-htmlToImg>
+            <view class="transfer-text">
+                <!--            <view>换个样式</view>-->
+                <view @click="save">保存图片</view>
             </view>
-        </Cn-htmlToImg>
-        <view class="transfer-text">
-            <!--            <view>换个样式</view>-->
-            <view @click="save">保存图片</view>
+            <!-- <view class="transfer-btn">
+                <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
+                    返回
+                </button>
+                <button class="transfer-btn-item ml20" @click="home">转移成功</button>
+            </view> -->
         </view>
-        <!-- <view class="transfer-btn">
-            <button class="transfer-btn-item" style="background-color: #fff; color: #111" @click="back">
-                返回
-            </button>
-            <button class="transfer-btn-item ml20" @click="home">转移成功</button>
-        </view> -->
-    </view>
+    </Cn-page>
 </template>
 <script>
 // import QRCode from 'qrcodejs2'
@@ -71,10 +73,12 @@ export default {
             this.img = e
         },
         save() {
-            if(!this.img){
-                setTimeout(()=>{
+            console.log(this.img)
+            if (!this.img) {
+                setTimeout(() => {
                     this.save()
-                },500)
+                }, 500)
+                return
             }
             base64ToPath(this.img).then((res) => {
                 console.log(res)