Browse Source

Merge branch 'feature_20250331_日报分享' into uat(dev)

zhujindu 8 months ago
parent
commit
e72abaa98c
2 changed files with 6 additions and 5 deletions
  1. 5 4
      src/components/share.vue
  2. 1 1
      src/utils/index.js

+ 5 - 4
src/components/share.vue

@@ -213,22 +213,23 @@ export default {
   width: 100%;
   height: 100%;
   overflow: hidden;
-  position: absolute;
+  position: fixed;
   top: 0;
   z-index: 11;
+  // overflow-y: auto;
 
   .share-content {
     background: url('../assets/shareBack.png') no-repeat center center;
     background-size: cover;
     background-attachment: local;
     width: 100%;
-    // height: 100%;
+    height: 100%;
     padding: vw(30);
     position: absolute;
-    // z-index: -1;
     padding-bottom: vw(190);
     top: 0;
     z-index: -1;
+    overflow-y: auto;
   }
 
   .header {
@@ -343,7 +344,7 @@ export default {
   #html2canvas {
     width: 100%;
     height: 100%;
-    position: fixed;
+    position: absolute;
     top: 0;
     z-index: 9;
     overflow-y: auto;

+ 1 - 1
src/utils/index.js

@@ -1,4 +1,4 @@
-const store = require('../store');
+import store from '../store';
 
 // 日期格式化
 export function parseTime(time, pattern) {