水印问题修改

dyu/application/common/library/storage/engine/Local.php

@@ -43,7 +43,7 @@ class Local extends Server
         $uplodDir = WEB_PATH . 'uploads';
         // 验证文件并上传
         $info = $this->file->validate([
-            'size' => 4 * 1024 * 1024,
+            'size' => 20 * 1024 * 1024,
             'ext' => 'jpg,jpeg,png,gif,pdf'
         ])->move($uplodDir, $this->fileName);
         if (empty($info)) {

dyu/application/common/service/watermark/image/Image.php

@@ -133,7 +133,13 @@ class Image
 		$color = imagecolorallocatealpha($image, $r, $g, $b, $alpha);
 
 		//		//获取文字数量
-		$fontNum  = mb_strlen($waterText);
+		$fontNum = mb_strlen($waterText);
+		if ($waterText2) {
+			$fontNum2 = mb_strlen($waterText2);
+			if ($fontNum2 > $fontNum) {
+				$fontNum = $fontNum2;
+			}
+		}
 		$fontPath = Grafika::fontsDir().DS.'st-heiti-light.ttc';
 		// 3.创建文字图片
 		//判断是否需要添加水印

dyu/application/store/controller/content/certificate/Watermark.php

@@ -139,7 +139,7 @@ class Watermark extends Controller
 	public function getCertificateList($category_ids = [])
 	{
 		$model = new CertificateModel;
-		if (!$list = $model->getCertificateList(['certificate_category_id' => ['in', $category_ids]], ['id', 'name'])) {
+		if (!$list = $model->getCertificateList(['certificate_category_id' => ['in', $category_ids], 'is_delete' => ['=', 0]], ['id', 'name'])) {
 			return $this->renderError($model->getError() ?: '请求失败');
 		}
 		return $this->renderSuccess('请求成功', '', $list);

dyu/application/store/view/content/certificate/add.php

@@ -92,6 +92,7 @@
         // 初始化Web Uploader
         var uploader = WebUploader.create({
 
+            maxFileSize: 10,
             // 选完文件后，是否自动上传。
             auto: true,
             multiple: false,

dyu/application/store/view/content/certificate/edit.php

@@ -99,7 +99,6 @@
          */
         $('#my-form').superForm();
         var uploader = WebUploader.create({
-
             // 选完文件后，是否自动上传。
             auto: true,
             multiple: false,

dyu/application/store/view/content/certificate/watermark/edit.php

@@ -174,7 +174,7 @@
                 $("#reason_textarea").val('');
             } else {
                 $("#reason_div").show();
-                $("#reason_div").hide();
+                $("#alpha").hide();
             }
         });
 

dyu/application/store/view/content/certificate/watermark/index.php

@@ -171,15 +171,19 @@
                     $.show_error("请输入新的水印透明度");
                     return false;
                 }
+                //开启loading
+                const loading = layer.load(2);
                 $.post("<?= url('content.certificate.watermark/settingAlpha') ?>", {
                     alpha: value,
                     id
                 }, function (res) {
                     if (res.code != 1) {
                         $.show_error(res.msg);
+                        layer.close(loading);
                     } else {
                         $.show_success(res.msg);
                         window.location.reload();
+                        layer.close(loading);
                     }
                 });
             });