Browse Source

高度计算优化

liudan 5 months ago
parent
commit
5afda4fad3
2 changed files with 16 additions and 4 deletions
  1. 4 1
      src/assets/scss/style.scss
  2. 12 3
      src/pages/home/Index.jsx

+ 4 - 1
src/assets/scss/style.scss

@@ -129,6 +129,9 @@ body {
     flex: 1;
     margin-top: 0.8rem;
     overflow: hidden;
+    &.section{
+      padding-top: 0;
+    }
     .table-content,
     .table-header {
       box-sizing: border-box;
@@ -144,13 +147,13 @@ body {
       line-height: 3.9rem;
       text-align: center;
       color: #fff;
+      margin-top: 0.8rem;
     }
     .table-content {
       background-color: #f0f0f0;
       border-color: #f0f0f0;
       color: #333;
       font-size: 1.5rem;
-      margin-top: 0.8rem;
       &.patOpeName {
         color: #f39a06;
         padding: 0 0.4rem;

+ 12 - 3
src/pages/home/Index.jsx

@@ -3,7 +3,7 @@ import Login from '@components/login/Index.jsx';
 import DoctorScreen from '@pages/doctorScreen/Index.jsx';
 import BigScreen from '@pages/bigScreen/Index.jsx';
 import OperateScreen from '@pages/operateScreen/Index.jsx';
-// import FingerprintJS from '@fingerprintjs/fingerprintjs';
+import FingerprintJS from '@fingerprintjs/fingerprintjs';
 import { initSocket } from '@api/index.js';
 import { AntOutline, SetOutline } from 'antd-mobile-icons';
 import { Toast } from 'antd-mobile';
@@ -48,8 +48,17 @@ class Home extends React.Component {
     if (/android/.test(ua)) {
       window.JavaClientCall && window.JavaClientCall.getDeviceID();
     }
-    // const fp = await FingerprintJS.load();
-    // const AndroidInfo = await fp.get();
+    // 测试环境无法从安卓获取数据
+    const isDev = import.meta.env.MODE == 'development';
+    if (isDev) {
+      const fp = await FingerprintJS.load();
+      const AndroidInfo = await fp.get();
+       this.setState({
+        deviceID: AndroidInfo,
+      }, () => {
+        this.loginInit();
+      });
+    }
   };
   // 改变颜色
   changeSwitch = () => {