From 5234676de514271f7c89c536e2fb53243fae55d2 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 14 Apr 2021 10:58:28 +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

---
 .../main/resources/templates/activity/info/add.html | 13 +++++++++----
 .../resources/templates/activity/info/edit.html     |  8 ++++++--
 2 files changed, 15 insertions(+), 6 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 987c6d912..57c1a9b89 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -320,7 +320,7 @@
                     </div>
                 </div>
                 <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div>
+                    <div style="height: 400px">
                         <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">
+                        <img id="activityTemplateimg" src="../../img/yun.jpg" width="60%" height="400" style="display: none">
                     </div>
                 </div>
                 <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 100%">
@@ -459,7 +459,9 @@
                            th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
                     </div>
                     <input type="hidden" name="actConfig-actType" id="activityPlayval" value="">
-                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
+                    <div style="height: 300">
+                        <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300" style="display: none">
+                    </div>
                     <h4 class="form-header h4">活动规则</h4>
                     <div class="row" id="activityPlaydiv" style="display: none">
                         <div class="col-sm-6">
@@ -1188,9 +1190,12 @@
         $("#"+id+"img").attr("src",path+valus+".jpg");
         if (valus != "0"){
             $("#activityPlaydiv").css('display','block');//显示
+            $("#activityTemplateimg").css('display','block');//显示
+            $("#activityPlayimg").css('display','block');//显示
         }else{
             $("#activityPlaydiv").css('display','none');//隐藏
-            $('#smartwizard').smartWizard();
+            $("#activityTemplateimg").css('display','none');
+            $("#activityPlayimg").css('display','none');
         }
 
     }
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 6800786f0..3de324615 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -320,7 +320,7 @@
                     </div>
                 </div>
                 <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div>
+                    <div style="height: 400px">
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
 
@@ -452,7 +452,7 @@
                     </div>
                 </div>
                 <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4" style="height: 100%">
-                    <div style="">
+                    <div style="height: 430px">
                     <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}"
@@ -1090,6 +1090,9 @@
                 $(this).addClass('btn-success').siblings().removeClass('btn-success');
                 $("#activityTemplateh4").text(this.text);
                 $("#activityTemplateimg").attr("src",path+val+".jpg");
+                if (val == '0'){
+                    $("#activityTemplateimg").css('display','none');
+                }
             }
         });
         //加载步骤3数据
@@ -1122,6 +1125,7 @@
                     $("#activityPlaydiv").css('display','block');//显示
                 }else{
                     $("#activityPlaydiv").css('display','none');//隐藏
+                    $("#activityPlayimg").css('display','none');
                 }
             }
         });