Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/multiPage/index.vue
leo.xie 3 gadi atpakaļ
vecāks
revīzija
6cf0e158ab
1 mainītis faili ar 6 papildinājumiem un 12 dzēšanām
  1. 6 12
      src/views/multiPage/index.vue

+ 6 - 12
src/views/multiPage/index.vue

@@ -6,7 +6,7 @@
                          @scale='onScale' @close='onClose' ref='imagePreview'>
         <template v-slot:index>
           <div>
-            第{{curPage}}
+            第{{curPage}}
           </div>
         </template>
         <template v-slot:cover v-if="showBottom">
@@ -26,11 +26,13 @@
 <!--    <div style="position: absolute;left:0;top:40%;z-index: 10000000;">-->
 <!--      <div style="width:100%;text-align:center;font-size:50px;color:#000;opacity: 0.15">{{watermark}}</div>-->
 <!--    </div>-->
-    <div style="position: relative;width: 100%;height: 100%;z-index: 99999;">
-      <div style="width:300px;font-style:oblique;text-align:center;font-size:30px;color:#000;opacity: 0.2;position: absolute;left: 0;right: 0;margin: 55% auto;">{{watermark}}</div>
+    <div style="position: relative;width: 100%;height: 100%;z-index: 999;">
+      <div style="width:300px;font-style:oblique;text-align:center;font-size:30px;color:#000;opacity: 0.2;position: absolute;left: 0;right: 0;margin: 55% auto;">{{watermark}}!</div>
 
     </div>
 
+    <div style="position:fixed;width:100%;height:100%;z-index:9999;background:rgba(255,255,255,0);overflow:hidden;top:0px;left:0px;"></div>
+
   </div>
 </template>
 
@@ -268,13 +270,5 @@ export default {
   background: #17a8ff;
   color: #fff;
 }
-* {
-  -webkit-touch-callout:none;/*系统默认菜单被禁用*/
-  -webkit-user-select:none;/*webkit浏览器*/
-  -khtml-user-select:none;/*早起浏览器*/
-  -moz-user-select:none;/*火狐浏览器*/
-  -ms-user-select:none;/*IE浏览器*/
-  user-select:none;/*用户是否能够选中文本*/
-  pointer-events: none!important;
-}
+/*.preview * { pointer-events: none!important; }*/
 </style>