From ba61bfe793a217f08b3a4d28f5df1f98652cde83 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 14 Apr 2021 09:07:01 +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          | 18 ++++++++---------
 .../templates/activity/info/edit.html         | 20 +++++++++----------
 2 files changed, 19 insertions(+), 19 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 d8221cf1f..6f7380d1b 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -333,8 +333,8 @@
                         <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="400">
                     </div>
                 </div>
-                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
-                    <div style="height: 610px">
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第3步-配置展现内容</h4>
                             <div class="row">
@@ -450,7 +450,7 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 100%">
                     <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}"
@@ -583,8 +583,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 600px">
+                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -753,8 +753,8 @@
 
                     </div>
                 </div>
-                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
-                    <div style="height: 610px">
+                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第六步-配置分享信息</h4>
                             <div class="row">
@@ -826,8 +826,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
-                    <div style="height: 610px">
+                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第七步-关注二维码</h4>
                             <div class="row">
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 2702013bc..13c2d842a 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -332,8 +332,8 @@
                         <img id="activityTemplateimg" src="../../img/act/0.jpg" width="60%" height="400">
                     </div>
                 </div>
-                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
-                    <div style="height: 610px">
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 100%">
+                    <div style="">
                         <div class="leftarea">
                             <h4 class="form-header h4">第3步-配置展现内容</h4>
                             <div class="row">
@@ -451,8 +451,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
-                    <div style="height: 600px">
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 100%">
+                    <div style="">
                     <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}"
@@ -584,8 +584,8 @@
                     </div>
                     </div>
                 </div>
-                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 600px">
+                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -756,8 +756,8 @@
 
                     </div>
                 </div>
-                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
-                    <div style="height: 610px">
+                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第六步-配置分享信息</h4>
                             <div class="row">
@@ -833,8 +833,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
-                    <div style="height: 610px">
+                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7" style="height: 100%">
+                    <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第七步-关注二维码</h4>
                             <div class="row">