Merge remote-tracking branch 'origin/develop' into develop

2022-07-26 13:57:05 +08:00
parent e8f59660de 5019d6c8cd
commit b9608188fe
1 changed files with 7 additions and 3 deletions
@@ -6664,9 +6664,13 @@ var PDFPageView = function () {
        // //判断分辨率
        // if (screen.width+"*"+screen.height === '800*600' ){
        // }
-
-
-
+        var screenHeight = window.screen.height;
+        var screenWidth = window.screen.width;
+        if((screenHeight>screenWidth) && (screenWidth>480 && screenWidth <= 1440)){
+          defaultSettings.watermark_fontsize = '20px';
+          defaultSettings.watermark_width = 60;
+          defaultSettings.watermark_height = 40;
+        }
        var oTemp = document.createDocumentFragment();

        //获取页面最大宽度