From 1dbecd890f821b23e8c21f7432be458fd777f62e Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 10 Sep 2024 08:48:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E5=8D=8E=E4=B8=BA?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E7=9B=B8=E6=9C=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/device/edit.vue     |  4 ++--
 pages/device/new.vue      |  2 ++
 pages/device/transfer.vue |  1 +
 pages/gateway/new.vue     |  4 ++--
 pages/index/mine.vue      |  1 +
 pages/mine/userDetail.vue | 50 +++++++++++++++++++++------------------
 6 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/pages/device/edit.vue b/pages/device/edit.vue
index 568e88a..1f678e7 100644
--- a/pages/device/edit.vue
+++ b/pages/device/edit.vue
@@ -6,13 +6,13 @@
                     <uni-forms-item label="设备识别码">
                         <view style="display: flex">
                             <uni-easyinput type="text" v-model="formData.nDid" placeholder="请输入设备识别码"/>
-                            <uni-icons
+                            <!-- <uni-icons
                                 type="camera"
                                 color="#007aff"
                                 size="26"
                                 class="ml20"
                                 @click="scanCode"
-                            ></uni-icons>
+                            ></uni-icons> -->
                         </view>
                     </uni-forms-item>
                 </uni-forms>
diff --git a/pages/device/new.vue b/pages/device/new.vue
index 7365dae..cf13d12 100644
--- a/pages/device/new.vue
+++ b/pages/device/new.vue
@@ -316,7 +316,9 @@ export default {
             }
         },
         changeAuth() {
+           
             uni.scanCode({
+                onlyFromCamera:true,
                 success: (res) => {
                     console.log('条码类型：' + res.scanType)
                     console.log('条码内容：' + res.result)
diff --git a/pages/device/transfer.vue b/pages/device/transfer.vue
index d1fa202..35ea58c 100644
--- a/pages/device/transfer.vue
+++ b/pages/device/transfer.vue
@@ -92,6 +92,7 @@ export default {
         handleScon() {
 			this.$refs.message.close()
             uni.scanCode({
+                onlyFromCamera:true,
                 success: (res) => {
                     console.log(res)
                     let data = JSON.parse(res.result)
diff --git a/pages/gateway/new.vue b/pages/gateway/new.vue
index f355081..21cdd3e 100644
--- a/pages/gateway/new.vue
+++ b/pages/gateway/new.vue
@@ -6,8 +6,8 @@
                     <uni-forms-item label="网关识别码">
                         <view style="display:flex">
                             <uni-easyinput type="number" v-model="code" placeholder="请输入网关识别码" />
-                            <uni-icons type="camera" color="#007aff" size="26" class="ml20"
-                                @click="scanCode"></uni-icons>
+                            <!-- <uni-icons type="camera" color="#007aff" size="26" class="ml20"
+                                @click="scanCode"></uni-icons> -->
                         </view>
                     </uni-forms-item>
                 </uni-forms>
diff --git a/pages/index/mine.vue b/pages/index/mine.vue
index 581eafd..64a97f9 100644
--- a/pages/index/mine.vue
+++ b/pages/index/mine.vue
@@ -261,6 +261,7 @@ export default {
 		handleScon(){
 			this.$refs.message.close()
 			uni.scanCode({
+				onlyFromCamera:true,
 			    success: (res) => {
 			        console.log('条码类型：' + res.scanType)
 			        console.log('条码内容：' + res.result)
diff --git a/pages/mine/userDetail.vue b/pages/mine/userDetail.vue
index a426e39..79f1c88 100644
--- a/pages/mine/userDetail.vue
+++ b/pages/mine/userDetail.vue
@@ -1,9 +1,14 @@
 <template>
-    <Cn-page :loading='loading'>
-        <view slot='body'>
-            <view class='index'>
-                <uni-card title="设备信息" sub-title="副标题" v-for="item in 3" :key="item" 
-                    thumbnail="/static/real_time_data.png">
+    <Cn-page :loading="loading">
+        <view slot="body">
+            <view class="index">
+                <uni-card
+                    title="设备信息"
+                    sub-title="副标题"
+                    v-for="item in 3"
+                    :key="item"
+                    thumbnail="/static/real_time_data.png"
+                >
                     <view class="footer">
                         <text>设备基础信息 </text>
                         <view class="footer-btn" @click="del">移除</view>
@@ -16,41 +21,41 @@
 </template>
 <script>
 export default {
-    data () {
+    data() {
         return {
-            loading: false
+            loading: false,
         }
     },
     methods: {
-        del(){
+        del() {
             uni.showModal({
                 title: '提示',
                 content: '确定要移除该设备权限吗？',
                 success: function (res) {
                     if (res.confirm) {
-                        console.log('用户点击确定');
+                        console.log('用户点击确定')
                     } else if (res.cancel) {
-                        console.log('用户点击取消');
+                        console.log('用户点击取消')
                     }
-                }
-            });
+                },
+            })
         },
-        newDevice () {
+        newDevice() {
             uni.scanCode({
+                onlyFromCamera: true,
                 success: function (res) {
-                    console.log('条码类型：' + res.scanType);
-                    console.log('条码内容：' + res.result);
+                    console.log('条码类型：' + res.scanType)
+                    console.log('条码内容：' + res.result)
                     uni.navigateTo({
-                        url: '/pages/gateway/newDevice'
+                        url: '/pages/gateway/newDevice',
                     })
-                }
-            });
-
+                },
+            })
         },
-    }
+    },
 }
 </script>
-<style lang='scss'>
+<style lang="scss">
 .index {
     .footer {
         display: flex;
@@ -69,5 +74,4 @@ export default {
         }
     }
 }
-
-</style>
\ No newline at end of file
+</style>