记得上下班打卡 | git大法好,push需谨慎

Commit 69a54a39 authored by wangyifan's avatar wangyifan

草莓护照-徽章 关联演出文案修改

parent abfb181d
...@@ -70,7 +70,7 @@ public class AdamCaomeiBadgeController extends BaseController { ...@@ -70,7 +70,7 @@ public class AdamCaomeiBadgeController extends BaseController {
// 演出类型校验 // 演出类型校验
if (badge.getType() != null && badge.getType() == 2) { if (badge.getType() != null && badge.getType() == 2) {
if (StringUtils.isBlank(badge.getPerformanceId())) { if (StringUtils.isBlank(badge.getPerformanceId())) {
return error("演出纪念徽章必须关联演出场次"); return error("演出纪念徽章必须关联演出");
} }
} else { } else {
badge.setPerformanceId(""); badge.setPerformanceId("");
......
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
</div> </div>
</div> </div>
<div class="form-group" id="ticketTimesDiv" style="display: none;"> <div class="form-group" id="ticketTimesDiv" style="display: none;">
<label class="col-sm-3 control-label is-required">关联演出场次</label> <label class="col-sm-3 control-label is-required">关联演出:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="performanceId" id="performanceId" class="form-control" type="text" placeholder="请输入演出场次ID"> <input name="performanceId" id="performanceId" class="form-control" type="text" placeholder="请输入演出ID">
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 演出纪念徽章必填</span> <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 演出纪念徽章必填</span>
</div> </div>
</div> </div>
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
</div> </div>
<div class="form-group" th:style="${badge.type == 2 ? 'display:block;' : 'display:none;'}"> <div class="form-group" th:style="${badge.type == 2 ? 'display:block;' : 'display:none;'}">
<label class="col-sm-3 control-label">关联演出场次</label> <label class="col-sm-3 control-label">关联演出:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="form-control-static" th:text="*{performanceId}"></div> <div class="form-control-static" th:text="*{performanceId}"></div>
</div> </div>
......
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
</div> </div>
</div> </div>
<div class="form-group" id="ticketTimesDiv" th:style="${badge.type == 2 ? 'display:block;' : 'display:none;'}"> <div class="form-group" id="ticketTimesDiv" th:style="${badge.type == 2 ? 'display:block;' : 'display:none;'}">
<label class="col-sm-3 control-label is-required">关联演出场次</label> <label class="col-sm-3 control-label is-required">关联演出:</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="performanceId" id="performanceId" th:field="*{performanceId}" class="form-control" type="text" placeholder="请输入演出场次ID" th:required="${badge.type == 2}"> <input name="performanceId" id="performanceId" th:field="*{performanceId}" class="form-control" type="text" placeholder="请输入演出ID" th:required="${badge.type == 2}">
<span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 演出纪念徽章必填</span> <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 演出纪念徽章必填</span>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment