Merge commit 'c478102b61d1d3fc48f1fef90095538ffd81686b' into prod-v1

dyu/application/common/model/Certificate.php

@@ -89,7 +89,7 @@ class Certificate extends BaseModel
 	{
 		$model = new static;
 		!empty($where) && $model->where($where);
-		return $model->field($field)->where('is_delete', '=', 0)->select();
+		return $model->field($field)->select();
 	}
 
 	/**

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

@@ -109,11 +109,18 @@ class Image
 	public function waterMark($filePath, $waterText, $alpha = 30, $type = 0, $waterText2 = '', $width = 0, $height = 0)
 	{
 		// 创建图片资源
-		$image = imagecreatefromjpeg($filePath);
+		$image_info = getimagesize($filePath);
+		$image_type = $image_info[2];
+		if ($image_type == IMAGETYPE_JPEG) {
+			$image = imagecreatefromjpeg($filePath);
+			// 处理JPEG图片的逻辑
+		} elseif ($image_type == IMAGETYPE_PNG) {
+			$image = imagecreatefrompng($filePath);
+			// 处理PNG图片的逻辑
+		}
 		if (!$image) {
 			return false;
 		}
-
 		// 获取图片尺寸
 		$width  = imagesx($image);
 		$height = imagesy($image);

dyu/application/store/extra/menus.php

@@ -273,6 +273,7 @@ return [
 							'content.certificate.watermark/index',
 							'content.certificate.watermark/add',
 							'content.certificate.watermark/edit',
+							'content.certificate.watermark/detail',
 						]
 					],
 				]

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

@@ -18,7 +18,7 @@
                             <div class="am-form-group">
                                 <label class="am-u-sm-3 am-u-lg-2 am-form-label form-require">资质分类 </label>
                                 <div class="am-u-sm-9 am-u-end">
-                                    <select name="category_id"
+                                    <select name="certificate_category_id"
                                             data-am-selected="{searchBox: 1, btnSize: 'sm',
                                              placeholder:'请选择', maxHeight: 400}">
                                         <option value=""></option>

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

@@ -93,7 +93,7 @@
                                                     <i class="am-icon-eye"></i>查看
                                                 </a>
 											<?php endif; ?>
-											<?php if (checkPrivilege('card.task/editcardtitle')) : ?>
+											<?php if (checkPrivilege('content.certificate.watermark/settingAlpha')) : ?>
 												<?php if ($item['status'] == 20): ?>
                                                     <a href="javascript:void(0);" class='edit-card-title' data-id="<?= $item['id'] ?>">
                                                         <i class="am-icon-pencil"></i> 水印透明度