From b82556fe948074211a0cc8787ab4d5033d382e42 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 20 Apr 2021 10:00:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E7=BC=96=E8=BE=91=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E8=A7=84=E5=88=99=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/info/add.html   |  6 ++++--
 .../resources/templates/activity/info/edit.html  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+), 2 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 53d7f18a4..f25981899 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -590,7 +590,7 @@
                                     <label class="col-sm-4 control-label is-required">规则描述：</label>
                                 </div>
                                 <div class="col-sm-8">
-                                    <div class="summernote">
+                                    <div class="summernote1">
                                     </div>
                                 </div>
                                 <textarea id="drawdescribe"  name="drawRule-drawdescribe" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
@@ -1026,7 +1026,9 @@
             .on('click', function () {
                 //添加保存逻辑
                 var markupStr  = $('.summernote').summernote('code');
-                $("btnLink2").val(markupStr);
+                $("#btnLink2").val(markupStr);
+                var markupStr1  = $('.summernote1').summernote('code');
+                $("#drawdescribe").val(markupStr1);
                 var data = customSerialize("form-info-add", true);
                 $.ajax({
                     url: prefix + "/add",
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
index ee3a6a20d..50df6b731 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -581,6 +581,18 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="row" style="height: 500">
+                            <div class="form-group" style="float: left">
+                                <div  style="width: 60%">
+                                    <label class="col-sm-4 control-label is-required">规则描述：</label>
+                                </div>
+                                <div class="col-sm-8">
+                                    <div class="summernote1">
+                                    </div>
+                                </div>
+                                <textarea id="drawdescribe" type="text"  name="drawRule-drawdescribe" th:value="*{drawRule.DRAWDESCRIBE}" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
+                            </div>
+                        </div>
                     </div>
                     </div>
                 </div>
@@ -1041,6 +1053,8 @@
                 //添加保存逻辑
                 var markupStr  = $('.summernote').summernote('code');
                 $("#btnLink2").val(markupStr);
+                var markupStr1  = $('.summernote1').summernote('code');
+                $("#drawdescribe").val(markupStr1);
                 var data = customSerialize("form-info-add", true);
                 $.ajax({
                     url: prefix + "/edit",
@@ -1125,6 +1139,8 @@
         $('.summernote').summernote('code',linkvar);
         //加载步骤4数据
         var val = $("#activityPlayval").val();
+        var linkvar1 = [[${vo.drawRule.DRAWDESCRIBE}]];
+        $('.summernote1').summernote('code',linkvar1);
         $("a[id = 'activityPlay']").each(function (){
             if ($(this).attr("value") == val){
                 $(this).addClass('btn-success').siblings().removeClass('btn-success');