From e9984d43b20b7c7fe3a1f519d46a84cf9710cdaa Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 09:17:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/add.html          | 37 +++++--------------
 .../templates/activity/info/edit1.html        |  8 ++++
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html
index c9f48c98a..7da3325d9 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -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
     });
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index b5eacc801..6d3e73455 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -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>