From 1ffa1410556af86c37eebd94dd0d56c5de20591e Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 14 Apr 2021 13:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/add.html          | 36 +++++++++----------
 .../templates/activity/info/edit.html         | 36 +++++++++----------
 2 files changed, 36 insertions(+), 36 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 57c1a9b89..451d8d305 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -8,17 +8,17 @@
 </head>
 <style type='text/css'>
     /* 如果要让工具栏固定在页面底部,使用下面的样式,不需要的可以注释 */
-    .sw>.toolbar-bottom{
-        z-index: 100;
-        bottom: 0px;
-        left: 0;
-        width: 100%;
-        position: fixed;
-        text-align: right;
-        background: #fff;
-        box-shadow: 0 -2px 6px 1px hsla(223,8%,83%,.5);
-        border-top: 1px solid #e3e4e8;
-    }
+    /*.sw>.toolbar-bottom{*/
+    /*    z-index: 100;*/
+    /*    bottom: 0px;*/
+    /*    left: 0;*/
+    /*    width: 100%;*/
+    /*    position: fixed;*/
+    /*    text-align: right;*/
+    /*    background: #fff;*/
+    /*    box-shadow: 0 -2px 6px 1px hsla(223,8%,83%,.5);*/
+    /*    border-top: 1px solid #e3e4e8;*/
+    /*}*/
     .rightarea {
         float: left;
         width: 40%;
@@ -31,10 +31,10 @@
         height: 500px;
     }
 
-    .sw > .tab-content {
-        overflow-x: hidden;
-        overflow-y: auto;
-    }
+    /*.sw > .tab-content {*/
+    /*    overflow-x: hidden;*/
+    /*    overflow-y: auto;*/
+    /*}*/
 
     .col-sm-6 {
         width: 50%;
@@ -320,7 +320,7 @@
                     </div>
                 </div>
                 <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div style="height: 400px">
+                    <div style="height: 500px">
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
                             <a id="activityTemplate" th:if="${dict.dictValue} != '0'" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
@@ -330,7 +330,7 @@
                         </div>
                         <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden">
                         <h4 id="activityTemplateh4" class="form-header h4">暂不选择</h4>
-                        <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="400" style="display: none">
+                        <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="400px" style="display: none">
                     </div>
                 </div>
                 <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 100%">
@@ -450,7 +450,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 100%">
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 120%">
                     <h4 class="form-header h4">第4步-选择玩法</h4>
                     <div th:with="type=${@dict.getType('activityPlay')}">
                         <a id="activityPlay" th:if="${dict.dictValue} != '0'" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
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 debeb3d18..b32d89484 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -7,17 +7,17 @@
     <th:block th:include="include :: jasny-bootstrap-css"/>
 </head>
 <style type='text/css'>
-    .sw>.toolbar-bottom{
-        z-index: 9999;
-        bottom: 0px;
-        left: 0;
-        width: 100%;
-        position: fixed;
-        text-align: right;
-        background: #fff;
-        box-shadow: 0 -2px 6px 1px hsla(223,8%,83%,.5);
-        border-top: 1px solid #e3e4e8;
-    }
+    /*.sw>.toolbar-bottom{*/
+    /*    z-index: 9999;*/
+    /*    bottom: 0px;*/
+    /*    left: 0;*/
+    /*    width: 100%;*/
+    /*    position: fixed;*/
+    /*    text-align: right;*/
+    /*    background: #fff;*/
+    /*    box-shadow: 0 -2px 6px 1px hsla(223,8%,83%,.5);*/
+    /*    border-top: 1px solid #e3e4e8;*/
+    /*}*/
     .rightarea {
         float: left;
         width: 40%;
@@ -30,10 +30,10 @@
         height: 500px;
     }
 
-    .sw > .tab-content {
-        overflow-x: hidden;
-        overflow-y: auto;
-    }
+    /*.sw > .tab-content {*/
+    /*    overflow-x: hidden;*/
+    /*    overflow-y: auto;*/
+    /*}*/
 
     .col-sm-6 {
         width: 50%;
@@ -320,7 +320,7 @@
                     </div>
                 </div>
                 <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div style="height: 400px">
+                    <div style="height: 500px">
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
 
@@ -329,7 +329,7 @@
                         </div>
                         <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden" th:value="*{actConfig.pageStyle}">
                         <h4 id="activityTemplateh4" class="form-header h4">暂不选择</h4>
-                        <img id="activityTemplateimg" src="../../img/act/0.jpg" width="60%" height="400">
+                        <img id="activityTemplateimg" src="../../img/act/0.jpg" width="60%" height="400px">
                     </div>
                 </div>
                 <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 100%">
@@ -451,7 +451,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 100%">
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 120%">
                     <div style="height: 430px">
                     <h4 class="form-header h4">第4步-选择玩法</h4>
                     <div th:with="type=${@dict.getType('activityPlay')}">