ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/activity' into activity_xlh

This commit is contained in:
xu0625 2021-04-13 09:52:01 +08:00
parent 9ad854f992 e9984d43b2
commit 031b3641f2
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -471,7 +471,11 @@
<label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
<div class="col-sm-8">
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
disabled>
<option value="">所有</option>
<option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
th:value="${drawPrize.PRIZECODE}"></option>
</select>
</div>
</div>
@ -546,7 +550,12 @@
<div class="col-sm-8">
<input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
placeholder="抽奖必中计数"
class="form-control" type="text" maxlength="30" disabled>
class="form-control" type="text" maxlength="30"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
disabled>
<option value="">所有</option>
<option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
th:value="${drawPrize.PRIZECODE}"></option>
</div>
</div>
</div>
@ -906,32 +915,6 @@
<script th:inline="javascript">
var prefix = ctx + "activity/info"
/**获取奖品及信息列表*/
$(document).ready(function () {
var job = "";
$.ajax({
url: prefix + "/prizeInfo",
success: function (data) {
for (var i in data) {
if (job.length == 0) {
job = "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
} else {
job += "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
}
}
$("#firstawardprize").html(job);
$("#willdrawawardprize").html(job);
},
error: function (XMLHttpRequest, textStatus, errorThrown) {
alert(errorThrown);
},
async: false //false表示同步
}
);
});
$("#form-info-add").validate({
focusCleanup: true
});

8
sino-activity/src/main/resources/templates/activity/info/edit1.html
View File

@ -475,7 +475,11 @@
<label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
<div class="col-sm-8">
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
disabled>
<option value="">所有</option>
<option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
th:value="${drawPrize.PRIZECODE}"></option>
</select>
</div>
</div>
@ -562,7 +566,11 @@
<div class="col-sm-8">
<select name="drawRule-willdrawawardprize" class="form-control"
id="willdrawawardprize"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
disabled>
<option value="">所有</option>
<option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
th:value="${drawPrize.PRIZECODE}"></option>
</select>
</div>
</div>