Merge branch 'lwx_v5'

src/views/home/index.vue

@@ -269,7 +269,7 @@ const openNews = (val:any,name:string) => {
                     </template>
 
                     <template #append>
-                        <div style="display: flex; justify-content: center; max-width: 15px;"><el-icon :size="20" style="margin-top: 15%;" @click="router.push('/scanQrCode')"><SetUp /></el-icon></div>
+                        <div style="display: flex; justify-content: center; max-width: 15px;"><el-icon :size="20" style="margin-top: 15%;" @click="router.push('/scanQrCode')"><i class="fa fa-qrcode"></i></el-icon></div>
                     </template>
                     </el-input>
                     

src/views/home/scanQrCode.vue

@@ -66,8 +66,8 @@
             { facingMode: "environment" },
             {
               fps: 5,
-              qrbox: { width: 300, height: 300 },
+              qrbox: { width: 300, height: 210 },
-              aspectRatio: 1.7,
+              aspectRatio: 1.7,//
             },
             (decodedText, decodedResult) => {
               window.location.href = decodedText;
@@ -174,12 +174,12 @@
     height: 100vh;
     position: relative;
     width: 100%;
-    border: red solid 7px;
+    /* border: red solid 7px; */
   }
   ​.qrcode {
     height: 90%;
     /* width: 100%;*/
-    border: white solid 7px; 
+    /* border: white solid 7px;  */
   }
   #reader {
     display: block;
@@ -188,7 +188,7 @@
     /* top: 50%;
     left: 0;
     transform: translateY(-50%); */
-    border: yellow solid 5px;
+    /* border: yellow solid 5px; */
   }
 
   .btn {
@@ -199,7 +199,7 @@
     color: #fff;
     font-size: 6vw;
     align-items: flex-start;
-    border: green solid 7px;
+    /* border: green solid 7px; */
   }
   </style>
   ​