Merge branch 'pre' into 'master'

修改 notice

See merge request !171

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -139,6 +139,12 @@
                                     <div class="click2edit wrapper imgwid" id="subText">
                                     </div>
                                 </div>
+                                <div>
+                                    <h4>演出公告：</h4>
+                                    <input name="notice" th:field="*{notice}" class="form-control" type="text" readonly>
+                                </div>
+                                <h4>演出公告：</h4>
+
 
                                 <div id="noticeImg" class="ibox float-e-margins ">
                                     <h4 class="ibox-title">购票须知：</h4>
@@ -393,6 +399,10 @@
     var subText = document.getElementById("subText")
     subText.innerHTML = '[[${kylinPerformanceMisVo.details}]]'.replaceAll("\"", "");
 
+    // 演出详情 购票须知
+    var notice = document.getElementById("notice")
+    notice.innerHTML = '[[${kylinPerformanceMisVo.notice}]]'.replaceAll("\"", "");
+
     //会员详情
     function memberInfo() {
         document.getElementById("content_iframe").src = "../memberInfo/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");