Merge branch 'develop' into FOTON

2021-12-13 20:22:48 +08:00
parent 2bd22d4177 3331619964
commit 828f635b24
30 changed files with 1359 additions and 854 deletions
@@ -6653,7 +6653,7 @@ var PDFPageView = function () {
          watermark_cols: 0,//水印列数
          watermark_x_space: 18,//水印x轴间隔
          watermark_y_space: 20,//水印y轴间隔
-          watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+          watermark_color: 'rgba(232,232,240)',//水印字体颜色
          watermark_alpha: 0.3,//水印透明度
          watermark_fontsize: '40px',//水印字体大小
          watermark_font: '微软雅黑',//水印字体
@@ -6671,7 +6671,7 @@ var PDFPageView = function () {
            watermark_cols: 0,//水印列数
            watermark_x_space: 2,//水印x轴间隔
            watermark_y_space: 27,//水印y轴间隔
-            watermark_color: 'rgba(192, 192, 192)',//水印字体颜色
+            watermark_color: 'rgba(232,232,240)',//水印字体颜色
            watermark_alpha: 0.3,//水印透明度
            watermark_fontsize: '40px',//水印字体大小
            watermark_font: '微软雅黑',//水印字体