From a72407644ea092d6a177236f510253ff9d3a4371 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 21 Apr 2021 15:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E7=AB=AF-=E7=AC=AC=E5=9B=9B=E6=AD=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/info/add.html | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 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 2a1bfd98b..16aec60fb 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -482,7 +482,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="row">
                             <div class="col-sm-6">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label is-required">时间段抽奖配置：</label>
@@ -505,8 +504,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
                             <div class="col-sm-6">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
@@ -532,8 +529,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
                             <div class="col-sm-6">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label is-required">抽奖必中配置：</label>
@@ -556,8 +551,6 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row">
                             <div class="col-sm-6">
                                 <div class="form-group">
                                     <label class="col-sm-4 control-label is-required">抽奖必中奖品：</label>
@@ -573,12 +566,9 @@
                                     </div>
                                 </div>
                             </div>
-                        </div>
-                        <div class="row" style="height: 500">
-                            <div class="form-group" style="float: left">
-                                <div  style="width: 60%">
+                        <div class="col-sm-6">
+                            <div class="form-group">
                                     <label class="col-sm-4 control-label is-required">规则描述：</label>
-                                </div>
                                 <div class="col-sm-8">
                                     <div class="summernote1">
                                     </div>
@@ -1010,6 +1000,10 @@
             height:200,
             lang: 'zh-CN'
         });
+        $('.summernote1').summernote({
+            height:200,
+            lang: 'zh-CN'
+        });
         // 工具栏按钮
         var btnFinish = $('<a id="btn-finish"></a>').text('完成')
             .addClass('btn btn-info')