新bug修改

dyu/application/store/model/CertificateApply.php

@@ -36,6 +36,9 @@ class CertificateApply extends CertificateApplyModel
 	{
 		$query = self::useGlobalScope(true);
 		$query = $this->handlerSearch($query, request()->param()); //查询条件
+		if (!checkPrivilege('content.certificate/show')) {
+			$query->where('store_user_id', getStoreUserId());
+		}
 		return $query->with(['applyUser'])
 			->where('is_delete', '=', 0)
 			->order(['create_time' => 'desc'])

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

@@ -51,7 +51,7 @@
                                 </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 form-require">有效日期</label>
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <!-- 会员等级列表-->
                                     <div class="am-input-group">
@@ -111,6 +111,7 @@
         laydate.render({
             elem: '.j-laydate-start'
             , type: 'date'
+            , min: '<?=date('Y-m-d')?>'
         });
 
         /**

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

@@ -2,6 +2,7 @@
     .am-selected {
         width: 100%;
     }
+
     .a_button {
         background-color: #4987b5;
         border: none;
@@ -54,7 +55,7 @@
                                 </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 form-require"> 有效日期 </label>
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <!-- 会员等级列表-->
                                     <div class="am-input-group">
@@ -63,9 +64,6 @@
                                                placeholder="有效期"
                                                value="<?= $model['indate'] ?>" disabled>
                                     </div>
-                                    <div class="help-block">
-                                        <small>砍价活动的开始时间与截止时间</small>
-                                    </div>
                                 </div>
                             </div>
                             <div class="am-form-group">
@@ -89,18 +87,18 @@
                                 </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">
-									<?php if (isset($certificateList)): foreach ($certificateList as $certificate): ?>
-                                        <div class="file-item" style="min-width: 40px;font-size: 14px;border: 0;margin: 10px 0 0 0">
-                                            <a title="<?= $certificate['name']; ?>" href="<?= $certificate['file']['file_path'] ?>"
-                                               target="_blank"> <?= $certificate['name']; ?></a>
-                                        </div>
-									<?php endforeach; endif; ?>
-                                </div>
-                            </div>
 							<?php if ($model['status'] == 20): ?>
+                                <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">
+										<?php if (isset($certificateList)): foreach ($certificateList as $certificate): ?>
+                                            <div class="file-item" style="min-width: 40px;font-size: 14px;border: 0;margin: 10px 0 0 0">
+                                                <a title="<?= $certificate['name']; ?>" href="<?= $certificate['file']['file_path'] ?>"
+                                                   target="_blank"> <?= $certificate['name']; ?></a>
+                                            </div>
+										<?php endforeach; endif; ?>
+                                    </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">
@@ -132,7 +130,7 @@
                                     </label>
                                     <label class="am-radio-inline">
                                         <input type="radio" name="status" value="30" data-am-ucheck
-										       <?= $model['status'] == 30 ? 'checked' : '' ?>disabled>
+											<?= $model['status'] == 30 ? 'checked' : '' ?> disabled>
                                         拒绝
                                     </label>
                                 </div>

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

@@ -42,7 +42,7 @@
                                 </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 form-require"> 有效日期 </label>
                                 <div class="am-u-sm-9 am-u-md-6 am-u-lg-5 am-u-end">
                                     <!-- 会员等级列表-->
                                     <div class="am-input-group">
@@ -51,9 +51,6 @@
                                                placeholder="有效期"
                                                value="<?= $model['indate'] ?>" disabled>
                                     </div>
-                                    <div class="help-block">
-                                        <small>砍价活动的开始时间与截止时间</small>
-                                    </div>
                                 </div>
                             </div>
                             <div class="am-form-group">