Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -2,7 +2,7 @@
 /*
 /*
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Description: 此文件主要创建 axios 实例，然后添加请求拦截器和响应拦截器
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-06-13 16:28:57
+ * @LastEditTime: 2023-06-13 17:16:13
  */
  */
 import axios from 'axios'
 import axios from 'axios'
 import Router from '@/router'
 import Router from '@/router'
@@ -34,14 +34,6 @@ service.interceptors.request.use(
             } else {
             } else {
                 config.headers.delete('Authorization')
                 config.headers.delete('Authorization')
             }
             }
-        } else {
-            const token = Cookies.get('ACCESS_TOKEN')
-            // 添加请求头
-            if (token) {
-                config.headers['Authorization'] = 'Bearer ' + token
-            } else {
-                config.headers.delete('Authorization')
-            }
         }
         }
         return config
         return config
     },
     },

 <!--
 <!--
  * @Description: 
  * @Description: 
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-06-12 15:18:07
+ * @LastEditTime: 2023-06-14 09:25:12
 -->
 -->
 <template>
 <template>
   <div class="rlPopup">
   <div class="rlPopup">
@@ -109,8 +109,18 @@
        * @author: renchao
        * @author: renchao
        */
        */
       handleOpenScan () {
       handleOpenScan () {
-        this.isScan = true
+        this.isScan = !this.isScan
+        if (this.isScan) {
+          this.$message({
+            message: '正在启动程序请稍等',
+            type: 'success'
+          })
+          setTimeout(() => {
             this.scanTitle = '关闭高拍仪'
             this.scanTitle = '关闭高拍仪'
+          }, 4000)
+        } else {
+          this.scanTitle = '打开高拍仪'
+        }
       },
       },
       /**
       /**
        * @description: 拍照
        * @description: 拍照

 <!--
 <!--
  * @Description: 
  * @Description: 
  * @Autor: renchao
  * @Autor: renchao
- * @LastEditTime: 2023-06-13 15:05:35
+ * @LastEditTime: 2023-06-14 09:01:30
 -->
 -->
 <template>
 <template>
   <div>
   <div>
@@ -198,16 +198,20 @@
         var httpurl = "http://127.0.0.1:33088/";
         var httpurl = "http://127.0.0.1:33088/";
         var url = httpurl + "function=get_idcard&readnew=0"
         var url = httpurl + "function=get_idcard&readnew=0"
         axios.post(url).then(res => {
         axios.post(url).then(res => {
-          if (res.data.code == 1) {
-            this.$message({
-              message: res.data.message,
-              type: 'warning'
-            })
-          } else {
+          if (res.data.code == 0) {
             let data = res.data.IDCardInfo
             let data = res.data.IDCardInfo
             row.sqrmc = data.name
             row.sqrmc = data.name
             row.zjzl = 1
             row.zjzl = 1
             row.zjh = data.cardID
             row.zjh = data.cardID
+            this.$message({
+              message: '读取成功！',
+              type: 'success'
+            })
+          } else {
+            this.$message({
+              message: res.data.message,
+              type: 'warning'
+            })
           }
           }
         })
         })
       },
       },