工具网站水印问题修改

dyu/application/common.php

@@ -4,6 +4,7 @@
 
 use think\Request;
 use think\Log;
+use think\Cache;
 
 /**
  * 打印调试函数
@@ -366,4 +367,14 @@ function static_file($file = ''): string
 	$version = get_version();
 	$version = $version['version'] ?? '1';
 	return $domain . "/static/" . $file . '?v=' . $version;
+}
+
+function getOrderNo($prefix = '')
+{
+	$orderNo = $prefix . date('Ymd') . substr(implode('', array_map('ord', str_split(substr(uniqid(), 7, 13), 1))), 0, 8);
+	if (Cache::has($orderNo)) {
+		return getOrderNo($prefix);
+	}
+	Cache::set($orderNo, date('Ymd'), 86400);
+	return $orderNo;
 }

dyu/application/store/model/CertificateApply.php

@@ -78,6 +78,7 @@ class CertificateApply extends CertificateApplyModel
 //			$service = new WaterMarkBase($certificate['file']['file_path'], $data['watermark'], self::$wxapp_id, $certificate['file_type']);
 //			$result  = $service->waterMark();
 //		}
+		$data['order_no'] = getOrderNo('CA');
 		//获取文件类型
 		$data['wxapp_id']      = self::$wxapp_id;
 		$data['store_user_id'] = getStoreUserId();
@@ -114,12 +115,17 @@ class CertificateApply extends CertificateApplyModel
 				return false;
 			}
 			foreach ($certificateList as $certificate) {
+				$water  = $this->watermark ?: $this->order_no;
+				$water2 = '';
+				if ($this['indate']) {
+					$water2 = $data['use_data'] ? '有效期至'.$this['indate'] : '';
+				}
 				$service       = new WaterMarkBase($certificate['file']['file_path'],
-					$this['watermark'],
+					$water,
 					self::$wxapp_id,
 					$data['alpha'],
 					$certificate['file_type'],
-					'有效期至'.$this['indate'],
+					$water2,
 					$certificate['width'],
 					$certificate['height']);
 				$result        = $service->waterMark();
@@ -175,12 +181,17 @@ class CertificateApply extends CertificateApplyModel
 			return false;
 		}
 		foreach ($certificateList as $certificate) {
+			$water  = $this->watermark ?: $this->order_no;
+			$water2 = '';
+			if ($this['indate']) {
+				$water2 = $this->use_date ? '有效期至'.$this->indate : '';
+			}
 			$service       = new WaterMarkBase($certificate['file']['file_path'],
-				$this['watermark'],
+				$water,
 				self::$wxapp_id,
 				$alpha,
 				$certificate['file_type'],
-				'有效期至'.$this['indate'],
+				$water2,
 				$certificate['width'],
 				$certificate['height']);
 			$result        = $service->waterMark();

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

@@ -41,17 +41,17 @@
                                 </div>
                             </div>
                             <div class="am-form-group">
-                                <label class="am-u-sm-3 am-u-lg-2 am-form-label form-require">水印 </label>
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label">水印 </label>
                                 <div class="am-u-sm-9 am-u-end">
                                     <input type="text" class="tpl-form-input" name="watermark"
-                                           value="" placeholder="请输入水印" required>
+                                           value="" placeholder="请输入水印">
                                     <div class="help-block">
                                         <small>如：“比亚迪供应商入库专用，他用无效”</small>
                                     </div>
                                 </div>
                             </div>
                             <div class="am-form-group">
-                                <label class="am-u-sm-3 am-u-lg-2 am-form-label form-require">有效日期</label>
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label">有效日期</label>
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <!-- 会员等级列表-->
                                     <div class="am-input-group">
@@ -184,7 +184,6 @@
                 }
                 layer.close(load);
             });
-            console.log($(this).val());
             // 创建复选框的 HTML 代码
             // const checkboxHtml = ` <input type="checkbox" name="options" lay-skin="primary" title="新复选框"> `;
             // // 将复选框添加到页面中

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

@@ -50,8 +50,15 @@
                             <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">
-                                    <input type="text" class="tpl-form-input" name="watermark"
-                                           value="<?= $model['watermark'] ?>" placeholder="请输入水印" disabled>
+                                    <input type="text" class="tpl-form-input"
+                                           value="<?= $model['watermark'] ?>">
+                                </div>
+                            </div>
+                            <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">
+                                    <input type="text" class="tpl-form-input"
+                                           value="<?= $model['order_no'] ?>">
                                 </div>
                             </div>
                             <div class="am-form-group">
@@ -66,6 +73,21 @@
                                     </div>
                                 </div>
                             </div>
+                            <div class="am-form-group">
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label ">打印有效日期 </label>
+                                <div class="am-u-sm-9 am-u-end">
+                                    <label class="am-radio-inline">
+                                        <input type="radio" name="use_data" value="1"
+                                               data-am-ucheck <?= ['use_date'] ? '' : 'checked' ?> disabled>
+                                        是
+                                    </label>
+                                    <label class="am-radio-inline">
+                                        <input type="radio" name="use_data" value="0"
+                                               data-am-ucheck <?= ['use_date'] ? 'checked' : '' ?> disabled>
+                                        否
+                                    </label>
+                                </div>
+                            </div>
                             <div class="am-form-group">
                                 <label class="am-u-sm-3 am-u-lg-2 am-form-label ">申请备注 </label>
                                 <div class="am-u-sm-9 am-u-end">

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

@@ -35,14 +35,21 @@
                                 </div>
                             </div>
                             <div class="am-form-group">
-                                <label class="am-u-sm-3 am-u-lg-2 am-form-label form-require">水印 </label>
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label">水印 </label>
                                 <div class="am-u-sm-9 am-u-end">
                                     <input type="text" class="tpl-form-input" name="watermark"
-                                           value="<?= $model['watermark'] ?>" placeholder="请输入水印" disabled>
+                                           value="<?= $model['watermark'] ?>" disabled>
                                 </div>
                             </div>
                             <div class="am-form-group">
-                                <label class="am-u-sm-3 am-u-lg-2 am-form-label form-require"> 有效日期 </label>
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label">申请单号 </label>
+                                <div class="am-u-sm-9 am-u-end">
+                                    <input type="text" class="tpl-form-input"
+                                           value="<?= $model['order_no'] ?>" disabled>
+                                </div>
+                            </div>
+                            <div class="am-form-group">
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label"> 有效日期 </label>
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <!-- 会员等级列表-->
                                     <div class="am-input-group">
@@ -53,6 +60,22 @@
                                     </div>
                                 </div>
                             </div>
+
+                            <div class="am-form-group">
+                                <label class="am-u-sm-3 am-u-lg-2 am-form-label ">打印有效日期 </label>
+                                <div class="am-u-sm-9 am-u-end">
+                                    <label class="am-radio-inline">
+                                        <input type="radio" name="use_data" value="1"
+                                               data-am-ucheck <?= ['indate'] ? '' : 'checked' ?> <?= empty($model['indate']) ? 'disabled' : '' ?>>
+                                        是
+                                    </label>
+                                    <label class="am-radio-inline">
+                                        <input type="radio" name="use_data" value="0"
+                                               data-am-ucheck <?= ['indate'] ? 'checked' : '' ?> <?= empty($model['indate']) ? 'disabled' : '' ?>>
+                                        否
+                                    </label>
+                                </div>
+                            </div>
                             <div class="am-form-group">
                                 <label class="am-u-sm-3 am-u-lg-2 am-form-label ">申请备注 </label>
                                 <div class="am-u-sm-9 am-u-end">