From b369afd0e204585cccc9d1203b2b3f333b1bbb12 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Mon, 12 Apr 2021 14:35:25 +0800
Subject: [PATCH 01/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/ActPageConfigUserinfo.java         |  1 +
 .../mapper/activity/ActConfigMapper.xml       |  2 +-
 .../activity/ActPageConfigGuideMapper.xml     |  2 +-
 .../activity/ActPageConfigSubscribeMapper.xml |  2 +-
 .../activity/ActPageConfigUserinfoMapper.xml  |  2 +-
 .../templates/activity/info/edit1.html        | 28 +++++++------------
 6 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
index 8d6476e41..3a8967fd8 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/ActPageConfigUserinfo.java
@@ -246,4 +246,5 @@ public class ActPageConfigUserinfo extends BaseEntity
             .append("updateTime", getUpdateTime())
             .toString();
     }
+
 }
diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
index 000343a8a..398aafdfc 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActConfigVo"/>
         where id = #{id}
     </select>
-    <select id="selectActConfigByCode" resultType="com.sinosoft.activity.domain.ActConfig">
+    <select id="selectActConfigByCode" resultMap="ActConfigResult">
         <include refid="selectActConfigVo"/>
         where act_code = #{drawCode}
     </select>
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
index 0ca0e7386..112f0fd23 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigGuideVo"/>
         where id = #{id}
     </select>
-    <select id="selectActPageConfigGuideByCode" resultType="ActPageConfigGuide">
+    <select id="selectActPageConfigGuideByCode" resultMap="ActPageConfigGuideResult">
         <include refid="selectActPageConfigGuideVo"/>
         where act_code = #{drawCode}
     </select>
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
index 27c0ed19e..0b4753c3d 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigSubscribeVo"/>
         where id = #{id}
     </select>
-    <select id="selectActPageConfigSubscribeByCode" resultType="ActPageConfigSubscribe">
+    <select id="selectActPageConfigSubscribeByCode" resultMap="ActPageConfigSubscribeResult">
         <include refid="selectActPageConfigSubscribeVo"/>
         where act_code = #{drawCode}
     </select>
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
index dbc078e1e..940ce03ff 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectActPageConfigUserinfoVo"/>
         where id = #{id}
     </select>
-    <select id="selectActPageConfigUserinfoByCode" resultType="ActPageConfigUserinfo">
+    <select id="selectActPageConfigUserinfoByCode" resultMap="ActPageConfigUserinfoResult">
         <include refid="selectActPageConfigUserinfoVo"/>
         where act_code = #{drawCode}
     </select>
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index 06450c258..b0fdbff3d 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -209,7 +209,6 @@
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
         <input name="DRAWID" th:field="*{drawInfo.DRAWID}" type="hidden">
-        <input name="DRAWRULEID" th:field="*{drawInfo.DRAWRULEID}" type="hidden">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -318,9 +317,9 @@
                     <div>
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
-                            <a id="activityTemplate" th:if="${dict.dictValue} != *{actConfig.pageStyle}" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                            <a id="activityTemplate" th:if="${dict.dictValue} != '0'" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                            <a id="activityTemplate" th:if="${dict.dictValue} eq *{actConfig.pageStyle}" class="btn btn-success btn-rounded"  href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                            <a id="activityTemplate" th:if="${dict.dictValue} eq '0'" class="btn btn-success btn-rounded"  href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                th:value="${dict.dictValue}" onclick="activityTemplate(this)" ></a>
                         </div>
                         <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden" th:field="*{actConfig.pageStyle}">
@@ -464,7 +463,7 @@
                                             class="form-control"
                                             th:with="type=${@dict.getType('is_boolean')}">
                                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                th:value="${dict.dictValue}" th:field="*{drawRule.firstflag}"></option>
+                                                th:value="${dict.dictValue}" th:field="*{drawRule.FIRSTFLAG}"></option>
                                     </select>
                                 </div>
                             </div>
@@ -488,7 +487,7 @@
                                                 class="form-control"
                                                 th:with="type=${@dict.getType('is_boolean')}">
                                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.dailyflag}"></option>
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.DAILYFLAG}"></option>
                                         </select>
                                     </div>
                                 </div>
@@ -498,7 +497,7 @@
                                     <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                                     <div class="col-sm-8">
                                         <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
-                                               class="form-control" type="text" maxlength="30" disabled th:field="*{drawRule.dailynumber}">
+                                               class="form-control" type="text" maxlength="30" disabled th:field="*{drawRule.DAILYNUMBER}">
                                     </div>
                                 </div>
                             </div>
@@ -509,7 +508,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
                                     <div class="col-sm-8">
                                         <div class="input-group date">
-                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:field="*{drawRule.dailystarttime}"
+                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:field="*{drawRule.DAILYSTARTTIME}"
                                                    class="form-control"
                                                    placeholder="HH:mm:ss" type="text" disabled>
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -522,7 +521,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
                                     <div class="col-sm-8">
                                         <div class="input-group date">
-                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:field="*{drawRule.dailyendtime}"
+                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:field="*{drawRule.DAILYENDTIME}"
                                                    placeholder="HH:mm:ss" type="text" disabled>
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                                         </div>
@@ -538,7 +537,7 @@
                                         <select name="drawRule-willdrawflag" id="WILLDRAWFLAG" onchange="willdrawflag()"
                                                 class="form-control" th:with="type=${@dict.getType('is_boolean')}">
                                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.willdrawflag}"></option>
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.WILLDRAWFLAG}"></option>
                                         </select>
                                     </div>
                                 </div>
@@ -548,7 +547,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
                                     <div class="col-sm-8">
                                         <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
-                                               placeholder="抽奖必中计数" th:field="*{drawRule.willdrawawardnumber}"
+                                               placeholder="抽奖必中计数" th:field="*{drawRule.WILLDRAWAWARDNUMBER}"
                                                class="form-control" type="text" maxlength="30" disabled>
                                     </div>
                                 </div>
@@ -659,22 +658,19 @@
                                         <label class="col-sm-4 control-label is-required">客户必填信息：</label>
                                         <div class="col-sm-8">
                                             <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name" th:field="*{actPageConfigUserinfo.userName}"
+                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
                                                        onclick="updateText(this)">姓名</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
-                                                       th:field="*{actPageConfigUserinfo.mobile}"
                                                        onclick="updateText(this)">手机号</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
-                                                       th:field="*{actPageConfigUserinfo.gender}"
                                                        onclick="updateText(this)">性别</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
-                                                       th:field="*{actPageConfigUserinfo.address}"
                                                        onclick="updateText(this)">地址</input>
                                             </label>
                                         </div>
@@ -688,22 +684,18 @@
                                         <div class="col-sm-8">
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentName"
-                                                       th:field="*{actPageConfigUserinfo.agentName}"
                                                        id="agentName" onclick="updateText(this)">代理人姓名</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
-                                                       th:field="*{actPageConfigUserinfo.agentMobile}"
                                                        id="agentPhone" onclick="updateText(this)">代理人手机号</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentGender"
-                                                       th:field="*{actPageConfigUserinfo.agentGender}"
                                                        id="agentSex" onclick="updateText(this)">代理人性别</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentNo"
-                                                       th:field="*{actPageConfigUserinfo.agentNo}"
                                                        id="agentNumber" onclick="updateText(this)">代理人工号</input>
                                             </label>
                                         </div>

From 376a461ec05fe958fc575bba5786d7bf5d489a59 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Mon, 12 Apr 2021 16:15:31 +0800
Subject: [PATCH 02/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DrawInfoController.java        | 26 +++++----
 .../activity/mapper/DrawRuleMapper.java       |  2 +-
 .../activity/service/IDrawInfoService.java    |  2 +
 .../service/impl/DrawInfoServiceImpl.java     | 53 +++++++++++++++++--
 .../mapper/activity/ActConfigMapper.xml       |  3 +-
 .../activity/ActPageConfigGuideMapper.xml     |  3 +-
 .../activity/ActPageConfigSubscribeMapper.xml |  3 +-
 .../activity/ActPageConfigUserinfoMapper.xml  |  3 +-
 .../mapper/activity/DrawRuleMapper.xml        |  3 +-
 9 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
index bfd8bb05d..19d4df37b 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
@@ -188,16 +188,20 @@ public class DrawInfoController extends BaseController
     @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(DrawInfo drawInfo)
-    {
-        logger.info("修改存储抽奖特殊规则对象传参："+JSON.toJSONString(drawInfo));
-        drawInfo.setLASTUPDATETIMESTAMP(new Date());
-        drawInfoService.updateDrawInfo(drawInfo);
-        DrawRule drawRule = new  DrawRule();
-        BeanUtils.copyProperties(drawInfo,drawRule);
-        logger.info("修改存储抽奖特殊规则对象入参："+JSON.toJSONString(drawRule));
-        int i = iDrawRuleService.updateDrawRule(drawRule);
-        return toAjax(i);
+        public AjaxResult editSave(ActVO vo)
+        {
+            try{
+                logger.info("前台传参"+ JSON.toJSONString(vo));
+                Date date = new Date();
+
+                int i = drawInfoService.updateActVO(vo);
+                return toAjax(i);
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+                return AjaxResult.error("系统繁忙");
+            }
+            
     }
 
     /**
@@ -209,6 +213,8 @@ public class DrawInfoController extends BaseController
     @ResponseBody
     public AjaxResult remove(String ids)
     {
+
+
         return toAjax(drawInfoService.deleteDrawInfoByIds(ids));
     }
 
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
index b2c8bee51..65a8e6ac8 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/mapper/DrawRuleMapper.java
@@ -70,5 +70,5 @@ public interface DrawRuleMapper
      *  根据活动代码删除抽奖活动管理信息
      * @param toStrArray
      */
-   public void deleteDrawRuleByIdCode(String[] toStrArray);
+   public int deleteDrawRuleByIdCode(String[] toStrArray);
 }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
index 206d1656b..1e2029118 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -2,6 +2,7 @@ package com.sinosoft.activity.service;
 
 
 import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.vo.ActVO;
 
 import java.util.List;
 
@@ -68,4 +69,5 @@ public interface IDrawInfoService
     public int deleteDrawInfoById(String DRAWID);
 
 
+   public  int updateActVO(ActVO vo);
 }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
index 1401908e1..e4ca30f39 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -1,12 +1,14 @@
 package com.sinosoft.activity.service.impl;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
-import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.domain.*;
 import com.sinosoft.activity.mapper.*;
 import com.sinosoft.activity.service.IDrawInfoService;
+import com.sinosoft.activity.vo.ActVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -85,6 +87,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
     @Override
     public int updateDrawInfo(DrawInfo drawInfo)
     {
+
         return drawInfoMapper.updateDrawInfo(drawInfo);
     }
 
@@ -104,7 +107,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         //根据ID查询抽奖活动信息
         List<DrawInfo> drawInfos = drawInfoMapper.selectDrawInfoList(drawInfo);
         //删除活动管理信息
-        int i = drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids));
+        drawInfoMapper.deleteDrawInfoByIds(Convert.toStrArray(ids));
         List<String> collect = drawInfos.stream().map(DrawInfo::getDRAWCODE).collect(Collectors.toList());
         String policyEndorseNos = String.join(",",collect);
 
@@ -117,7 +120,7 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         //根据活动代码删除活动收集配置信息
         actPageConfigUserinfoMapper.deleteActPageConfigUserinfoByCode(Convert.toStrArray(policyEndorseNos));
         //根据活动代码删除抽奖活动管理信息
-        drawRuleMapper.deleteDrawRuleByIdCode(Convert.toStrArray(policyEndorseNos));
+        int i = drawRuleMapper.deleteDrawRuleByIdCode(Convert.toStrArray(policyEndorseNos));
         return i;
     }
 
@@ -132,4 +135,48 @@ public class DrawInfoServiceImpl implements IDrawInfoService
     {
         return drawInfoMapper.deleteDrawInfoById(DRAWID);
     }
+
+    @Override
+    public int updateActVO(ActVO vo) {
+        Date date = new Date();
+
+        DrawInfo drawInfo = vo.getDrawInfo();
+        drawInfo.setLASTUPDATETIMESTAMP(date);
+
+        //修改抽奖活动管理对象
+        String drawcode = drawInfo.getDRAWCODE();
+        drawInfoMapper.updateDrawInfo(drawInfo);
+
+        //修改活动配置
+        ActConfig actConfig = vo.getActConfig();
+        actConfig.setUpdateTime(date);
+        actConfig.setActCode(drawcode);
+        actConfigMapper.updateActConfig(actConfig);
+
+        //修改活动展示内容配置
+        ActPageConfigGuide actPageConfigGuide = vo.getActPageConfigGuide();
+        actPageConfigGuide.setUpdateTime(date);
+        actPageConfigGuide.setActCode(drawcode);
+        actPageConfigGuideMapper.updateActPageConfigGuide(actPageConfigGuide);
+
+
+        //修改活动收集配置
+        ActPageConfigSubscribe actPageConfigSubscribe = vo.getActPageConfigSubscribe();
+        actPageConfigSubscribe.setUpdateTime(date);
+        actPageConfigSubscribe.setActCode(drawcode);
+        actPageConfigSubscribeMapper.updateActPageConfigSubscribe(actPageConfigSubscribe);
+
+        //修改活动用户信息
+        ActPageConfigUserinfo actPageConfigUserinfo = vo.getActPageConfigUserinfo();
+        actPageConfigUserinfo.setUpdateTime(date);
+        actPageConfigUserinfo.setActCode(drawcode);
+        actPageConfigUserinfoMapper.updateActPageConfigUserinfo(actPageConfigUserinfo);
+
+        //修改查询抽奖活动管理对象
+        DrawRule drawRule = vo.getDrawRule();
+        drawRule.setDRAWCODE(drawcode);
+        drawRule.setLASTUPDATETIMESTAMP(date);
+        int i = drawRuleMapper.updateDrawRule(drawRule);
+        return i;
+    }
 }
diff --git a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
index 3e0face9f..0b311ab89 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActConfigMapper.xml
@@ -78,7 +78,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="pageStyle != null">page_style = #{pageStyle},</if>
             <if test="actType != null">act_type = #{actType},</if>
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="actName != null">act_name = #{actName},</if>
             <if test="shareTitle != null">share_title = #{shareTitle},</if>
             <if test="shareDesc != null">share_desc = #{shareDesc},</if>
@@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActConfigById" parameterType="Integer">
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
index 67e3f8947..477e9ec77 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigGuideMapper.xml
@@ -76,7 +76,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigGuide" parameterType="ActPageConfigGuide">
         update act_page_config_guide
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="actTitle != null">act_title = #{actTitle},</if>
             <if test="actDesc != null">act_desc = #{actDesc},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
@@ -87,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigGuideById" parameterType="Integer">
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
index 3c7f1e1eb..4740574fd 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigSubscribeMapper.xml
@@ -60,14 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigSubscribe" parameterType="ActPageConfigSubscribe">
         update act_page_config_subscribe
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="description != null">description = #{description},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigSubscribeById" parameterType="Integer">
diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
index 70b0a1a51..d088c24dd 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
@@ -104,7 +104,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateActPageConfigUserinfo" parameterType="ActPageConfigUserinfo">
         update act_page_config_userinfo
         <trim prefix="SET" suffixOverrides=",">
-            <if test="actCode != null and actCode != ''">act_code = #{actCode},</if>
             <if test="title != null">title = #{title},</if>
             <if test="description != null">description = #{description},</if>
             <if test="bgImg != null">bg_img = #{bgImg},</if>
@@ -122,7 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>
-        where id = #{id}
+        where act_code = #{actCode}
     </update>
 
     <delete id="deleteActPageConfigUserinfoById" parameterType="Integer">
diff --git a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
index d06ff8e6b..dc97d0a9a 100644
--- a/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/DrawRuleMapper.xml
@@ -89,7 +89,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateDrawRule" parameterType="DrawRule">
         update draw_rule
         <trim prefix="SET" suffixOverrides=",">
-            <if test="DRAWCODE != null and DRAWCODE != ''">DRAWCODE = #{DRAWCODE},</if>
             <if test="FIRSTFLAG != null">FIRSTFLAG = #{FIRSTFLAG},</if>
             <if test="FIRSTAWARDPRIZE != null">FIRSTAWARDPRIZE = #{FIRSTAWARDPRIZE},</if>
             <if test="DAILYFLAG != null">DAILYFLAG = #{DAILYFLAG},</if>
@@ -102,7 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="LASTUPDATETIMESTAMP != null">LASTUPDATETIMESTAMP = #{LASTUPDATETIMESTAMP},</if>
             <if test="WILLDRAWAWARDNUMBER != null">WILLDRAWAWARDNUMBER = #{WILLDRAWAWARDNUMBER},</if>
         </trim>
-        where DRAWRULEID = #{DRAWRULEID}
+        where DRAWCODE = #{DRAWCODE}
     </update>
 
     <delete id="deleteDrawRuleById" parameterType="String">

From 67ec8a8870c90acedce348cddff1d163583553c0 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Mon, 12 Apr 2021 16:21:21 +0800
Subject: [PATCH 03/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit1.html        | 68 ++++++++++++++++---
 1 file changed, 58 insertions(+), 10 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index b0fdbff3d..de8eb53ad 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -208,7 +208,8 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
-        <input name="DRAWID" th:field="*{drawInfo.DRAWID}" type="hidden">
+        <input name="drawInfo-DRAWID" th:field="*{drawInfo.DRAWID}" type="hidden">
+        <input name="drawInfo-DRAWCODE" th:field="*{drawInfo.DRAWCODE}" type="hidden">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -317,10 +318,9 @@
                     <div>
                         <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}"
+
+                            <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                            <a id="activityTemplate" th:if="${dict.dictValue} eq '0'" class="btn btn-success btn-rounded"  href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                               th:value="${dict.dictValue}" onclick="activityTemplate(this)" ></a>
                         </div>
                         <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden" th:field="*{actConfig.pageStyle}">
                         <h4 id="activityTemplateh4" class="form-header h4">暂不选择</h4>
@@ -362,7 +362,9 @@
 
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;"></div>
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigGuide.bgImg}">
+                                        </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
@@ -614,7 +616,9 @@
 
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;"></div>
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigUserinfo.bgImg}">
+                                        </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
@@ -801,7 +805,9 @@
 
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;"></div>
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actConfig.shareImg}">
+                                        </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
@@ -854,7 +860,9 @@
                                     <label class="col-sm-4 control-label is-required">背景图片：</label>
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;"></div>
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.bgImg}">
+                                        </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
@@ -874,7 +882,9 @@
                                     <label class="col-sm-4 control-label is-required">二维码图片：</label>
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;"></div>
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.bgImg2}">
+                                        </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
                                                         class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
@@ -1093,6 +1103,44 @@
                 toolbarExtraButtons: [btnCancel, btnPrev, btnNext, btnFinish]// 扩展的按钮集合
             }
         });
+        //加载步骤2数据
+        var path = "../../../img/act/";
+        var val = $("#activityTemplateval").val();
+        $("a[id = 'activityTemplate']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityTemplateh4").text(this.text);
+                $("#activityTemplateimg").attr("src",path+val+".jpg");
+            }
+        });
+        //加载步骤3数据
+        var title = $("#actTitle").val();
+        $("#actTitlePic").text(title);
+        var desc = $("#actDesc").val();
+        $("#actDescPic").text(desc);
+        var picval = $("#picval").val();
+        $("#picimg").attr("src", picval);
+        var btn1 = $("#btn1").val();
+        $("#btn1Pic").text(btn1);
+        var btn2 = $("#btn2").val();
+        $("#btn2Pic").text(btn2);
+        //加载步骤4数据
+        var val = $("#activityPlayval").val();
+        $("a[id = 'activityPlay']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityPlayh4").text(this.text);
+                $("#activityPlayimg").attr("src",path+val+".jpg");
+                if (val != "0"){
+                    $("#activityPlaydiv").css('display','block');//显示
+                }else{
+                    $("#activityPlaydiv").css('display','none');//隐藏
+                }
+            }
+        });
+
+
+
     });
 
     // 显示步骤时将触发事件
@@ -1223,7 +1271,7 @@
     }
 
     function activityTemplate(val) {
-        var path = "../../img/act/";
+        var path = "../../../img/act/";
         $(val).addClass('btn-success').siblings().removeClass('btn-success');
         var id = val.id;
         var valus = $("#"+id+".btn-success").attr("value");

From 5fc55cb940710d8dd0b3341c7a9e069f54d3f75c Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Mon, 12 Apr 2021 16:37:27 +0800
Subject: [PATCH 04/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/edit1.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index de8eb53ad..da0b0bfd5 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -883,7 +883,7 @@
                                     <div class="fileinput fileinput-new" data-provides="fileinput">
                                         <div class="fileinput-preview thumbnail" data-trigger="fileinput"
                                              style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigSubscribe.bgImg2}">
+                                            <img th:src="*{actPageConfigSubscribe.qrCode}">
                                         </div>
                                         <div>
                                                 <span class="btn btn-white btn-file"><span
@@ -1054,7 +1054,7 @@
                 var data = customSerialize("form-info-add", true);
                 alert(data);
                 $.ajax({
-                    url: prefix + "/add",
+                    url: prefix + "/edit",
                     data: data,
                     type: "post",
                     contentType: "application/json;charset=UTF-8",

From 79a24d0c4a2bb91e827daa1271ce6cb5bdf9dc69 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Mon, 12 Apr 2021 16:41:15 +0800
Subject: [PATCH 05/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sinosoft/activity/controller/DrawInfoController.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
index 19d4df37b..caa8fcb8e 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
@@ -178,7 +178,7 @@ public class DrawInfoController extends BaseController
         ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE());
         vo.setActPageConfigSubscribe(actPageConfigSubscribe);
         mmap.put("vo",vo);
-        return prefix + "/edit";
+        return prefix + "/edit1";
     }
 
     /**
@@ -188,7 +188,7 @@ public class DrawInfoController extends BaseController
     @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-        public AjaxResult editSave(ActVO vo)
+        public AjaxResult editSave(@RequestBody ActVO vo)
         {
             try{
                 logger.info("前台传参"+ JSON.toJSONString(vo));

From 93c875d3313bd7b58347e0e73a1b06048f4fd9a1 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Mon, 12 Apr 2021 17:07:49 +0800
Subject: [PATCH 06/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E5=9B=9E=E6=98=BE=E5=80=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit1.html        | 60 +++++++++----------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index da0b0bfd5..b5eacc801 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -208,8 +208,8 @@
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
-        <input name="drawInfo-DRAWID" th:field="*{drawInfo.DRAWID}" type="hidden">
-        <input name="drawInfo-DRAWCODE" th:field="*{drawInfo.DRAWCODE}" type="hidden">
+        <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
+        <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -245,7 +245,7 @@
                                         <label class="col-sm-4 control-label is-required">活动名称：</label>
                                         <div class="col-sm-8">
                                             <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
-                                                   type="text" maxlength="30" th:field="*{drawInfo.DRAWNAME}" >
+                                                   type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" >
                                         </div>
                                     </div>
                                 </div>
@@ -280,7 +280,7 @@
                                         <label class="col-sm-4 control-label is-required">消耗价值：</label>
                                         <div class="col-sm-8">
                                             <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
-                                                   type="text" maxlength="30" th:field="*{drawInfo.EXPENOVALUE}">
+                                                   type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}">
                                         </div>
                                     </div>
                                 </div>
@@ -322,7 +322,7 @@
                             <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
                         </div>
-                        <input id="activityTemplateval" name="actConfig-pageStyle" value="" type="hidden" th:field="*{actConfig.pageStyle}">
+                        <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="500">
                     </div>
@@ -338,7 +338,7 @@
                                         <div class="col-sm-8">
                                             <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
                                                    class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:field="*{actPageConfigGuide.actTitle}">
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}">
                                         </div>
                                     </div>
                                 </div>
@@ -350,7 +350,7 @@
                                         <div class="col-sm-8">
                                             <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
                                                    class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:field="*{actPageConfigGuide.actDesc}">
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}">
                                         </div>
                                     </div>
                                 </div>
@@ -373,7 +373,7 @@
                                                data-dismiss="fileinput">清除</a>
                                         </div>
                                     </div>
-                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:field="*{actPageConfigGuide.bgImg}">
+                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:value="*{actPageConfigGuide.bgImg}">
                                 </div>
                             </div>
                             <div class="row">
@@ -384,7 +384,7 @@
                                             <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
                                                    class="form-control"
                                                    type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:field="*{actPageConfigGuide.btnText}">
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
                                         </div>
                                     </div>
                                 </div>
@@ -397,7 +397,7 @@
                                             <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
                                                    class="form-control"
                                                    type="text"
-                                                   maxlength="30" th:field="*{actPageConfigGuide.btnLink}">
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
                                         </div>
                                     </div>
                                 </div>
@@ -409,7 +409,7 @@
                                         <div class="col-sm-8">
                                             <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
                                                    class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:field="*{actPageConfigGuide.btnText2}">
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
                                         </div>
                                     </div>
                                 </div>
@@ -422,7 +422,7 @@
                                             <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
                                                    class="form-control"
                                                    type="text"
-                                                   maxlength="30" th:field="*{actPageConfigGuide.btnLink2}">
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
                                         </div>
                                     </div>
                                 </div>
@@ -453,7 +453,7 @@
                         <a id="activityPlay" th:if="${dict.dictValue} eq '0'" class="btn btn-success  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
                            th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
                     </div>
-                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:field="*{actConfig.actType}">
+                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:value="*{actConfig.actType}">
                     <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
                     <h4 class="form-header h4">活动规则</h4>
                     <div class="row" id="activityPlaydiv" style="display: none">
@@ -499,7 +499,7 @@
                                     <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                                     <div class="col-sm-8">
                                         <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
-                                               class="form-control" type="text" maxlength="30" disabled th:field="*{drawRule.DAILYNUMBER}">
+                                               class="form-control" type="text" maxlength="30" disabled th:value="*{drawRule.DAILYNUMBER}">
                                     </div>
                                 </div>
                             </div>
@@ -510,7 +510,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖限制开始时间：</label>
                                     <div class="col-sm-8">
                                         <div class="input-group date">
-                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:field="*{drawRule.DAILYSTARTTIME}"
+                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
                                                    class="form-control"
                                                    placeholder="HH:mm:ss" type="text" disabled>
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
@@ -523,7 +523,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
                                     <div class="col-sm-8">
                                         <div class="input-group date">
-                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:field="*{drawRule.DAILYENDTIME}"
+                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
                                                    placeholder="HH:mm:ss" type="text" disabled>
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                                         </div>
@@ -549,7 +549,7 @@
                                     <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
                                     <div class="col-sm-8">
                                         <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
-                                               placeholder="抽奖必中计数" th:field="*{drawRule.WILLDRAWAWARDNUMBER}"
+                                               placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
                                                class="form-control" type="text" maxlength="30" disabled>
                                     </div>
                                 </div>
@@ -580,7 +580,7 @@
                                         <label class="col-sm-4 control-label is-required">标题：</label>
                                         <div class="col-sm-8">
                                             <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名"
-                                                   class="form-control" type="text" th:field="*{actPageConfigUserinfo.title}"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.title}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -592,7 +592,7 @@
                                         <label class="col-sm-4 control-label is-required">描述：</label>
                                         <div class="col-sm-8">
                                             <input id="describe" name="actPageConfigUserinfo-description"
-                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:field="*{actPageConfigUserinfo.description}"
+                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:value="*{actPageConfigUserinfo.description}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -604,7 +604,7 @@
                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
                                         <div class="col-sm-8">
                                             <input id="agreement" name="actPageConfigUserinfo-agreement" height="100px"
-                                                   class="form-control" type="text" th:field="*{actPageConfigUserinfo.agreement}"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.agreement}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -628,7 +628,7 @@
 
                                         </div>
                                     </div>
-                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:field="*{actPageConfigUserinfo.bgImg}"
+                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:value="*{actPageConfigUserinfo.bgImg}"
                                            value="">
                                 </div>
                             </div>
@@ -638,7 +638,7 @@
                                         <label class="col-sm-4 control-label is-required">自定义按钮：</label>
                                         <div class="col-sm-8">
                                             <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮"
-                                                   class="form-control" type="text" th:field="*{actPageConfigUserinfo.btnText}"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnText}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -650,7 +650,7 @@
                                         <label class="col-sm-4 control-label is-required">按钮跳转链接：</label>
                                         <div class="col-sm-8">
                                             <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text" th:field="*{actPageConfigUserinfo.btnLink}"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -767,7 +767,7 @@
                                         <div class="col-sm-8">
                                             <input id="shareConnect" name="actConfig-shareLink"
                                                    placeholder="例如：http://XX" class="form-control" type="text"
-                                                   th:field="*{actConfig.shareLink}"
+                                                   th:value="*{actConfig.shareLink}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -780,7 +780,7 @@
                                         <div class="col-sm-8">
                                             <input id="shareTitle" name="actConfig-shareTitle"
                                                    placeholder="例如：2021XX客户节" class="form-control" type="text"
-                                                   th:field="*{actConfig.shareTitle}"
+                                                   th:value="*{actConfig.shareTitle}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -793,7 +793,7 @@
                                         <div class="col-sm-8">
                                             <input id="shareDescribe" name="actConfig-shareDesc"
                                                    placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
-                                                   th:field="*{actConfig.shareDesc}"
+                                                   th:value="*{actConfig.shareDesc}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -816,7 +816,7 @@
                                                data-dismiss="fileinput">清除</a>
                                         </div>
                                     </div>
-                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:field="*{actConfig.shareImg}">
+                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:value="*{actConfig.shareImg}">
                                 </div>
                             </div>
                         </div>
@@ -849,7 +849,7 @@
                                         <div class="col-sm-8">
                                             <input id="qrCode" name="actPageConfigSubscribe-description"
                                                    placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
-                                                   th:field="*{actPageConfigSubscribe.description}"
+                                                   th:value="*{actPageConfigSubscribe.description}"
                                                    maxlength="30" onkeyup="updatePri(this)">
                                         </div>
                                     </div>
@@ -874,7 +874,7 @@
                                     </div>
                                 </div>
                                 <input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
-                                       th:field="*{actPageConfigSubscribe.bgImg}"
+                                       th:value="*{actPageConfigSubscribe.bgImg}"
                                        value="">
                             </div>
                             <div class="row">
@@ -896,7 +896,7 @@
                                     </div>
                                 </div>
                                 <input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
-                                       th:field="*{actPageConfigSubscribe.qrCode}"
+                                       th:value="*{actPageConfigSubscribe.qrCode}"
                                        value="">
                             </div>
                         </div>

From e9984d43b20b7c7fe3a1f519d46a84cf9710cdaa Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 09:17:41 +0800
Subject: [PATCH 07/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/add.html          | 37 +++++--------------
 .../templates/activity/info/edit1.html        |  8 ++++
 2 files changed, 18 insertions(+), 27 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 c9f48c98a..7da3325d9 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -471,7 +471,11 @@
                                 <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
                                 <div class="col-sm-8">
                                     <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                             disabled>
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
                                     </select>
                                 </div>
                             </div>
@@ -546,7 +550,12 @@
                                     <div class="col-sm-8">
                                         <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
                                                placeholder="抽奖必中计数"
-                                               class="form-control" type="text" maxlength="30" disabled>
+                                               class="form-control" type="text" maxlength="30"
+                                               th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
+                                               disabled>
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
                                     </div>
                                 </div>
                             </div>
@@ -906,32 +915,6 @@
 <script th:inline="javascript">
     var prefix = ctx + "activity/info"
 
-    /**获取奖品及信息列表*/
-    $(document).ready(function () {
-        var job = "";
-        $.ajax({
-
-                url: prefix + "/prizeInfo",
-                success: function (data) {
-
-                    for (var i in data) {
-                        if (job.length == 0) {
-                            job = "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
-                        } else {
-                            job += "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
-                        }
-                    }
-                    $("#firstawardprize").html(job);
-                    $("#willdrawawardprize").html(job);
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(errorThrown);
-                },
-                async: false             //false表示同步
-            }
-        );
-    });
-
     $("#form-info-add").validate({
         focusCleanup: true
     });
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index b5eacc801..6d3e73455 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -475,7 +475,11 @@
                                 <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
                                 <div class="col-sm-8">
                                     <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                             disabled>
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
                                     </select>
                                 </div>
                             </div>
@@ -562,7 +566,11 @@
                                     <div class="col-sm-8">
                                         <select name="drawRule-willdrawawardprize" class="form-control"
                                                 id="willdrawawardprize"
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                                 disabled>
+                                            <option value="">所有</option>
+                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                    th:value="${drawPrize.PRIZECODE}"></option>
                                         </select>
                                     </div>
                                 </div>

From 96ef2dcd130a6dc42ac8796916e907cbd5ea1ec4 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 09:53:32 +0800
Subject: [PATCH 08/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit1.html        | 92 ++++++++++++-------
 1 file changed, 60 insertions(+), 32 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index 6d3e73455..b5e32767e 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -15,8 +15,8 @@
 
     .leftarea {
         float: left;
-        width: 50%;
-        height: 300px;
+        width: 60%;
+        height: 500px;
     }
 
     .sw > .tab-content {
@@ -140,21 +140,19 @@
 
     /* 配置分享信息*/
     .drawShareTitlePri {
-        text-align: center;
         position: absolute;
-        top: 40%;
+        top: 45%;
         font-size: 20px;
-        left: 28%;
+        left: 73%;
         color: #F00;
         width: 100%;
     }
 
     .drawShareDescribePri {
-        text-align: center;
         position: absolute;
         top: 50%;
         font-size: 10px;
-        left: 25%;
+        left: 73%;
         color: #F00;
         width: 100%;
     }
@@ -162,9 +160,9 @@
     .drawShareImgPic {
         text-align: center;
         position: absolute;
-        top: 50%;
+        top: 52%;
         font-size: 37px;
-        left: 35%;
+        left: 38%;
         color: #F00;
         width: 100%;
     }
@@ -579,7 +577,7 @@
                     </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 610px">
+                    <div style="height: 810px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -611,9 +609,10 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
                                         <div class="col-sm-8">
-                                            <input id="agreement" name="actPageConfigUserinfo-agreement" height="100px"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.agreement}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
+                                              [[*{actPageConfigUserinfo.agreement}]]
+                                            </textarea>
+                                            <input type="hidden" >
                                         </div>
                                     </div>
                                 </div>
@@ -671,19 +670,19 @@
                                         <div class="col-sm-8">
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
-                                                       onclick="updateText(this)">姓名</input>
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.userName == 'on' ? true : false}" >姓名</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
-                                                       onclick="updateText(this)">手机号</input>
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.mobile == 'on' ? true : false}">手机号</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
-                                                       onclick="updateText(this)">性别</input>
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.gender == 'on' ? true : false}">性别</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
-                                                       onclick="updateText(this)">地址</input>
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
                                             </label>
                                         </div>
                                     </div>
@@ -696,19 +695,19 @@
                                         <div class="col-sm-8">
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentName"
-                                                       id="agentName" onclick="updateText(this)">代理人姓名</input>
+                                                       id="agentName" onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.agentName == 'on' ? true : false}">代理人姓名</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
-                                                       id="agentPhone" onclick="updateText(this)">代理人手机号</input>
+                                                       id="agentPhone" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentMobile == 'on' ? true : false}">代理人手机号</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentGender"
-                                                       id="agentSex" onclick="updateText(this)">代理人性别</input>
+                                                       id="agentSex" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentGender == 'on' ? true : false}">代理人性别</input>
                                             </label>
                                             <label class="checkbox-inline">
                                                 <input type="checkbox" name="actPageConfigUserinfo-agentNo"
-                                                       id="agentNumber" onclick="updateText(this)">代理人工号</input>
+                                                       id="agentNumber" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentNo == 'on' ? true : false}">代理人工号</input>
                                             </label>
                                         </div>
                                     </div>
@@ -799,10 +798,9 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">分享描述：</label>
                                         <div class="col-sm-8">
-                                            <input id="shareDescribe" name="actConfig-shareDesc"
-                                                   placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
-                                                   th:value="*{actConfig.shareDesc}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
+                                             [[*{actConfig.shareDesc}]]
+                                            </textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -832,7 +830,7 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="height: 210px">
                                 <div class="drawShareImg2Pic">
-                                    <img id="ss" src="../../img/shj.jpg" width="254" height="142">
+                                    <img  src="../../img/bj.png" height="170" width="340">
                                 </div>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
@@ -965,10 +963,7 @@
     });
 
 
-    function submitHandler() {
-        var data = $("#form-info-add").serializeArray();
-        $.operate.saveModal(prefix + "/add", data);
-    }
+
 
     //时间段抽奖配置
     function dailyflag() {
@@ -1146,9 +1141,42 @@
                 }
             }
         });
+     //记载步骤5数据
+        var title = $("#title").val();
+        $("#titlePri").text(title);
+        var describe = $("#describe").val();
+        $("#describePri").text(describe);
+        var agreement = $("#agreement").val();
+        $("#agreementPri").text(agreement);
+        var btn = $("#btn").val();
+        $("#btnPri").text(btn);
+        var pictureval = $("#pictureval").val();
+        $("#pictureimg").attr("src", picval);
+        $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
+            var id = this.id;
+            var boolean = $("#" + id).prop("checked");
+            if (boolean) {
+                $("#" + id + "Pri").attr('type', 'text');
+            } else {
+                $("#" + id + "Pri").attr('type', 'hidden');
+            }
 
+        });
 
-
+        //记载步骤6数据
+        var shareDescribe = $("#shareDescribe").val();
+        $("#shareDescribePri").text(shareDescribe);
+        var shareTitle = $("#shareTitle").val();
+        $("#shareTitlePri").text(shareTitle);
+        var shareImgval = $("#shareImgval").val();
+        $("#shareImgimg").attr("src", shareImgval);
+        //记载步骤7数据
+        var qrCode = $("#qrCode").val();
+        $("#qrCodePri").text(qrCode);
+        var backdropImgval = $("#backdropImgval").val();
+        $("#backdropImgimg").attr("src", backdropImgval);
+        var qrCodeImgval = $("#qrCodeImgval").val();
+        $("#qrCodeImgimg").attr("src", qrCodeImgval);
     });
 
     // 显示步骤时将触发事件
@@ -1279,7 +1307,7 @@
     }
 
     function activityTemplate(val) {
-        var path = "../../../img/act/";
+        var path = "../../img/act/";
         $(val).addClass('btn-success').siblings().removeClass('btn-success');
         var id = val.id;
         var valus = $("#"+id+".btn-success").attr("value");

From 85e769e4b9a918a23c13bb387d403341cef9d541 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:07:30 +0800
Subject: [PATCH 09/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/ActPageConfigUserinfoMapper.xml     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
index d088c24dd..0656f0def 100644
--- a/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
+++ b/sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
@@ -110,14 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="btnText != null">btn_text = #{btnText},</if>
             <if test="btnLink != null">btn_link = #{btnLink},</if>
             <if test="agreement != null">agreement = #{agreement},</if>
-            <if test="userName != null">user_name = #{userName},</if>
-            <if test="mobile != null">mobile = #{mobile},</if>
-            <if test="gender != null">gender = #{gender},</if>
-            <if test="address != null">address = #{address},</if>
-            <if test="agentName != null">agent_name = #{agentName},</if>
-            <if test="agentMobile != null">agent_mobile = #{agentMobile},</if>
-            <if test="agentGender != null">agent_gender = #{agentGender},</if>
-            <if test="agentNo != null">agent_no = #{agentNo},</if>
+            user_name = #{userName},
+            mobile = #{mobile},
+            gender = #{gender},
+            address = #{address},
+            agent_name = #{agentName},
+            agent_mobile = #{agentMobile},
+            agent_gender = #{agentGender},
+            agent_no = #{agentNo},
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
         </trim>

From f6a0ced77a45ebf43efceaa762628cdaacec033c Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 10:18:44 +0800
Subject: [PATCH 10/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89=E6=A1=86=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/activity/info/add.html   | 11 +++++------
 1 file changed, 5 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 7da3325d9..91bcc5059 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -550,12 +550,7 @@
                                     <div class="col-sm-8">
                                         <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
                                                placeholder="抽奖必中计数"
-                                               class="form-control" type="text" maxlength="30"
-                                               th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
-                                               disabled>
-                                        <option value="">所有</option>
-                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
-                                                th:value="${drawPrize.PRIZECODE}"></option>
+                                               class="form-control" type="text" maxlength="30" disabled>
                                     </div>
                                 </div>
                             </div>
@@ -567,7 +562,11 @@
                                     <div class="col-sm-8">
                                         <select name="drawRule-willdrawawardprize" class="form-control"
                                                 id="willdrawawardprize"
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
                                                 disabled>
+                                            <option value="">所有</option>
+                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                    th:value="${drawPrize.PRIZECODE}"></option>
                                         </select>
                                     </div>
                                 </div>

From 7f776e60480c3dad9d5e8e157241efa1f3d44ff6 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:29:51 +0800
Subject: [PATCH 11/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit1.html        | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
index b5e32767e..bb0854d4e 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit1.html
@@ -473,8 +473,7 @@
                                 <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
                                 <div class="col-sm-8">
                                     <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
-                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
-                                            disabled>
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
                                         <option value="">所有</option>
                                         <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
                                                 th:value="${drawPrize.PRIZECODE}"></option>
@@ -501,7 +500,7 @@
                                     <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
                                     <div class="col-sm-8">
                                         <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
-                                               class="form-control" type="text" maxlength="30" disabled th:value="*{drawRule.DAILYNUMBER}">
+                                               class="form-control" type="text" maxlength="30"  th:value="*{drawRule.DAILYNUMBER}">
                                     </div>
                                 </div>
                             </div>
@@ -514,7 +513,7 @@
                                         <div class="input-group date">
                                             <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
                                                    class="form-control"
-                                                   placeholder="HH:mm:ss" type="text" disabled>
+                                                   placeholder="HH:mm:ss" type="text" >
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                                         </div>
                                     </div>
@@ -526,7 +525,7 @@
                                     <div class="col-sm-8">
                                         <div class="input-group date">
                                             <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
-                                                   placeholder="HH:mm:ss" type="text" disabled>
+                                                   placeholder="HH:mm:ss" type="text" >
                                             <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                                         </div>
                                     </div>
@@ -552,7 +551,7 @@
                                     <div class="col-sm-8">
                                         <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
                                                placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
-                                               class="form-control" type="text" maxlength="30" disabled>
+                                               class="form-control" type="text" maxlength="30" >
                                     </div>
                                 </div>
                             </div>
@@ -564,8 +563,7 @@
                                     <div class="col-sm-8">
                                         <select name="drawRule-willdrawawardprize" class="form-control"
                                                 id="willdrawawardprize"
-                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
-                                                disabled>
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
                                             <option value="">所有</option>
                                             <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
                                                     th:value="${drawPrize.PRIZECODE}"></option>
@@ -934,28 +932,24 @@
 
     /**获取奖品及信息列表*/
     $(document).ready(function () {
-        var job = "";
-        $.ajax({
+        var DAILYFLAG = $("#DAILYFLAG").val();
+        alert(DAILYFLAG);
+        if(DAILYFLAG==0){
+            $("#dailynumber").attr('disabled','true');
+            $("#dailystarttime").attr('disabled','true');
+            $("#dailyendtime").attr('disabled','true');
+        }
+        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
+        if(WILLDRAWFLAG==0){
+            $("#willdrawawardnumber").attr('disabled','true');
+            $("#willdrawawardprize").attr('disabled','true');
+        }
+        var FIRSTFLAG = $("#FIRSTFLAG").val();
+        if(FIRSTFLAG==0){
+            $("#firstawardprize").attr('disabled','true');
+        }
 
-                url: prefix + "/prizeInfo",
-                success: function (data) {
 
-                    for (var i in data) {
-                        if (job.length == 0) {
-                            job = "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
-                        } else {
-                            job += "<option value='" + data[i].prizecode + "'>" + data[i].prizename + "</option>"
-                        }
-                    }
-                    $("#firstawardprize").html(job);
-                    $("#willdrawawardprize").html(job);
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(errorThrown);
-                },
-                async: false             //false表示同步
-            }
-        );
     });
 
     $("#form-info-add").validate({

From ac9c5e340a0b61cf18fc8a877fc9538f2caf50b3 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:36:34 +0800
Subject: [PATCH 12/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DrawInfoController.java        |    2 +-
 .../templates/activity/info/edit.html         | 1548 +++++++++++++----
 .../templates/activity/info/edit1.html        | 1321 --------------
 3 files changed, 1257 insertions(+), 1614 deletions(-)
 delete mode 100644 sino-activity/src/main/resources/templates/activity/info/edit1.html

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
index caa8fcb8e..0a17a0a70 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
@@ -178,7 +178,7 @@ public class DrawInfoController extends BaseController
         ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE());
         vo.setActPageConfigSubscribe(actPageConfigSubscribe);
         mmap.put("vo",vo);
-        return prefix + "/edit1";
+        return prefix + "/edit";
     }
 
     /**
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 a62400d0e..4c9ebc64e 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -1,348 +1,1312 @@
 <!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
 <head>
-    <th:block th:include="include :: header('修改抽奖活动管理')" />
-    <th:block th:include="include :: datetimepicker-css" />
+    <th:block th:include="include :: header('创建活动')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+    <th:block th:include="include :: jquery-smartwizard-css"/>
+    <th:block th:include="include :: jasny-bootstrap-css"/>
 </head>
+<style type='text/css'>
+    .rightarea {
+        float: left;
+        width: 40%;
+        height: 300px;
+    }
+
+    .leftarea {
+        float: left;
+        width: 60%;
+        height: 500px;
+    }
+
+    .sw > .tab-content {
+        overflow-x: hidden;
+        overflow-y: auto;
+    }
+
+    .col-sm-6 {
+        width: 50%;
+    }
+
+    .drawNamePic {
+        text-align: center;
+        position: absolute;
+        top: 100px;
+        font-size: 37px;
+        left: 0px;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawDescribePic {
+        text-align: center;
+        position: absolute;
+        top: 150px;
+        font-size: 20px;
+        left: 0px;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawbtnPic {
+        text-align: center;
+        position: absolute;
+        top: 70%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    .drawbtnPic2 {
+        text-align: center;
+        position: absolute;
+        top: 78%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    .btnSelect {
+        cursor: pointer;
+        background-color: #4CAF50;
+        color: white;
+        padding: 15px 32px;
+        display: inline-block;
+        font-size: 15px;
+    }
+
+    /* 配置收集信息*/
+    .drawTotalPri {
+        text-align: center;
+        position: absolute;
+        top: 10%;
+        font-size: 37px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawDescribePri {
+        text-align: center;
+        position: absolute;
+        top: 25%;
+        font-size: 20px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawTextPri {
+        text-align: center;
+        position: absolute;
+        top: 50%;
+        font-size: 15px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawText2Pri {
+        text-align: center;
+        position: absolute;
+        top: 55%;
+        font-size: 10px;
+        left: 0;
+        color: #F00;
+        width: 80%;
+    }
+
+    .drawText3Pri {
+        text-align: center;
+        position: absolute;
+        top: 60%;
+        font-size: 20px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawbtnPri {
+        text-align: center;
+        position: absolute;
+        top: 88%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    /* 配置分享信息*/
+    .drawShareTitlePri {
+        position: absolute;
+        top: 45%;
+        font-size: 20px;
+        left: 73%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareDescribePri {
+        position: absolute;
+        top: 50%;
+        font-size: 10px;
+        left: 73%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareImgPic {
+        text-align: center;
+        position: absolute;
+        top: 52%;
+        font-size: 37px;
+        left: 38%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareImg2Pic {
+        text-align: center;
+        position: absolute;
+        top: 40%;
+        font-size: 37px;
+        left: 30%;
+        color: #F00;
+        width: 100%;
+    }
+
+    /* 关注二维码*/
+
+
+    .drawCodeImgPic {
+        text-align: center;
+        position: absolute;
+        top: 50%;
+        font-size: 37px;
+        left: 0%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawQrCodePri {
+        text-align: center;
+        position: absolute;
+        top: 70%;
+        font-size: 25px;
+        left: 0%;
+        color: #F00;
+        width: 100%;
+    }
+
+
+
+</style>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-info-edit" th:object="${drawInfo}">
-            <input name="DRAWID" th:field="*{DRAWID}" type="hidden">
-            <input name="DRAWRULEID" th:field="*{DRAWRULEID}" type="hidden">
-            <h4 class="form-header h4">活动管理</h4>
-                <div class="row">
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">活动名称：</label>
-                            <div class="col-sm-8">
-                                <input name="DRAWNAME" placeholder="活动名称" th:field="*{DRAWNAME}" class="form-control" type="text" maxlength="30">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
+        <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
+        <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
+        <div id="smartwizard">
+            <ul class="nav">
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-1"> 基本信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-2"> 选择UI模板 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-3"> 配置展现内容 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-4"> 选择玩法 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-5"> 配置收集信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-6"> 配置分享信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-7"> 关注二维码 </a>
+                </li>
+            </ul>
+            <div class="tab-content" style="height: 610px;">
+                <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
+                    <div>
+                        <form class="form form-horizontal m-t">
+                            <h4 class="form-header h4">第1步-基本信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">活动名称：</label>
+                                        <div class="col-sm-8">
+                                            <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
+                                                   type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" >
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">状态：</label>
+                                        <div class="col-sm-8">
+                                            <select name="drawInfo-status" class="form-control"
+                                                    th:with="type=${@dict.getType('start_stop')}">
+                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.STATUS}"></option>
+                                            </select>
+                                        </div>
+                                    </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>
+                                        <div class="col-sm-8">
+                                            <select name="drawInfo-expeno" class="form-control"
+                                                    th:with="type=${@dict.getType('expeType')}">
+                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.EXPENO}"></option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">消耗价值：</label>
+                                        <div class="col-sm-8">
+                                            <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
+                                                   type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <div class="input-group date">
+                                                <input name="drawInfo-starttime" class="form-control" th:value="${#dates.format(vo.drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss')}"
+                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">结束时间：</label>
+                                        <div class="col-sm-8">
+                                            <div class="input-group date">
+                                                <input name="drawInfo-endtime" class="form-control" th:value="${#dates.format(vo.drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss')}"
+                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
                     </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">状态：</label>
-                            <div class="col-sm-8">
-                                <select name="STATUS" class="form-control" th:with="type=${@dict.getType('start_stop')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"  th:field="*{STATUS}"></option>
-                                </select>
+                </div>
+                <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
+                    <div>
+                        <h4 class="form-header h4">第2步-选择UI模板</h4>
+                        <div th:with="type=${@dict.getType('activityTemplate')}">
+
+                            <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                               th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
+                        </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="500">
+                    </div>
+                </div>
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第3步-配置展现内容</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">活动标题：</label>
+                                        <div class="col-sm-8">
+                                            <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
+
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigGuide.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:value="*{actPageConfigGuide.bgImg}">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
+                                        </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">按钮1跳转链接：</label>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
+                                        </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">自定义按钮2：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
+                                        </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">按钮2跳转链接：</label>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="picimg" src="../../img/act/1.jpg" width="380" height="500">
+                                <span class="drawNamePic" id="actTitlePic">活动标题</span>
+                                <span class="drawDescribePic" id="actDescPic">活动描述</span>
+                                <span class="drawbtnPic">
+                                        <a id="btn1Pic" class="btn btn-success btn-xs ">自定义按钮1</a>
+                                    </span>
+                                <span class="drawbtnPic2">
+                                        <a id="btn2Pic" class="btn btn-success btn-xs ">自定义按钮2</a>
+                                    </span>
                             </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>
-                            <div class="col-sm-8">
-                                <select name="EXPENO" class="form-control" th:with="type=${@dict.getType('expeType')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{EXPENO}"></option>
-                                </select>
-                            </div>
-                        </div>
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                    <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}"
+                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
+                        <a id="activityPlay" th:if="${dict.dictValue} eq '0'" class="btn btn-success  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
                     </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">消耗价值：</label>
-                            <div class="col-sm-8">
-                                <input name="EXPENOVALUE" th:field="*{EXPENOVALUE}" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
-                            </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>
-                            <div class="col-sm-8">
-                                <div class="input-group date">
-                                    <input name="STARTTIME" th:value="${#dates.format(drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:value="*{actConfig.actType}">
+                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
+                    <h4 class="form-header h4">活动规则</h4>
+                    <div class="row" id="activityPlaydiv" style="display: none">
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
+                                <div class="col-sm-8">
+                                    <select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()"
+                                            class="form-control"
+                                            th:with="type=${@dict.getType('is_boolean')}">
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                th:value="${dict.dictValue}" th:field="*{drawRule.FIRSTFLAG}"></option>
+                                    </select>
                                 </div>
                             </div>
                         </div>
-                    </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">结束时间：</label>
-                            <div class="col-sm-8">
-                                <div class="input-group date">
-                                    <input name="ENDTIME" th:value="${#dates.format(drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss')}" class="form-control" placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
+                                <div class="col-sm-8">
+                                    <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
+                                    </select>
+                                </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()"
+                                                class="form-control"
+                                                th:with="type=${@dict.getType('is_boolean')}">
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.DAILYFLAG}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
+                                    <div class="col-sm-8">
+                                        <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
+                                               class="form-control" type="text" maxlength="30"  th:value="*{drawRule.DAILYNUMBER}">
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <div class="input-group date">
+                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
+                                                   class="form-control"
+                                                   placeholder="HH:mm:ss" type="text" >
+                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
+                                    <div class="col-sm-8">
+                                        <div class="input-group date">
+                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
+                                                   placeholder="HH:mm:ss" type="text" >
+                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                        </div>
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-willdrawflag" id="WILLDRAWFLAG" onchange="willdrawflag()"
+                                                class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.WILLDRAWFLAG}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
+                                    <div class="col-sm-8">
+                                        <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
+                                               placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
+                                               class="form-control" type="text" maxlength="30" >
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-willdrawawardprize" class="form-control"
+                                                id="willdrawawardprize"
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                            <option value="">所有</option>
+                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                    th:value="${drawPrize.PRIZECODE}"></option>
+                                        </select>
+                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
                 </div>
-                <h4 class="form-header h4">活动规则</h4>
-                <div class="row">
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
-                            <div class="col-sm-8">
-                                <select name="FIRSTFLAG" id="FIRSTFLAG" onchange="firstflag()" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{FIRSTFLAG}"></option>
-                                </select>
+                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
+                    <div style="height: 810px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第五步-配置收集信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">标题：</label>
+                                        <div class="col-sm-8">
+                                            <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.title}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
-                            <div class="col-sm-8">
-                                <select name="FIRSTAWARDPRIZE"  class="form-control" id="firstawardprize"  >
-                                </select>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">描述：</label>
+                                        <div class="col-sm-8">
+                                            <input id="describe" name="actPageConfigUserinfo-description"
+                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:value="*{actPageConfigUserinfo.description}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </div>
+                                    </div>
+                                </div>
                             </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>
+                                        <div class="col-sm-8">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
+                                              [[*{actPageConfigUserinfo.agreement}]]
+                                            </textarea>
+                                            <input type="hidden" >
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
 
-                <div class="row">
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">时间段抽奖配置：</label>
-                            <div class="col-sm-8">
-                                <select name="DAILYFLAG" id="DAILYFLAG" onchange="dailyflag()" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{DAILYFLAG}"></option>
-                                </select>
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigUserinfo.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="picture" name="actPageConfigUserinfo-bgImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+
+                                        </div>
+                                    </div>
+                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:value="*{actPageConfigUserinfo.bgImg}"
+                                           value="">
+                                </div>
                             </div>
-                        </div>
-                    </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
-                            <div class="col-sm-8">
-                                <input name="DAILYNUMBER" id="dailynumber" th:field="*{DAILYNUMBER}" placeholder="时间段限制次数" class="form-control" type="text" maxlength="30" >
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">自定义按钮：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnText}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </div>
+                                    </div>
+                                </div>
                             </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>
-                            <div class="col-sm-8">
-                                <div class="input-group date">
-                                    <input name="DAILYSTARTTIME" id="dailystarttime"  th:field="*{DAILYSTARTTIME}"  class="form-control" placeholder="HH:mm:ss" type="text">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">按钮跳转链接：</label>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.userName == 'on' ? true : false}" >姓名</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.mobile == 'on' ? true : false}">手机号</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.gender == 'on' ? true : false}">性别</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label ">代理人信息：</label>
+                                        <div class="col-sm-8">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentName"
+                                                       id="agentName" onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.agentName == 'on' ? true : false}">代理人姓名</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
+                                                       id="agentPhone" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentMobile == 'on' ? true : false}">代理人手机号</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentGender"
+                                                       id="agentSex" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentGender == 'on' ? true : false}">代理人性别</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentNo"
+                                                       id="agentNumber" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentNo == 'on' ? true : false}">代理人工号</input>
+                                            </label>
+                                        </div>
+                                    </div>
                                 </div>
                             </div>
                         </div>
+
+
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="pictureimg" src="../../img/shj.jpg" width="380" height="500">
+                                <span class="drawTotalPri" id="titlePri">标题</span>
+                                <span class="drawDescribePri" id="describePri">描述</span>
+                                <span class="drawTextPri">请填写您的基本信息</span>
+                                <div class="drawText2Pri">
+                                    <input type="checkbox">
+                                    <span id="agreementPri">信息页文本协议提示</span>
+                                </div>
+
+                                <div class="drawText3Pri">
+                                    <div>
+                                        <input placeholder="姓名" type="hidden" id="namePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="手机号" type="hidden" id="phonePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="性别" height="10px" type="hidden" id="sexPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="地址" type="hidden" id="addressPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人姓名" type="hidden" id="agentNamePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人手机号" type="hidden" id="agentPhonePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人性别" type="hidden" id="agentSexPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人地址" type="hidden" id="agentNumberPri">
+                                    </div>
+                                </div>
+
+                                <span class="drawbtnPri">
+                                    <a id="btnPri" class="btn btn-success btn-xs ">自定义按钮</a>
+                                    </span>
+                            </div>
+                        </div>
+
                     </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
-                            <div class="col-sm-8">
-                                <div class="input-group date">
-                                    <input name="DAILYENDTIME" id="dailyendtime" th:field="*{DAILYENDTIME}"  class="form-control" placeholder="HH:mm:ss" type="text">
-                                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第六步-配置分享信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">分享连接：</label>
+                                        <div class="col-sm-8">
+                                            <input id="shareConnect" name="actConfig-shareLink"
+                                                   placeholder="例如：http://XX" class="form-control" type="text"
+                                                   th:value="*{actConfig.shareLink}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input id="shareTitle" name="actConfig-shareTitle"
+                                                   placeholder="例如：2021XX客户节" class="form-control" type="text"
+                                                   th:value="*{actConfig.shareTitle}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
+                                             [[*{actConfig.shareDesc}]]
+                                            </textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">分享图片：</label>
+
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actConfig.shareImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="shareImg" name="actConfig-shareImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:value="*{actConfig.shareImg}">
                                 </div>
                             </div>
                         </div>
-                    </div>
-                </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="height: 210px">
+                                <div class="drawShareImg2Pic">
+                                    <img  src="../../img/bj.png" height="170" width="340">
+                                </div>
+                                <div class="drawShareImgPic">
+                                    <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
+                                </div>
+                                <div>
+                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
+                                </div>
+                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
 
-
-
-                <div class="row">
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">抽奖必中配置：</label>
-                            <div class="col-sm-8">
-                                <select name="WILLDRAWFLAG" id="WILLDRAWFLAG" onchange="willdrawflag()" class="form-control" th:with="type=${@dict.getType('is_boolean')}">
-                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{WILLDRAWFLAG}"></option>
-                                </select>
                             </div>
                         </div>
                     </div>
-                    <div class="col-sm-6">
-                        <div class="form-group">
-                            <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
-                            <div class="col-sm-8">
-                                <input name="WILLDRAWAWARDNUMBER" id="willdrawawardnumber" th:field="*{WILLDRAWAWARDNUMBER}" placeholder="抽奖必中计数" class="form-control" type="text" maxlength="30" >
+                </div>
+                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第七步-关注二维码</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">关注二维码描述：</label>
+                                        <div class="col-sm-8">
+                                            <input id="qrCode" name="actPageConfigSubscribe-description"
+                                                   placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
+                                                   th:value="*{actPageConfigSubscribe.description}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="backdropImg"
+                                                           name="actPageConfigSubscribe-bgImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
+                                       th:value="*{actPageConfigSubscribe.bgImg}"
+                                       value="">
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">二维码图片：</label>
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.qrCode}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="qrCodeImg"
+                                                           name="actPageConfigSubscribe-bgImg2" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
+                                       th:value="*{actPageConfigSubscribe.qrCode}"
+                                       value="">
+                            </div>
+                        </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="backdropImgimg" src="../../img/shj.jpg" width="400" height="400">
+                                <div class="drawCodeImgPic">
+                                    <img id="qrCodeImgimg" src="../../img/shj.jpg" width="80" height="80">
+                                </div>
+
+                                <span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
+
                             </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>
-                            <div class="col-sm-8">
-                                <select name="WILLDRAWAWARDPRIZE"   class="form-control" id="willdrawawardprize">
-                                </select>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <th:block th:include="include :: datetimepicker-js" />
-    <script th:inline="javascript">
-        var prefix = ctx + "activity/info"
-        $("#form-info-edit").validate({
-            focusCleanup: true
-        });
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: jquery-smartwizard-js"/>
+<th:block th:include="include :: jasny-bootstrap-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "activity/info"
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.saveTab(prefix + "/edit", $('#form-info-edit').serialize());
-            }
+    /**获取奖品及信息列表*/
+    $(document).ready(function () {
+        var DAILYFLAG = $("#DAILYFLAG").val();
+        alert(DAILYFLAG);
+        if(DAILYFLAG==0){
+            $("#dailynumber").attr('disabled','true');
+            $("#dailystarttime").attr('disabled','true');
+            $("#dailyendtime").attr('disabled','true');
+        }
+        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
+        if(WILLDRAWFLAG==0){
+            $("#willdrawawardnumber").attr('disabled','true');
+            $("#willdrawawardprize").attr('disabled','true');
+        }
+        var FIRSTFLAG = $("#FIRSTFLAG").val();
+        if(FIRSTFLAG==0){
+            $("#firstawardprize").attr('disabled','true');
         }
-        /**获取奖品及信息列表*/
-        $(document).ready(function() {
-            var DAILYFLAG = $("#DAILYFLAG").val();
-            if(DAILYFLAG==0){
-                $("#dailynumber").attr('disabled','true');
-                $("#dailystarttime").attr('disabled','true');
-                $("#dailyendtime").attr('disabled','true');
-            }
-            var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-          if(WILLDRAWFLAG==0){
-                $("#willdrawawardnumber").attr('disabled','true');
-              $("#willdrawawardprize").attr('disabled','true');
-            }
-            var FIRSTFLAG = $("#FIRSTFLAG").val();
-         if(FIRSTFLAG==0){
-                $("#firstawardprize").attr('disabled','true');
-            }
 
-            var WILLDRAWAWARDPRIZE = [[${drawInfo.WILLDRAWAWARDPRIZE}]];
-            var FIRSTAWARDPRIZE = [[${drawInfo.FIRSTAWARDPRIZE}]];
-            var job= "";
-            var jobj= "";
-            $.ajax({
 
-                    url:prefix + "/prizeInfo",
-                    success: function (data) {
+    });
 
-                        for(var i in data){
-                            if (job.length==0){
-                                if(data[i].prizecode==WILLDRAWAWARDPRIZE){
-                                    job = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                                }
-                                job = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+    $("#form-info-add").validate({
+        focusCleanup: true
+    });
 
-                            }
-                            else{
-                                if(data[i].prizecode==WILLDRAWAWARDPRIZE){
-                                    job += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                                }
-                                job += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
+
+
+
+    //时间段抽奖配置
+    function dailyflag() {
+        var DAILYFLAG = $("#DAILYFLAG").val();
+        if (DAILYFLAG == 1) {
+            $('#dailynumber').removeAttr('disabled');
+            $('#dailystarttime').removeAttr('disabled');
+            $('#dailyendtime').removeAttr('disabled');
+        } else if (DAILYFLAG == 0) {
+            $("#dailynumber").attr('disabled', 'true');
+            $("#dailystarttime").attr('disabled', 'true');
+            $("#dailyendtime").attr('disabled', 'true');
+        }
+    }
+
+    //抽奖必中配置
+    function willdrawflag() {
+        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
+        if (WILLDRAWFLAG == 1) {
+            $('#willdrawawardnumber').removeAttr('disabled');
+            $('#willdrawawardprize').removeAttr('disabled');
+        } else if (WILLDRAWFLAG == 0) {
+            $("#willdrawawardnumber").attr('disabled', 'true');
+            $("#willdrawawardprize").attr('disabled', 'true');
+
+        }
+    }
+
+    //首次中奖配置
+    function firstflag() {
+        var FIRSTFLAG = $("#FIRSTFLAG").val();
+        if (FIRSTFLAG == 1) {
+            $('#firstawardprize').removeAttr('disabled');
+        } else if (FIRSTFLAG == 0) {
+            $("#firstawardprize").attr('disabled', 'true');
+        }
+
+    }
+
+    $("input[name='drawInfo-starttime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'yyyy-mm-dd hh:ii:ss'
+    });
+
+    $("input[name='drawInfo-endtime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'yyyy-mm-dd hh:ii:ss'
+    });
+
+    $("input[name='drawRule-dailystarttime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'hh:ii:ss'
+    });
+
+    $("input[name='drawRule-dailyendtime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'hh:ii:ss'
+    });
+</script>
+<script th:inline="javascript">
+    $(document).ready(function () {
+        // 工具栏按钮
+        var btnFinish = $('<a id="btn-finish"></a>').text('完成')
+            .addClass('btn btn-info')
+            .on('click', function () {
+                //添加保存逻辑
+                var data = customSerialize("form-info-add", true);
+                $.ajax({
+                    url: prefix + "/edit",
+                    data: data,
+                    type: "post",
+                    contentType: "application/json;charset=UTF-8",
+                    success: function (result) {
+                        if (typeof callback == "function") {
+                            callback(result);
                         }
-                        }
-                        $("#willdrawawardprize").html(job);
-                        for(var i in data){
-                            if(jobj.length==0){
-                                if(data[i].prizecode==FIRSTAWARDPRIZE){
-                                    jobj = "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                                }
-                                jobj = "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
-
-                            }else{
-
-                                if(data[i].prizecode==FIRSTAWARDPRIZE){
-                                    jobj += "<option value='"+data[i].prizecode+"' selected=\"selected\">"+data[i].prizename+"</option>"
-                                }
-                                jobj += "<option value='"+data[i].prizecode+"' >"+data[i].prizename+"</option>"
-                            }
-                        }
-                        $("#firstawardprize").html(jobj);
-
-                    },
-                    error : function(XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    },
-                    async:false             //false表示同步
+                        $.operate.successTabCallback(result);
+                    }
+            });
+        var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
+            .addClass('btn btn-danger')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("reset");
+            });
+        // 下面两个按钮是为了因为插件默认的是botton,这里换成<a>,也可以选择用样式替换,或者不替换
+        var btnNext = $('<a id="btn-next"></a>').text('下一步')
+            .addClass('btn btn-info')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("next");
+            });
+        var btnPrev = $('<a id="btn-prev"></a>').text('上一步')
+            .addClass('btn btn-success disabled')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("prev");
+            });
+        // 初始化表单向导组件
+        $('#smartwizard').smartWizard({
+            theme: 'dots', // default, arrows, dots, progress
+            autoAdjustHeight: true, // 自动调整高度, 默认true
+            enableURLhash: false, //开启URL hash,开启后点击浏览器前进后退按钮会执行下一步和上一步操作
+            transition: {
+                animation: 'slide-horizontal', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
+            },
+            toolbarSettings: {
+                showNextButton: false,// 因为上面自定义了下一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
+                showPreviousButton: false,// 因为上面自定义了上一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
+                toolbarExtraButtons: [btnCancel, btnPrev, btnNext, btnFinish]// 扩展的按钮集合
+            }
+        });
+        //加载步骤2数据
+        var path = "../../../img/act/";
+        var val = $("#activityTemplateval").val();
+        $("a[id = 'activityTemplate']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityTemplateh4").text(this.text);
+                $("#activityTemplateimg").attr("src",path+val+".jpg");
+            }
+        });
+        //加载步骤3数据
+        var title = $("#actTitle").val();
+        $("#actTitlePic").text(title);
+        var desc = $("#actDesc").val();
+        $("#actDescPic").text(desc);
+        var picval = $("#picval").val();
+        $("#picimg").attr("src", picval);
+        var btn1 = $("#btn1").val();
+        $("#btn1Pic").text(btn1);
+        var btn2 = $("#btn2").val();
+        $("#btn2Pic").text(btn2);
+        //加载步骤4数据
+        var val = $("#activityPlayval").val();
+        $("a[id = 'activityPlay']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityPlayh4").text(this.text);
+                $("#activityPlayimg").attr("src",path+val+".jpg");
+                if (val != "0"){
+                    $("#activityPlaydiv").css('display','block');//显示
+                }else{
+                    $("#activityPlaydiv").css('display','none');//隐藏
                 }
-
-            );
+            }
         });
-
-        //时间段抽奖配置
-        function dailyflag(){
-            var DAILYFLAG = $("#DAILYFLAG").val();
-            if (DAILYFLAG==1){
-                $('#dailynumber').removeAttr('disabled');
-                $('#dailystarttime').removeAttr('disabled');
-                $('#dailyendtime').removeAttr('disabled');
-            }else if(DAILYFLAG==0){
-                $("#dailynumber").attr('disabled','true');
-                $("#dailystarttime").attr('disabled','true');
-                $("#dailyendtime").attr('disabled','true');
-
-            }
-        }
-        //抽奖必中配置
-        function willdrawflag(){
-            var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-            if (WILLDRAWFLAG==1){
-                $('#willdrawawardnumber').removeAttr('disabled');
-                $('#willdrawawardprize').removeAttr('disabled');
-            }else if(WILLDRAWFLAG==0){
-                $("#willdrawawardnumber").attr('disabled','true');
-                $("#willdrawawardprize").attr('disabled','true');
-            }
-        }
-
-        //首次中奖配置
-        function firstflag(){
-            var FIRSTFLAG = $("#FIRSTFLAG").val();
-            if (FIRSTFLAG==1){
-                $('#firstawardprize').removeAttr('disabled');
-            }else if(FIRSTFLAG==0){
-                $("#firstawardprize").attr('disabled','true');
+     //记载步骤5数据
+        var title = $("#title").val();
+        $("#titlePri").text(title);
+        var describe = $("#describe").val();
+        $("#describePri").text(describe);
+        var agreement = $("#agreement").val();
+        $("#agreementPri").text(agreement);
+        var btn = $("#btn").val();
+        $("#btnPri").text(btn);
+        var pictureval = $("#pictureval").val();
+        $("#pictureimg").attr("src", picval);
+        $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
+            var id = this.id;
+            var boolean = $("#" + id).prop("checked");
+            if (boolean) {
+                $("#" + id + "Pri").attr('type', 'text');
+            } else {
+                $("#" + id + "Pri").attr('type', 'hidden');
             }
 
+        });
+
+        //记载步骤6数据
+        var shareDescribe = $("#shareDescribe").val();
+        $("#shareDescribePri").text(shareDescribe);
+        var shareTitle = $("#shareTitle").val();
+        $("#shareTitlePri").text(shareTitle);
+        var shareImgval = $("#shareImgval").val();
+        $("#shareImgimg").attr("src", shareImgval);
+        //记载步骤7数据
+        var qrCode = $("#qrCode").val();
+        $("#qrCodePri").text(qrCode);
+        var backdropImgval = $("#backdropImgval").val();
+        $("#backdropImgimg").attr("src", backdropImgval);
+        var qrCodeImgval = $("#qrCodeImgval").val();
+        $("#qrCodeImgimg").attr("src", qrCodeImgval);
+    });
+
+    // 显示步骤时将触发事件
+    $("#smartwizard").on("showStep", function (e, anchorObject, stepNumber, stepDirection, stepPosition) {
+        // 下面按钮是快速操作栏的
+        $("#prev-btn").removeClass('disabled');
+        $("#next-btn").removeClass('disabled');
+        // 下面按钮是工具栏的
+        $("#btn-prev").removeClass('disabled');
+        $("#btn-next").removeClass('disabled');
+        $("#btn-finish").removeClass('disabled');
+        if (stepPosition === 'first') {
+            $("#prev-btn").addClass('disabled');// 快速操作栏（演示用）
+            $("#btn-prev").addClass('disabled');
+            $("#btn-finish").addClass('disabled');
+        } else if (stepPosition === 'last') {
+            $("#next-btn").addClass('disabled');// 快速操作栏（演示用）
+            $("#btn-next").addClass('disabled');
+        } else {
+            $("#prev-btn").removeClass('disabled');// 快速操作栏（演示用）
+            $("#next-btn").removeClass('disabled');// 快速操作栏（演示用）
+            $("#btn-prev").removeClass('disabled');
+            $("#btn-next").removeClass('disabled');
+            $("#btn-finish").addClass('disabled');
+        }
+    });
+
+    // 该事件在离开某个步骤之前触发
+    $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
+        if (stepDirection == 'forward') {
+            var form = $("#step-" + (currentStepNumber + 1)).find('.form');
+            if (form.length > 0) {
+                return form.validate().form();
+            }
+            return true;
+        }
+        return true;
+    });
+
+    $("#theme-selector").on("change", function () {
+        // Change theme
+        var options = {
+            theme: $(this).val()
+        };
+        $('#smartwizard').smartWizard("setOptions", options);
+        return true;
+    });
+
+    $("#reset-btn").on("click", function () {
+        // Reset wizard
+        $('#smartwizard').smartWizard("reset");
+        return true;
+    });
+
+    $("#prev-btn").on("click", function () {
+        // Navigate previous
+        $('#smartwizard').smartWizard("prev");
+        return true;
+    });
+
+    $("#next-btn").on("click", function () {
+        // Navigate next
+        $('#smartwizard').smartWizard("next");
+        return true;
+    });
+</script>
+<script th:inline="javascript">
+
+
+    function updateText(val) {
+
+        var id = val.id;
+        var boolean = $("#" + id).prop("checked");
+        if (boolean) {
+            $("#" + id + "Pri").attr('type', 'text');
+        } else {
+            $("#" + id + "Pri").attr('type', 'hidden');
+        }
+    }
+
+
+    function updatePic(val) {
+        var id = val.id;
+        var value = val.value;
+        if (value == null || value == "" && id.indexOf("btn") != -1) {
+            //默认值
+            value = "自定义按钮" + id.charAt(id.length - 1);
+        }
+        $("#" + id + "Pic").text(value);
+
+    }
+
+    function updatePri(val) {
+        var id = val.id;
+        var value = val.value;
+        if (value == null || value == "" && id.indexOf("btn") != -1) {
+            //默认值
+            value = "自定义按钮";
+        }
+        $("#" + id + "Pri").text(value);
+    }
+
+    //图片同步
+    function syncPic(val){
+        previewURL(val);
+    }
+
+    function previewURL(input) {
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+            var id = input.id;
+            reader.onload = function (e) {
+                //效果图
+                $("#"+id+"img").attr("src", e.target.result);
+                //传递值
+                $("#"+id+"val").val(e.target.result);
+            }
+
+            reader.readAsDataURL(input.files[0]);
+        } else{
+            //清除
+            //效果图
+            var id = input.id;
+            $("#"+id+"img").attr("src", "");
+            //传递值
+            $("#"+id+"val").val("");
+        }
+    }
+
+    function activityTemplate(val) {
+        var path = "../../img/act/";
+        $(val).addClass('btn-success').siblings().removeClass('btn-success');
+        var id = val.id;
+        var valus = $("#"+id+".btn-success").attr("value");
+        $("#"+id+"val").val(valus);
+        $("#"+id+"h4").text(val.text);
+        $("#"+id+"img").attr("src",path+valus+".jpg");
+        if (valus != "0"){
+            $("#activityPlaydiv").css('display','block');//显示
+        }else{
+            $("#activityPlaydiv").css('display','none');//隐藏
         }
 
+    }
 
-
-        $("input[name='STARTTIME']").datetimepicker({
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            forceParse: 0,
-            showMeridian: 1,
-            format:  'yyyy-mm-dd hh:ii:ss'
-        });
-
-        $("input[name='ENDTIME']").datetimepicker({
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            forceParse: 0,
-            showMeridian: 1,
-            format:  'yyyy-mm-dd hh:ii:ss'
-        });
-
-        $("input[name='DAILYSTARTTIME']").datetimepicker({
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            forceParse: 0,
-            showMeridian: 1,
-            format:  'hh:ii:ss'
-        });
-
-        $("input[name='DAILYENDTIME']").datetimepicker({
-            weekStart: 1,
-            todayBtn:  1,
-            autoclose: 1,
-            todayHighlight: 1,
-            startView: 2,
-            forceParse: 0,
-            showMeridian: 1,
-            format:  'hh:ii:ss'
-        });
-    </script>
+</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/sino-activity/src/main/resources/templates/activity/info/edit1.html b/sino-activity/src/main/resources/templates/activity/info/edit1.html
deleted file mode 100644
index bb0854d4e..000000000
--- a/sino-activity/src/main/resources/templates/activity/info/edit1.html
+++ /dev/null
@@ -1,1321 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <th:block th:include="include :: header('创建活动')"/>
-    <th:block th:include="include :: datetimepicker-css"/>
-    <th:block th:include="include :: jquery-smartwizard-css"/>
-    <th:block th:include="include :: jasny-bootstrap-css"/>
-</head>
-<style type='text/css'>
-    .rightarea {
-        float: left;
-        width: 40%;
-        height: 300px;
-    }
-
-    .leftarea {
-        float: left;
-        width: 60%;
-        height: 500px;
-    }
-
-    .sw > .tab-content {
-        overflow-x: hidden;
-        overflow-y: auto;
-    }
-
-    .col-sm-6 {
-        width: 50%;
-    }
-
-    .drawNamePic {
-        text-align: center;
-        position: absolute;
-        top: 100px;
-        font-size: 37px;
-        left: 0px;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawDescribePic {
-        text-align: center;
-        position: absolute;
-        top: 150px;
-        font-size: 20px;
-        left: 0px;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawbtnPic {
-        text-align: center;
-        position: absolute;
-        top: 70%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    .drawbtnPic2 {
-        text-align: center;
-        position: absolute;
-        top: 78%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    .btnSelect {
-        cursor: pointer;
-        background-color: #4CAF50;
-        color: white;
-        padding: 15px 32px;
-        display: inline-block;
-        font-size: 15px;
-    }
-
-    /* 配置收集信息*/
-    .drawTotalPri {
-        text-align: center;
-        position: absolute;
-        top: 10%;
-        font-size: 37px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawDescribePri {
-        text-align: center;
-        position: absolute;
-        top: 25%;
-        font-size: 20px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawTextPri {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        font-size: 15px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawText2Pri {
-        text-align: center;
-        position: absolute;
-        top: 55%;
-        font-size: 10px;
-        left: 0;
-        color: #F00;
-        width: 80%;
-    }
-
-    .drawText3Pri {
-        text-align: center;
-        position: absolute;
-        top: 60%;
-        font-size: 20px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawbtnPri {
-        text-align: center;
-        position: absolute;
-        top: 88%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    /* 配置分享信息*/
-    .drawShareTitlePri {
-        position: absolute;
-        top: 45%;
-        font-size: 20px;
-        left: 73%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareDescribePri {
-        position: absolute;
-        top: 50%;
-        font-size: 10px;
-        left: 73%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareImgPic {
-        text-align: center;
-        position: absolute;
-        top: 52%;
-        font-size: 37px;
-        left: 38%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareImg2Pic {
-        text-align: center;
-        position: absolute;
-        top: 40%;
-        font-size: 37px;
-        left: 30%;
-        color: #F00;
-        width: 100%;
-    }
-
-    /* 关注二维码*/
-
-
-    .drawCodeImgPic {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        font-size: 37px;
-        left: 0%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawQrCodePri {
-        text-align: center;
-        position: absolute;
-        top: 70%;
-        font-size: 25px;
-        left: 0%;
-        color: #F00;
-        width: 100%;
-    }
-
-
-
-</style>
-<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
-        <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
-        <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
-        <div id="smartwizard">
-            <ul class="nav">
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-1"> 基本信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-2"> 选择UI模板 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-3"> 配置展现内容 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-4"> 选择玩法 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-5"> 配置收集信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-6"> 配置分享信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-7"> 关注二维码 </a>
-                </li>
-            </ul>
-            <div class="tab-content" style="height: 610px;">
-                <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
-                    <div>
-                        <form class="form form-horizontal m-t">
-                            <h4 class="form-header h4">第1步-基本信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">活动名称：</label>
-                                        <div class="col-sm-8">
-                                            <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
-                                                   type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" >
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">状态：</label>
-                                        <div class="col-sm-8">
-                                            <select name="drawInfo-status" class="form-control"
-                                                    th:with="type=${@dict.getType('start_stop')}">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.STATUS}"></option>
-                                            </select>
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <select name="drawInfo-expeno" class="form-control"
-                                                    th:with="type=${@dict.getType('expeType')}">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.EXPENO}"></option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">消耗价值：</label>
-                                        <div class="col-sm-8">
-                                            <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
-                                                   type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <div class="input-group date">
-                                                <input name="drawInfo-starttime" class="form-control" th:value="${#dates.format(vo.drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss')}"
-                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">结束时间：</label>
-                                        <div class="col-sm-8">
-                                            <div class="input-group date">
-                                                <input name="drawInfo-endtime" class="form-control" th:value="${#dates.format(vo.drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss')}"
-                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-                <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div>
-                        <h4 class="form-header h4">第2步-选择UI模板</h4>
-                        <div th:with="type=${@dict.getType('activityTemplate')}">
-
-                            <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                               th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                        </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="500">
-                    </div>
-                </div>
-                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第3步-配置展现内容</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">活动标题：</label>
-                                        <div class="col-sm-8">
-                                            <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigGuide.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:value="*{actPageConfigGuide.bgImg}">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
-                                        </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">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
-                                        </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">自定义按钮2：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
-                                        </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">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="picimg" src="../../img/act/1.jpg" width="380" height="500">
-                                <span class="drawNamePic" id="actTitlePic">活动标题</span>
-                                <span class="drawDescribePic" id="actDescPic">活动描述</span>
-                                <span class="drawbtnPic">
-                                        <a id="btn1Pic" class="btn btn-success btn-xs ">自定义按钮1</a>
-                                    </span>
-                                <span class="drawbtnPic2">
-                                        <a id="btn2Pic" class="btn btn-success btn-xs ">自定义按钮2</a>
-                                    </span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
-                    <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}"
-                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                        <a id="activityPlay" th:if="${dict.dictValue} eq '0'" class="btn btn-success  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                    </div>
-                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:value="*{actConfig.actType}">
-                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
-                    <h4 class="form-header h4">活动规则</h4>
-                    <div class="row" id="activityPlaydiv" style="display: none">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
-                                <div class="col-sm-8">
-                                    <select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()"
-                                            class="form-control"
-                                            th:with="type=${@dict.getType('is_boolean')}">
-                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                th:value="${dict.dictValue}" th:field="*{drawRule.FIRSTFLAG}"></option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
-                                <div class="col-sm-8">
-                                    <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
-                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
-                                        <option value="">所有</option>
-                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
-                                                th:value="${drawPrize.PRIZECODE}"></option>
-                                    </select>
-                                </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()"
-                                                class="form-control"
-                                                th:with="type=${@dict.getType('is_boolean')}">
-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.DAILYFLAG}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
-                                    <div class="col-sm-8">
-                                        <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
-                                               class="form-control" type="text" maxlength="30"  th:value="*{drawRule.DAILYNUMBER}">
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <div class="input-group date">
-                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
-                                                   class="form-control"
-                                                   placeholder="HH:mm:ss" type="text" >
-                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
-                                    <div class="col-sm-8">
-                                        <div class="input-group date">
-                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
-                                                   placeholder="HH:mm:ss" type="text" >
-                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        </div>
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-willdrawflag" id="WILLDRAWFLAG" onchange="willdrawflag()"
-                                                class="form-control" th:with="type=${@dict.getType('is_boolean')}">
-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.WILLDRAWFLAG}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
-                                    <div class="col-sm-8">
-                                        <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
-                                               placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
-                                               class="form-control" type="text" maxlength="30" >
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-willdrawawardprize" class="form-control"
-                                                id="willdrawawardprize"
-                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
-                                            <option value="">所有</option>
-                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
-                                                    th:value="${drawPrize.PRIZECODE}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第五步-配置收集信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">标题：</label>
-                                        <div class="col-sm-8">
-                                            <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.title}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="describe" name="actPageConfigUserinfo-description"
-                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:value="*{actPageConfigUserinfo.description}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
-                                              [[*{actPageConfigUserinfo.agreement}]]
-                                            </textarea>
-                                            <input type="hidden" >
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigUserinfo.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="picture" name="actPageConfigUserinfo-bgImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-
-                                        </div>
-                                    </div>
-                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:value="*{actPageConfigUserinfo.bgImg}"
-                                           value="">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">自定义按钮：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnText}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.userName == 'on' ? true : false}" >姓名</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.mobile == 'on' ? true : false}">手机号</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.gender == 'on' ? true : false}">性别</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label ">代理人信息：</label>
-                                        <div class="col-sm-8">
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentName"
-                                                       id="agentName" onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.agentName == 'on' ? true : false}">代理人姓名</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
-                                                       id="agentPhone" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentMobile == 'on' ? true : false}">代理人手机号</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentGender"
-                                                       id="agentSex" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentGender == 'on' ? true : false}">代理人性别</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentNo"
-                                                       id="agentNumber" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentNo == 'on' ? true : false}">代理人工号</input>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="pictureimg" src="../../img/shj.jpg" width="380" height="500">
-                                <span class="drawTotalPri" id="titlePri">标题</span>
-                                <span class="drawDescribePri" id="describePri">描述</span>
-                                <span class="drawTextPri">请填写您的基本信息</span>
-                                <div class="drawText2Pri">
-                                    <input type="checkbox">
-                                    <span id="agreementPri">信息页文本协议提示</span>
-                                </div>
-
-                                <div class="drawText3Pri">
-                                    <div>
-                                        <input placeholder="姓名" type="hidden" id="namePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="手机号" type="hidden" id="phonePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="性别" height="10px" type="hidden" id="sexPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="地址" type="hidden" id="addressPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人姓名" type="hidden" id="agentNamePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人手机号" type="hidden" id="agentPhonePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人性别" type="hidden" id="agentSexPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人地址" type="hidden" id="agentNumberPri">
-                                    </div>
-                                </div>
-
-                                <span class="drawbtnPri">
-                                    <a id="btnPri" class="btn btn-success btn-xs ">自定义按钮</a>
-                                    </span>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第六步-配置分享信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">分享连接：</label>
-                                        <div class="col-sm-8">
-                                            <input id="shareConnect" name="actConfig-shareLink"
-                                                   placeholder="例如：http://XX" class="form-control" type="text"
-                                                   th:value="*{actConfig.shareLink}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="shareTitle" name="actConfig-shareTitle"
-                                                   placeholder="例如：2021XX客户节" class="form-control" type="text"
-                                                   th:value="*{actConfig.shareTitle}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
-                                             [[*{actConfig.shareDesc}]]
-                                            </textarea>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">分享图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actConfig.shareImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="shareImg" name="actConfig-shareImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:value="*{actConfig.shareImg}">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="height: 210px">
-                                <div class="drawShareImg2Pic">
-                                    <img  src="../../img/bj.png" height="170" width="340">
-                                </div>
-                                <div class="drawShareImgPic">
-                                    <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
-                                </div>
-                                <div>
-                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
-                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第七步-关注二维码</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">关注二维码描述：</label>
-                                        <div class="col-sm-8">
-                                            <input id="qrCode" name="actPageConfigSubscribe-description"
-                                                   placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
-                                                   th:value="*{actPageConfigSubscribe.description}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigSubscribe.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="backdropImg"
-                                                           name="actPageConfigSubscribe-bgImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                </div>
-                                <input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
-                                       th:value="*{actPageConfigSubscribe.bgImg}"
-                                       value="">
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">二维码图片：</label>
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigSubscribe.qrCode}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="qrCodeImg"
-                                                           name="actPageConfigSubscribe-bgImg2" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                </div>
-                                <input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
-                                       th:value="*{actPageConfigSubscribe.qrCode}"
-                                       value="">
-                            </div>
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="backdropImgimg" src="../../img/shj.jpg" width="400" height="400">
-                                <div class="drawCodeImgPic">
-                                    <img id="qrCodeImgimg" src="../../img/shj.jpg" width="80" height="80">
-                                </div>
-
-                                <span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: jquery-smartwizard-js"/>
-<th:block th:include="include :: jasny-bootstrap-js"/>
-<script th:inline="javascript">
-    var prefix = ctx + "activity/info"
-
-    /**获取奖品及信息列表*/
-    $(document).ready(function () {
-        var DAILYFLAG = $("#DAILYFLAG").val();
-        alert(DAILYFLAG);
-        if(DAILYFLAG==0){
-            $("#dailynumber").attr('disabled','true');
-            $("#dailystarttime").attr('disabled','true');
-            $("#dailyendtime").attr('disabled','true');
-        }
-        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-        if(WILLDRAWFLAG==0){
-            $("#willdrawawardnumber").attr('disabled','true');
-            $("#willdrawawardprize").attr('disabled','true');
-        }
-        var FIRSTFLAG = $("#FIRSTFLAG").val();
-        if(FIRSTFLAG==0){
-            $("#firstawardprize").attr('disabled','true');
-        }
-
-
-    });
-
-    $("#form-info-add").validate({
-        focusCleanup: true
-    });
-
-
-
-
-    //时间段抽奖配置
-    function dailyflag() {
-        var DAILYFLAG = $("#DAILYFLAG").val();
-        if (DAILYFLAG == 1) {
-            $('#dailynumber').removeAttr('disabled');
-            $('#dailystarttime').removeAttr('disabled');
-            $('#dailyendtime').removeAttr('disabled');
-        } else if (DAILYFLAG == 0) {
-            $("#dailynumber").attr('disabled', 'true');
-            $("#dailystarttime").attr('disabled', 'true');
-            $("#dailyendtime").attr('disabled', 'true');
-        }
-    }
-
-    //抽奖必中配置
-    function willdrawflag() {
-        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-        if (WILLDRAWFLAG == 1) {
-            $('#willdrawawardnumber').removeAttr('disabled');
-            $('#willdrawawardprize').removeAttr('disabled');
-        } else if (WILLDRAWFLAG == 0) {
-            $("#willdrawawardnumber").attr('disabled', 'true');
-            $("#willdrawawardprize").attr('disabled', 'true');
-
-        }
-    }
-
-    //首次中奖配置
-    function firstflag() {
-        var FIRSTFLAG = $("#FIRSTFLAG").val();
-        if (FIRSTFLAG == 1) {
-            $('#firstawardprize').removeAttr('disabled');
-        } else if (FIRSTFLAG == 0) {
-            $("#firstawardprize").attr('disabled', 'true');
-        }
-
-    }
-
-    $("input[name='drawInfo-starttime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'yyyy-mm-dd hh:ii:ss'
-    });
-
-    $("input[name='drawInfo-endtime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'yyyy-mm-dd hh:ii:ss'
-    });
-
-    $("input[name='drawRule-dailystarttime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'hh:ii:ss'
-    });
-
-    $("input[name='drawRule-dailyendtime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'hh:ii:ss'
-    });
-</script>
-<script th:inline="javascript">
-    $(document).ready(function () {
-        // 工具栏按钮
-        var btnFinish = $('<a id="btn-finish"></a>').text('完成')
-            .addClass('btn btn-info')
-            .on('click', function () {
-                //添加保存逻辑
-                var data = customSerialize("form-info-add", true);
-                alert(data);
-                $.ajax({
-                    url: prefix + "/edit",
-                    data: data,
-                    type: "post",
-                    contentType: "application/json;charset=UTF-8",
-                    success: function (result) {
-                        if (result.code == web_status.SUCCESS) {
-                            layer.msg("保存成功,正在刷新数据请稍后……", {
-                                icon: 1,
-                                time: 500,
-                                shade: [0.1, '#8F8F8F']
-                            }, function () {
-                                location.reload();
-                            });
-                        } else {
-                            alert(result.msg);
-                        }
-                    }
-                })
-            });
-        var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
-            .addClass('btn btn-danger')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("reset");
-            });
-        // 下面两个按钮是为了因为插件默认的是botton,这里换成<a>,也可以选择用样式替换,或者不替换
-        var btnNext = $('<a id="btn-next"></a>').text('下一步')
-            .addClass('btn btn-info')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("next");
-            });
-        var btnPrev = $('<a id="btn-prev"></a>').text('上一步')
-            .addClass('btn btn-success disabled')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("prev");
-            });
-        // 初始化表单向导组件
-        $('#smartwizard').smartWizard({
-            theme: 'dots', // default, arrows, dots, progress
-            autoAdjustHeight: true, // 自动调整高度, 默认true
-            enableURLhash: false, //开启URL hash,开启后点击浏览器前进后退按钮会执行下一步和上一步操作
-            transition: {
-                animation: 'slide-horizontal', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
-            },
-            toolbarSettings: {
-                showNextButton: false,// 因为上面自定义了下一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
-                showPreviousButton: false,// 因为上面自定义了上一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
-                toolbarExtraButtons: [btnCancel, btnPrev, btnNext, btnFinish]// 扩展的按钮集合
-            }
-        });
-        //加载步骤2数据
-        var path = "../../../img/act/";
-        var val = $("#activityTemplateval").val();
-        $("a[id = 'activityTemplate']").each(function (){
-            if ($(this).attr("value") == val){
-                $(this).addClass('btn-success').siblings().removeClass('btn-success');
-                $("#activityTemplateh4").text(this.text);
-                $("#activityTemplateimg").attr("src",path+val+".jpg");
-            }
-        });
-        //加载步骤3数据
-        var title = $("#actTitle").val();
-        $("#actTitlePic").text(title);
-        var desc = $("#actDesc").val();
-        $("#actDescPic").text(desc);
-        var picval = $("#picval").val();
-        $("#picimg").attr("src", picval);
-        var btn1 = $("#btn1").val();
-        $("#btn1Pic").text(btn1);
-        var btn2 = $("#btn2").val();
-        $("#btn2Pic").text(btn2);
-        //加载步骤4数据
-        var val = $("#activityPlayval").val();
-        $("a[id = 'activityPlay']").each(function (){
-            if ($(this).attr("value") == val){
-                $(this).addClass('btn-success').siblings().removeClass('btn-success');
-                $("#activityPlayh4").text(this.text);
-                $("#activityPlayimg").attr("src",path+val+".jpg");
-                if (val != "0"){
-                    $("#activityPlaydiv").css('display','block');//显示
-                }else{
-                    $("#activityPlaydiv").css('display','none');//隐藏
-                }
-            }
-        });
-     //记载步骤5数据
-        var title = $("#title").val();
-        $("#titlePri").text(title);
-        var describe = $("#describe").val();
-        $("#describePri").text(describe);
-        var agreement = $("#agreement").val();
-        $("#agreementPri").text(agreement);
-        var btn = $("#btn").val();
-        $("#btnPri").text(btn);
-        var pictureval = $("#pictureval").val();
-        $("#pictureimg").attr("src", picval);
-        $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
-            var id = this.id;
-            var boolean = $("#" + id).prop("checked");
-            if (boolean) {
-                $("#" + id + "Pri").attr('type', 'text');
-            } else {
-                $("#" + id + "Pri").attr('type', 'hidden');
-            }
-
-        });
-
-        //记载步骤6数据
-        var shareDescribe = $("#shareDescribe").val();
-        $("#shareDescribePri").text(shareDescribe);
-        var shareTitle = $("#shareTitle").val();
-        $("#shareTitlePri").text(shareTitle);
-        var shareImgval = $("#shareImgval").val();
-        $("#shareImgimg").attr("src", shareImgval);
-        //记载步骤7数据
-        var qrCode = $("#qrCode").val();
-        $("#qrCodePri").text(qrCode);
-        var backdropImgval = $("#backdropImgval").val();
-        $("#backdropImgimg").attr("src", backdropImgval);
-        var qrCodeImgval = $("#qrCodeImgval").val();
-        $("#qrCodeImgimg").attr("src", qrCodeImgval);
-    });
-
-    // 显示步骤时将触发事件
-    $("#smartwizard").on("showStep", function (e, anchorObject, stepNumber, stepDirection, stepPosition) {
-        // 下面按钮是快速操作栏的
-        $("#prev-btn").removeClass('disabled');
-        $("#next-btn").removeClass('disabled');
-        // 下面按钮是工具栏的
-        $("#btn-prev").removeClass('disabled');
-        $("#btn-next").removeClass('disabled');
-        $("#btn-finish").removeClass('disabled');
-        if (stepPosition === 'first') {
-            $("#prev-btn").addClass('disabled');// 快速操作栏（演示用）
-            $("#btn-prev").addClass('disabled');
-            $("#btn-finish").addClass('disabled');
-        } else if (stepPosition === 'last') {
-            $("#next-btn").addClass('disabled');// 快速操作栏（演示用）
-            $("#btn-next").addClass('disabled');
-        } else {
-            $("#prev-btn").removeClass('disabled');// 快速操作栏（演示用）
-            $("#next-btn").removeClass('disabled');// 快速操作栏（演示用）
-            $("#btn-prev").removeClass('disabled');
-            $("#btn-next").removeClass('disabled');
-            $("#btn-finish").addClass('disabled');
-        }
-    });
-
-    // 该事件在离开某个步骤之前触发
-    $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
-        if (stepDirection == 'forward') {
-            var form = $("#step-" + (currentStepNumber + 1)).find('.form');
-            if (form.length > 0) {
-                return form.validate().form();
-            }
-            return true;
-        }
-        return true;
-    });
-
-    $("#theme-selector").on("change", function () {
-        // Change theme
-        var options = {
-            theme: $(this).val()
-        };
-        $('#smartwizard').smartWizard("setOptions", options);
-        return true;
-    });
-
-    $("#reset-btn").on("click", function () {
-        // Reset wizard
-        $('#smartwizard').smartWizard("reset");
-        return true;
-    });
-
-    $("#prev-btn").on("click", function () {
-        // Navigate previous
-        $('#smartwizard').smartWizard("prev");
-        return true;
-    });
-
-    $("#next-btn").on("click", function () {
-        // Navigate next
-        $('#smartwizard').smartWizard("next");
-        return true;
-    });
-</script>
-<script th:inline="javascript">
-
-
-    function updateText(val) {
-
-        var id = val.id;
-        var boolean = $("#" + id).prop("checked");
-        if (boolean) {
-            $("#" + id + "Pri").attr('type', 'text');
-        } else {
-            $("#" + id + "Pri").attr('type', 'hidden');
-        }
-    }
-
-
-    function updatePic(val) {
-        var id = val.id;
-        var value = val.value;
-        if (value == null || value == "" && id.indexOf("btn") != -1) {
-            //默认值
-            value = "自定义按钮" + id.charAt(id.length - 1);
-        }
-        $("#" + id + "Pic").text(value);
-
-    }
-
-    function updatePri(val) {
-        var id = val.id;
-        var value = val.value;
-        if (value == null || value == "" && id.indexOf("btn") != -1) {
-            //默认值
-            value = "自定义按钮";
-        }
-        $("#" + id + "Pri").text(value);
-    }
-
-    //图片同步
-    function syncPic(val){
-        previewURL(val);
-    }
-
-    function previewURL(input) {
-        if (input.files && input.files[0]) {
-            var reader = new FileReader();
-            var id = input.id;
-            reader.onload = function (e) {
-                //效果图
-                $("#"+id+"img").attr("src", e.target.result);
-                //传递值
-                $("#"+id+"val").val(e.target.result);
-            }
-
-            reader.readAsDataURL(input.files[0]);
-        } else{
-            //清除
-            //效果图
-            var id = input.id;
-            $("#"+id+"img").attr("src", "");
-            //传递值
-            $("#"+id+"val").val("");
-        }
-    }
-
-    function activityTemplate(val) {
-        var path = "../../img/act/";
-        $(val).addClass('btn-success').siblings().removeClass('btn-success');
-        var id = val.id;
-        var valus = $("#"+id+".btn-success").attr("value");
-        $("#"+id+"val").val(valus);
-        $("#"+id+"h4").text(val.text);
-        $("#"+id+"img").attr("src",path+valus+".jpg");
-        if (valus != "0"){
-            $("#activityPlaydiv").css('display','block');//显示
-        }else{
-            $("#activityPlaydiv").css('display','none');//隐藏
-        }
-
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file

From a6b04cf91fcea408a6d0af229094fe42c4bb5880 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:38:45 +0800
Subject: [PATCH 13/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit.html         | 1312 -----------------
 1 file changed, 1312 deletions(-)
 delete mode 100644 sino-activity/src/main/resources/templates/activity/info/edit.html

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
deleted file mode 100644
index 4c9ebc64e..000000000
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ /dev/null
@@ -1,1312 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org">
-<head>
-    <th:block th:include="include :: header('创建活动')"/>
-    <th:block th:include="include :: datetimepicker-css"/>
-    <th:block th:include="include :: jquery-smartwizard-css"/>
-    <th:block th:include="include :: jasny-bootstrap-css"/>
-</head>
-<style type='text/css'>
-    .rightarea {
-        float: left;
-        width: 40%;
-        height: 300px;
-    }
-
-    .leftarea {
-        float: left;
-        width: 60%;
-        height: 500px;
-    }
-
-    .sw > .tab-content {
-        overflow-x: hidden;
-        overflow-y: auto;
-    }
-
-    .col-sm-6 {
-        width: 50%;
-    }
-
-    .drawNamePic {
-        text-align: center;
-        position: absolute;
-        top: 100px;
-        font-size: 37px;
-        left: 0px;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawDescribePic {
-        text-align: center;
-        position: absolute;
-        top: 150px;
-        font-size: 20px;
-        left: 0px;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawbtnPic {
-        text-align: center;
-        position: absolute;
-        top: 70%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    .drawbtnPic2 {
-        text-align: center;
-        position: absolute;
-        top: 78%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    .btnSelect {
-        cursor: pointer;
-        background-color: #4CAF50;
-        color: white;
-        padding: 15px 32px;
-        display: inline-block;
-        font-size: 15px;
-    }
-
-    /* 配置收集信息*/
-    .drawTotalPri {
-        text-align: center;
-        position: absolute;
-        top: 10%;
-        font-size: 37px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawDescribePri {
-        text-align: center;
-        position: absolute;
-        top: 25%;
-        font-size: 20px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawTextPri {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        font-size: 15px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawText2Pri {
-        text-align: center;
-        position: absolute;
-        top: 55%;
-        font-size: 10px;
-        left: 0;
-        color: #F00;
-        width: 80%;
-    }
-
-    .drawText3Pri {
-        text-align: center;
-        position: absolute;
-        top: 60%;
-        font-size: 20px;
-        left: 0;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawbtnPri {
-        text-align: center;
-        position: absolute;
-        top: 88%;
-        font-size: 20px;
-        color: #F00;
-        left: 0px;
-        width: 100%;
-    }
-
-    /* 配置分享信息*/
-    .drawShareTitlePri {
-        position: absolute;
-        top: 45%;
-        font-size: 20px;
-        left: 73%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareDescribePri {
-        position: absolute;
-        top: 50%;
-        font-size: 10px;
-        left: 73%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareImgPic {
-        text-align: center;
-        position: absolute;
-        top: 52%;
-        font-size: 37px;
-        left: 38%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareImg2Pic {
-        text-align: center;
-        position: absolute;
-        top: 40%;
-        font-size: 37px;
-        left: 30%;
-        color: #F00;
-        width: 100%;
-    }
-
-    /* 关注二维码*/
-
-
-    .drawCodeImgPic {
-        text-align: center;
-        position: absolute;
-        top: 50%;
-        font-size: 37px;
-        left: 0%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawQrCodePri {
-        text-align: center;
-        position: absolute;
-        top: 70%;
-        font-size: 25px;
-        left: 0%;
-        color: #F00;
-        width: 100%;
-    }
-
-
-
-</style>
-<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
-        <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
-        <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
-        <div id="smartwizard">
-            <ul class="nav">
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-1"> 基本信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-2"> 选择UI模板 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-3"> 配置展现内容 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-4"> 选择玩法 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-5"> 配置收集信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-6"> 配置分享信息 </a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" href="#step-7"> 关注二维码 </a>
-                </li>
-            </ul>
-            <div class="tab-content" style="height: 610px;">
-                <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
-                    <div>
-                        <form class="form form-horizontal m-t">
-                            <h4 class="form-header h4">第1步-基本信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">活动名称：</label>
-                                        <div class="col-sm-8">
-                                            <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
-                                                   type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" >
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">状态：</label>
-                                        <div class="col-sm-8">
-                                            <select name="drawInfo-status" class="form-control"
-                                                    th:with="type=${@dict.getType('start_stop')}">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.STATUS}"></option>
-                                            </select>
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <select name="drawInfo-expeno" class="form-control"
-                                                    th:with="type=${@dict.getType('expeType')}">
-                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.EXPENO}"></option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">消耗价值：</label>
-                                        <div class="col-sm-8">
-                                            <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
-                                                   type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <div class="input-group date">
-                                                <input name="drawInfo-starttime" class="form-control" th:value="${#dates.format(vo.drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss')}"
-                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">结束时间：</label>
-                                        <div class="col-sm-8">
-                                            <div class="input-group date">
-                                                <input name="drawInfo-endtime" class="form-control" th:value="${#dates.format(vo.drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss')}"
-                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
-                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </form>
-                    </div>
-                </div>
-                <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
-                    <div>
-                        <h4 class="form-header h4">第2步-选择UI模板</h4>
-                        <div th:with="type=${@dict.getType('activityTemplate')}">
-
-                            <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                               th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                        </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="500">
-                    </div>
-                </div>
-                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第3步-配置展现内容</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">活动标题：</label>
-                                        <div class="col-sm-8">
-                                            <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigGuide.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:value="*{actPageConfigGuide.bgImg}">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
-                                        </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">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
-                                        </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">自定义按钮2：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
-                                        </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">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="picimg" src="../../img/act/1.jpg" width="380" height="500">
-                                <span class="drawNamePic" id="actTitlePic">活动标题</span>
-                                <span class="drawDescribePic" id="actDescPic">活动描述</span>
-                                <span class="drawbtnPic">
-                                        <a id="btn1Pic" class="btn btn-success btn-xs ">自定义按钮1</a>
-                                    </span>
-                                <span class="drawbtnPic2">
-                                        <a id="btn2Pic" class="btn btn-success btn-xs ">自定义按钮2</a>
-                                    </span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
-                    <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}"
-                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                        <a id="activityPlay" th:if="${dict.dictValue} eq '0'" class="btn btn-success  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
-                    </div>
-                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:value="*{actConfig.actType}">
-                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
-                    <h4 class="form-header h4">活动规则</h4>
-                    <div class="row" id="activityPlaydiv" style="display: none">
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
-                                <div class="col-sm-8">
-                                    <select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()"
-                                            class="form-control"
-                                            th:with="type=${@dict.getType('is_boolean')}">
-                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                th:value="${dict.dictValue}" th:field="*{drawRule.FIRSTFLAG}"></option>
-                                    </select>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-sm-6">
-                            <div class="form-group">
-                                <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
-                                <div class="col-sm-8">
-                                    <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
-                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
-                                        <option value="">所有</option>
-                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
-                                                th:value="${drawPrize.PRIZECODE}"></option>
-                                    </select>
-                                </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()"
-                                                class="form-control"
-                                                th:with="type=${@dict.getType('is_boolean')}">
-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.DAILYFLAG}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
-                                    <div class="col-sm-8">
-                                        <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
-                                               class="form-control" type="text" maxlength="30"  th:value="*{drawRule.DAILYNUMBER}">
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <div class="input-group date">
-                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
-                                                   class="form-control"
-                                                   placeholder="HH:mm:ss" type="text" >
-                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
-                                    <div class="col-sm-8">
-                                        <div class="input-group date">
-                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
-                                                   placeholder="HH:mm:ss" type="text" >
-                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                                        </div>
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-willdrawflag" id="WILLDRAWFLAG" onchange="willdrawflag()"
-                                                class="form-control" th:with="type=${@dict.getType('is_boolean')}">
-                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
-                                                    th:value="${dict.dictValue}" th:field="*{drawRule.WILLDRAWFLAG}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-sm-6">
-                                <div class="form-group">
-                                    <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
-                                    <div class="col-sm-8">
-                                        <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
-                                               placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
-                                               class="form-control" type="text" maxlength="30" >
-                                    </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>
-                                    <div class="col-sm-8">
-                                        <select name="drawRule-willdrawawardprize" class="form-control"
-                                                id="willdrawawardprize"
-                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
-                                            <option value="">所有</option>
-                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
-                                                    th:value="${drawPrize.PRIZECODE}"></option>
-                                        </select>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第五步-配置收集信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">标题：</label>
-                                        <div class="col-sm-8">
-                                            <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.title}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="describe" name="actPageConfigUserinfo-description"
-                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:value="*{actPageConfigUserinfo.description}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
-                                              [[*{actPageConfigUserinfo.agreement}]]
-                                            </textarea>
-                                            <input type="hidden" >
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigUserinfo.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="picture" name="actPageConfigUserinfo-bgImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-
-                                        </div>
-                                    </div>
-                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:value="*{actPageConfigUserinfo.bgImg}"
-                                           value="">
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">自定义按钮：</label>
-                                        <div class="col-sm-8">
-                                            <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnText}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.userName == 'on' ? true : false}" >姓名</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.mobile == 'on' ? true : false}">手机号</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.gender == 'on' ? true : false}">性别</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
-                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label ">代理人信息：</label>
-                                        <div class="col-sm-8">
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentName"
-                                                       id="agentName" onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.agentName == 'on' ? true : false}">代理人姓名</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
-                                                       id="agentPhone" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentMobile == 'on' ? true : false}">代理人手机号</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentGender"
-                                                       id="agentSex" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentGender == 'on' ? true : false}">代理人性别</input>
-                                            </label>
-                                            <label class="checkbox-inline">
-                                                <input type="checkbox" name="actPageConfigUserinfo-agentNo"
-                                                       id="agentNumber" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentNo == 'on' ? true : false}">代理人工号</input>
-                                            </label>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="pictureimg" src="../../img/shj.jpg" width="380" height="500">
-                                <span class="drawTotalPri" id="titlePri">标题</span>
-                                <span class="drawDescribePri" id="describePri">描述</span>
-                                <span class="drawTextPri">请填写您的基本信息</span>
-                                <div class="drawText2Pri">
-                                    <input type="checkbox">
-                                    <span id="agreementPri">信息页文本协议提示</span>
-                                </div>
-
-                                <div class="drawText3Pri">
-                                    <div>
-                                        <input placeholder="姓名" type="hidden" id="namePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="手机号" type="hidden" id="phonePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="性别" height="10px" type="hidden" id="sexPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="地址" type="hidden" id="addressPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人姓名" type="hidden" id="agentNamePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人手机号" type="hidden" id="agentPhonePri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人性别" type="hidden" id="agentSexPri">
-                                    </div>
-                                    <div>
-                                        <input placeholder="代理人地址" type="hidden" id="agentNumberPri">
-                                    </div>
-                                </div>
-
-                                <span class="drawbtnPri">
-                                    <a id="btnPri" class="btn btn-success btn-xs ">自定义按钮</a>
-                                    </span>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第六步-配置分享信息</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">分享连接：</label>
-                                        <div class="col-sm-8">
-                                            <input id="shareConnect" name="actConfig-shareLink"
-                                                   placeholder="例如：http://XX" class="form-control" type="text"
-                                                   th:value="*{actConfig.shareLink}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <input id="shareTitle" name="actConfig-shareTitle"
-                                                   placeholder="例如：2021XX客户节" class="form-control" type="text"
-                                                   th:value="*{actConfig.shareTitle}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </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>
-                                        <div class="col-sm-8">
-                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
-                                             [[*{actConfig.shareDesc}]]
-                                            </textarea>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">分享图片：</label>
-
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actConfig.shareImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="shareImg" name="actConfig-shareImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:value="*{actConfig.shareImg}">
-                                </div>
-                            </div>
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="height: 210px">
-                                <div class="drawShareImg2Pic">
-                                    <img  src="../../img/bj.png" height="170" width="340">
-                                </div>
-                                <div class="drawShareImgPic">
-                                    <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
-                                </div>
-                                <div>
-                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
-                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
-                    <div style="height: 610px">
-                        <div class="leftarea">
-                            <h4 class="form-header h4">第七步-关注二维码</h4>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">关注二维码描述：</label>
-                                        <div class="col-sm-8">
-                                            <input id="qrCode" name="actPageConfigSubscribe-description"
-                                                   placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
-                                                   th:value="*{actPageConfigSubscribe.description}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigSubscribe.bgImg}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="backdropImg"
-                                                           name="actPageConfigSubscribe-bgImg" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                </div>
-                                <input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
-                                       th:value="*{actPageConfigSubscribe.bgImg}"
-                                       value="">
-                            </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <label class="col-sm-4 control-label is-required">二维码图片：</label>
-                                    <div class="fileinput fileinput-new" data-provides="fileinput">
-                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
-                                             style="width: 200px; height: 150px;">
-                                            <img th:src="*{actPageConfigSubscribe.qrCode}">
-                                        </div>
-                                        <div>
-                                                <span class="btn btn-white btn-file"><span
-                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
-                                                    <input type="file" id="qrCodeImg"
-                                                           name="actPageConfigSubscribe-bgImg2" onchange="syncPic(this)"></span>
-                                            <a href="#" class="btn btn-white fileinput-exists"
-                                               data-dismiss="fileinput">清除</a>
-                                        </div>
-                                    </div>
-                                </div>
-                                <input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
-                                       th:value="*{actPageConfigSubscribe.qrCode}"
-                                       value="">
-                            </div>
-                        </div>
-                        <div class="rightarea">
-                            <h4 class="form-header h4">效果图</h4>
-                            <div style="position: relative;text-align:center">
-                                <img id="backdropImgimg" src="../../img/shj.jpg" width="400" height="400">
-                                <div class="drawCodeImgPic">
-                                    <img id="qrCodeImgimg" src="../../img/shj.jpg" width="80" height="80">
-                                </div>
-
-                                <span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
-
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </form>
-</div>
-<th:block th:include="include :: footer"/>
-<th:block th:include="include :: datetimepicker-js"/>
-<th:block th:include="include :: jquery-smartwizard-js"/>
-<th:block th:include="include :: jasny-bootstrap-js"/>
-<script th:inline="javascript">
-    var prefix = ctx + "activity/info"
-
-    /**获取奖品及信息列表*/
-    $(document).ready(function () {
-        var DAILYFLAG = $("#DAILYFLAG").val();
-        alert(DAILYFLAG);
-        if(DAILYFLAG==0){
-            $("#dailynumber").attr('disabled','true');
-            $("#dailystarttime").attr('disabled','true');
-            $("#dailyendtime").attr('disabled','true');
-        }
-        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-        if(WILLDRAWFLAG==0){
-            $("#willdrawawardnumber").attr('disabled','true');
-            $("#willdrawawardprize").attr('disabled','true');
-        }
-        var FIRSTFLAG = $("#FIRSTFLAG").val();
-        if(FIRSTFLAG==0){
-            $("#firstawardprize").attr('disabled','true');
-        }
-
-
-    });
-
-    $("#form-info-add").validate({
-        focusCleanup: true
-    });
-
-
-
-
-    //时间段抽奖配置
-    function dailyflag() {
-        var DAILYFLAG = $("#DAILYFLAG").val();
-        if (DAILYFLAG == 1) {
-            $('#dailynumber').removeAttr('disabled');
-            $('#dailystarttime').removeAttr('disabled');
-            $('#dailyendtime').removeAttr('disabled');
-        } else if (DAILYFLAG == 0) {
-            $("#dailynumber").attr('disabled', 'true');
-            $("#dailystarttime").attr('disabled', 'true');
-            $("#dailyendtime").attr('disabled', 'true');
-        }
-    }
-
-    //抽奖必中配置
-    function willdrawflag() {
-        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
-        if (WILLDRAWFLAG == 1) {
-            $('#willdrawawardnumber').removeAttr('disabled');
-            $('#willdrawawardprize').removeAttr('disabled');
-        } else if (WILLDRAWFLAG == 0) {
-            $("#willdrawawardnumber").attr('disabled', 'true');
-            $("#willdrawawardprize").attr('disabled', 'true');
-
-        }
-    }
-
-    //首次中奖配置
-    function firstflag() {
-        var FIRSTFLAG = $("#FIRSTFLAG").val();
-        if (FIRSTFLAG == 1) {
-            $('#firstawardprize').removeAttr('disabled');
-        } else if (FIRSTFLAG == 0) {
-            $("#firstawardprize").attr('disabled', 'true');
-        }
-
-    }
-
-    $("input[name='drawInfo-starttime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'yyyy-mm-dd hh:ii:ss'
-    });
-
-    $("input[name='drawInfo-endtime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'yyyy-mm-dd hh:ii:ss'
-    });
-
-    $("input[name='drawRule-dailystarttime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'hh:ii:ss'
-    });
-
-    $("input[name='drawRule-dailyendtime']").datetimepicker({
-        weekStart: 1,
-        todayBtn: 1,
-        autoclose: 1,
-        todayHighlight: 1,
-        startView: 2,
-        forceParse: 0,
-        showMeridian: 1,
-        format: 'hh:ii:ss'
-    });
-</script>
-<script th:inline="javascript">
-    $(document).ready(function () {
-        // 工具栏按钮
-        var btnFinish = $('<a id="btn-finish"></a>').text('完成')
-            .addClass('btn btn-info')
-            .on('click', function () {
-                //添加保存逻辑
-                var data = customSerialize("form-info-add", true);
-                $.ajax({
-                    url: prefix + "/edit",
-                    data: data,
-                    type: "post",
-                    contentType: "application/json;charset=UTF-8",
-                    success: function (result) {
-                        if (typeof callback == "function") {
-                            callback(result);
-                        }
-                        $.operate.successTabCallback(result);
-                    }
-            });
-        var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
-            .addClass('btn btn-danger')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("reset");
-            });
-        // 下面两个按钮是为了因为插件默认的是botton,这里换成<a>,也可以选择用样式替换,或者不替换
-        var btnNext = $('<a id="btn-next"></a>').text('下一步')
-            .addClass('btn btn-info')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("next");
-            });
-        var btnPrev = $('<a id="btn-prev"></a>').text('上一步')
-            .addClass('btn btn-success disabled')
-            .on('click', function () {
-                $('#smartwizard').smartWizard("prev");
-            });
-        // 初始化表单向导组件
-        $('#smartwizard').smartWizard({
-            theme: 'dots', // default, arrows, dots, progress
-            autoAdjustHeight: true, // 自动调整高度, 默认true
-            enableURLhash: false, //开启URL hash,开启后点击浏览器前进后退按钮会执行下一步和上一步操作
-            transition: {
-                animation: 'slide-horizontal', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
-            },
-            toolbarSettings: {
-                showNextButton: false,// 因为上面自定义了下一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
-                showPreviousButton: false,// 因为上面自定义了上一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
-                toolbarExtraButtons: [btnCancel, btnPrev, btnNext, btnFinish]// 扩展的按钮集合
-            }
-        });
-        //加载步骤2数据
-        var path = "../../../img/act/";
-        var val = $("#activityTemplateval").val();
-        $("a[id = 'activityTemplate']").each(function (){
-            if ($(this).attr("value") == val){
-                $(this).addClass('btn-success').siblings().removeClass('btn-success');
-                $("#activityTemplateh4").text(this.text);
-                $("#activityTemplateimg").attr("src",path+val+".jpg");
-            }
-        });
-        //加载步骤3数据
-        var title = $("#actTitle").val();
-        $("#actTitlePic").text(title);
-        var desc = $("#actDesc").val();
-        $("#actDescPic").text(desc);
-        var picval = $("#picval").val();
-        $("#picimg").attr("src", picval);
-        var btn1 = $("#btn1").val();
-        $("#btn1Pic").text(btn1);
-        var btn2 = $("#btn2").val();
-        $("#btn2Pic").text(btn2);
-        //加载步骤4数据
-        var val = $("#activityPlayval").val();
-        $("a[id = 'activityPlay']").each(function (){
-            if ($(this).attr("value") == val){
-                $(this).addClass('btn-success').siblings().removeClass('btn-success');
-                $("#activityPlayh4").text(this.text);
-                $("#activityPlayimg").attr("src",path+val+".jpg");
-                if (val != "0"){
-                    $("#activityPlaydiv").css('display','block');//显示
-                }else{
-                    $("#activityPlaydiv").css('display','none');//隐藏
-                }
-            }
-        });
-     //记载步骤5数据
-        var title = $("#title").val();
-        $("#titlePri").text(title);
-        var describe = $("#describe").val();
-        $("#describePri").text(describe);
-        var agreement = $("#agreement").val();
-        $("#agreementPri").text(agreement);
-        var btn = $("#btn").val();
-        $("#btnPri").text(btn);
-        var pictureval = $("#pictureval").val();
-        $("#pictureimg").attr("src", picval);
-        $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
-            var id = this.id;
-            var boolean = $("#" + id).prop("checked");
-            if (boolean) {
-                $("#" + id + "Pri").attr('type', 'text');
-            } else {
-                $("#" + id + "Pri").attr('type', 'hidden');
-            }
-
-        });
-
-        //记载步骤6数据
-        var shareDescribe = $("#shareDescribe").val();
-        $("#shareDescribePri").text(shareDescribe);
-        var shareTitle = $("#shareTitle").val();
-        $("#shareTitlePri").text(shareTitle);
-        var shareImgval = $("#shareImgval").val();
-        $("#shareImgimg").attr("src", shareImgval);
-        //记载步骤7数据
-        var qrCode = $("#qrCode").val();
-        $("#qrCodePri").text(qrCode);
-        var backdropImgval = $("#backdropImgval").val();
-        $("#backdropImgimg").attr("src", backdropImgval);
-        var qrCodeImgval = $("#qrCodeImgval").val();
-        $("#qrCodeImgimg").attr("src", qrCodeImgval);
-    });
-
-    // 显示步骤时将触发事件
-    $("#smartwizard").on("showStep", function (e, anchorObject, stepNumber, stepDirection, stepPosition) {
-        // 下面按钮是快速操作栏的
-        $("#prev-btn").removeClass('disabled');
-        $("#next-btn").removeClass('disabled');
-        // 下面按钮是工具栏的
-        $("#btn-prev").removeClass('disabled');
-        $("#btn-next").removeClass('disabled');
-        $("#btn-finish").removeClass('disabled');
-        if (stepPosition === 'first') {
-            $("#prev-btn").addClass('disabled');// 快速操作栏（演示用）
-            $("#btn-prev").addClass('disabled');
-            $("#btn-finish").addClass('disabled');
-        } else if (stepPosition === 'last') {
-            $("#next-btn").addClass('disabled');// 快速操作栏（演示用）
-            $("#btn-next").addClass('disabled');
-        } else {
-            $("#prev-btn").removeClass('disabled');// 快速操作栏（演示用）
-            $("#next-btn").removeClass('disabled');// 快速操作栏（演示用）
-            $("#btn-prev").removeClass('disabled');
-            $("#btn-next").removeClass('disabled');
-            $("#btn-finish").addClass('disabled');
-        }
-    });
-
-    // 该事件在离开某个步骤之前触发
-    $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
-        if (stepDirection == 'forward') {
-            var form = $("#step-" + (currentStepNumber + 1)).find('.form');
-            if (form.length > 0) {
-                return form.validate().form();
-            }
-            return true;
-        }
-        return true;
-    });
-
-    $("#theme-selector").on("change", function () {
-        // Change theme
-        var options = {
-            theme: $(this).val()
-        };
-        $('#smartwizard').smartWizard("setOptions", options);
-        return true;
-    });
-
-    $("#reset-btn").on("click", function () {
-        // Reset wizard
-        $('#smartwizard').smartWizard("reset");
-        return true;
-    });
-
-    $("#prev-btn").on("click", function () {
-        // Navigate previous
-        $('#smartwizard').smartWizard("prev");
-        return true;
-    });
-
-    $("#next-btn").on("click", function () {
-        // Navigate next
-        $('#smartwizard').smartWizard("next");
-        return true;
-    });
-</script>
-<script th:inline="javascript">
-
-
-    function updateText(val) {
-
-        var id = val.id;
-        var boolean = $("#" + id).prop("checked");
-        if (boolean) {
-            $("#" + id + "Pri").attr('type', 'text');
-        } else {
-            $("#" + id + "Pri").attr('type', 'hidden');
-        }
-    }
-
-
-    function updatePic(val) {
-        var id = val.id;
-        var value = val.value;
-        if (value == null || value == "" && id.indexOf("btn") != -1) {
-            //默认值
-            value = "自定义按钮" + id.charAt(id.length - 1);
-        }
-        $("#" + id + "Pic").text(value);
-
-    }
-
-    function updatePri(val) {
-        var id = val.id;
-        var value = val.value;
-        if (value == null || value == "" && id.indexOf("btn") != -1) {
-            //默认值
-            value = "自定义按钮";
-        }
-        $("#" + id + "Pri").text(value);
-    }
-
-    //图片同步
-    function syncPic(val){
-        previewURL(val);
-    }
-
-    function previewURL(input) {
-        if (input.files && input.files[0]) {
-            var reader = new FileReader();
-            var id = input.id;
-            reader.onload = function (e) {
-                //效果图
-                $("#"+id+"img").attr("src", e.target.result);
-                //传递值
-                $("#"+id+"val").val(e.target.result);
-            }
-
-            reader.readAsDataURL(input.files[0]);
-        } else{
-            //清除
-            //效果图
-            var id = input.id;
-            $("#"+id+"img").attr("src", "");
-            //传递值
-            $("#"+id+"val").val("");
-        }
-    }
-
-    function activityTemplate(val) {
-        var path = "../../img/act/";
-        $(val).addClass('btn-success').siblings().removeClass('btn-success');
-        var id = val.id;
-        var valus = $("#"+id+".btn-success").attr("value");
-        $("#"+id+"val").val(valus);
-        $("#"+id+"h4").text(val.text);
-        $("#"+id+"img").attr("src",path+valus+".jpg");
-        if (valus != "0"){
-            $("#activityPlaydiv").css('display','block');//显示
-        }else{
-            $("#activityPlaydiv").css('display','none');//隐藏
-        }
-
-    }
-
-</script>
-</body>
-</html>
\ No newline at end of file

From f29b950cec7205e11660b63f0620743d2dddfab6 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:39:08 +0800
Subject: [PATCH 14/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit.html         | 1312 +++++++++++++++++
 1 file changed, 1312 insertions(+)
 create mode 100644 sino-activity/src/main/resources/templates/activity/info/edit.html

diff --git a/sino-activity/src/main/resources/templates/activity/info/edit.html b/sino-activity/src/main/resources/templates/activity/info/edit.html
new file mode 100644
index 000000000..4c9ebc64e
--- /dev/null
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -0,0 +1,1312 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('创建活动')"/>
+    <th:block th:include="include :: datetimepicker-css"/>
+    <th:block th:include="include :: jquery-smartwizard-css"/>
+    <th:block th:include="include :: jasny-bootstrap-css"/>
+</head>
+<style type='text/css'>
+    .rightarea {
+        float: left;
+        width: 40%;
+        height: 300px;
+    }
+
+    .leftarea {
+        float: left;
+        width: 60%;
+        height: 500px;
+    }
+
+    .sw > .tab-content {
+        overflow-x: hidden;
+        overflow-y: auto;
+    }
+
+    .col-sm-6 {
+        width: 50%;
+    }
+
+    .drawNamePic {
+        text-align: center;
+        position: absolute;
+        top: 100px;
+        font-size: 37px;
+        left: 0px;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawDescribePic {
+        text-align: center;
+        position: absolute;
+        top: 150px;
+        font-size: 20px;
+        left: 0px;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawbtnPic {
+        text-align: center;
+        position: absolute;
+        top: 70%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    .drawbtnPic2 {
+        text-align: center;
+        position: absolute;
+        top: 78%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    .btnSelect {
+        cursor: pointer;
+        background-color: #4CAF50;
+        color: white;
+        padding: 15px 32px;
+        display: inline-block;
+        font-size: 15px;
+    }
+
+    /* 配置收集信息*/
+    .drawTotalPri {
+        text-align: center;
+        position: absolute;
+        top: 10%;
+        font-size: 37px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawDescribePri {
+        text-align: center;
+        position: absolute;
+        top: 25%;
+        font-size: 20px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawTextPri {
+        text-align: center;
+        position: absolute;
+        top: 50%;
+        font-size: 15px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawText2Pri {
+        text-align: center;
+        position: absolute;
+        top: 55%;
+        font-size: 10px;
+        left: 0;
+        color: #F00;
+        width: 80%;
+    }
+
+    .drawText3Pri {
+        text-align: center;
+        position: absolute;
+        top: 60%;
+        font-size: 20px;
+        left: 0;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawbtnPri {
+        text-align: center;
+        position: absolute;
+        top: 88%;
+        font-size: 20px;
+        color: #F00;
+        left: 0px;
+        width: 100%;
+    }
+
+    /* 配置分享信息*/
+    .drawShareTitlePri {
+        position: absolute;
+        top: 45%;
+        font-size: 20px;
+        left: 73%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareDescribePri {
+        position: absolute;
+        top: 50%;
+        font-size: 10px;
+        left: 73%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareImgPic {
+        text-align: center;
+        position: absolute;
+        top: 52%;
+        font-size: 37px;
+        left: 38%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawShareImg2Pic {
+        text-align: center;
+        position: absolute;
+        top: 40%;
+        font-size: 37px;
+        left: 30%;
+        color: #F00;
+        width: 100%;
+    }
+
+    /* 关注二维码*/
+
+
+    .drawCodeImgPic {
+        text-align: center;
+        position: absolute;
+        top: 50%;
+        font-size: 37px;
+        left: 0%;
+        color: #F00;
+        width: 100%;
+    }
+
+    .drawQrCodePri {
+        text-align: center;
+        position: absolute;
+        top: 70%;
+        font-size: 25px;
+        left: 0%;
+        color: #F00;
+        width: 100%;
+    }
+
+
+
+</style>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
+        <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
+        <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
+        <div id="smartwizard">
+            <ul class="nav">
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-1"> 基本信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-2"> 选择UI模板 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-3"> 配置展现内容 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-4"> 选择玩法 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-5"> 配置收集信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-6"> 配置分享信息 </a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#step-7"> 关注二维码 </a>
+                </li>
+            </ul>
+            <div class="tab-content" style="height: 610px;">
+                <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
+                    <div>
+                        <form class="form form-horizontal m-t">
+                            <h4 class="form-header h4">第1步-基本信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">活动名称：</label>
+                                        <div class="col-sm-8">
+                                            <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
+                                                   type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" >
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">状态：</label>
+                                        <div class="col-sm-8">
+                                            <select name="drawInfo-status" class="form-control"
+                                                    th:with="type=${@dict.getType('start_stop')}">
+                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.STATUS}"></option>
+                                            </select>
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <select name="drawInfo-expeno" class="form-control"
+                                                    th:with="type=${@dict.getType('expeType')}">
+                                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                        th:value="${dict.dictValue}" th:field="*{drawInfo.EXPENO}"></option>
+                                            </select>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">消耗价值：</label>
+                                        <div class="col-sm-8">
+                                            <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
+                                                   type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <div class="input-group date">
+                                                <input name="drawInfo-starttime" class="form-control" th:value="${#dates.format(vo.drawInfo.STARTTIME, 'yyyy-MM-dd HH:mm:ss')}"
+                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">结束时间：</label>
+                                        <div class="col-sm-8">
+                                            <div class="input-group date">
+                                                <input name="drawInfo-endtime" class="form-control" th:value="${#dates.format(vo.drawInfo.ENDTIME, 'yyyy-MM-dd HH:mm:ss')}"
+                                                       placeholder="yyyy-MM-dd HH:mm:ss" type="text">
+                                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+                <div id="step-2" class="tab-pane" role="tabpanel" aria-labelledby="step-2">
+                    <div>
+                        <h4 class="form-header h4">第2步-选择UI模板</h4>
+                        <div th:with="type=${@dict.getType('activityTemplate')}">
+
+                            <a id="activityTemplate" class="btn  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                               th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
+                        </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="500">
+                    </div>
+                </div>
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第3步-配置展现内容</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">活动标题：</label>
+                                        <div class="col-sm-8">
+                                            <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
+
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigGuide.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                    <input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" th:value="*{actPageConfigGuide.bgImg}">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
+                                        </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">按钮1跳转链接：</label>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
+                                        </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">自定义按钮2：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                                   class="form-control" type="text"
+                                                   maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
+                                        </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">按钮2跳转链接：</label>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
+                                                   class="form-control"
+                                                   type="text"
+                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="picimg" src="../../img/act/1.jpg" width="380" height="500">
+                                <span class="drawNamePic" id="actTitlePic">活动标题</span>
+                                <span class="drawDescribePic" id="actDescPic">活动描述</span>
+                                <span class="drawbtnPic">
+                                        <a id="btn1Pic" class="btn btn-success btn-xs ">自定义按钮1</a>
+                                    </span>
+                                <span class="drawbtnPic2">
+                                        <a id="btn2Pic" class="btn btn-success btn-xs ">自定义按钮2</a>
+                                    </span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                    <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}"
+                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
+                        <a id="activityPlay" th:if="${dict.dictValue} eq '0'" class="btn btn-success  btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                           th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
+                    </div>
+                    <input type="hidden" name="actConfig-actType" id="activityPlayval" value="" th:value="*{actConfig.actType}">
+                    <img id="activityPlayimg" src="../../img/act/0.jpg" width="60%" height="300">
+                    <h4 class="form-header h4">活动规则</h4>
+                    <div class="row" id="activityPlaydiv" style="display: none">
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">首次中奖配置：</label>
+                                <div class="col-sm-8">
+                                    <select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()"
+                                            class="form-control"
+                                            th:with="type=${@dict.getType('is_boolean')}">
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                th:value="${dict.dictValue}" th:field="*{drawRule.FIRSTFLAG}"></option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label is-required">首次中奖奖品：</label>
+                                <div class="col-sm-8">
+                                    <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
+                                            th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                        <option value="">所有</option>
+                                        <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                th:value="${drawPrize.PRIZECODE}"></option>
+                                    </select>
+                                </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()"
+                                                class="form-control"
+                                                th:with="type=${@dict.getType('is_boolean')}">
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.DAILYFLAG}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">时间段限制次数：</label>
+                                    <div class="col-sm-8">
+                                        <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
+                                               class="form-control" type="text" maxlength="30"  th:value="*{drawRule.DAILYNUMBER}">
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <div class="input-group date">
+                                            <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
+                                                   class="form-control"
+                                                   placeholder="HH:mm:ss" type="text" >
+                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">抽奖限制结束时间：</label>
+                                    <div class="col-sm-8">
+                                        <div class="input-group date">
+                                            <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
+                                                   placeholder="HH:mm:ss" type="text" >
+                                            <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                                        </div>
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-willdrawflag" id="WILLDRAWFLAG" onchange="willdrawflag()"
+                                                class="form-control" th:with="type=${@dict.getType('is_boolean')}">
+                                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
+                                                    th:value="${dict.dictValue}" th:field="*{drawRule.WILLDRAWFLAG}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="col-sm-6">
+                                <div class="form-group">
+                                    <label class="col-sm-4 control-label is-required">抽奖必中计数：</label>
+                                    <div class="col-sm-8">
+                                        <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
+                                               placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
+                                               class="form-control" type="text" maxlength="30" >
+                                    </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>
+                                    <div class="col-sm-8">
+                                        <select name="drawRule-willdrawawardprize" class="form-control"
+                                                id="willdrawawardprize"
+                                                th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
+                                            <option value="">所有</option>
+                                            <option th:each="drawPrize : ${drawPrize}" th:text="${drawPrize.PRIZENAME}"
+                                                    th:value="${drawPrize.PRIZECODE}"></option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
+                    <div style="height: 810px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第五步-配置收集信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">标题：</label>
+                                        <div class="col-sm-8">
+                                            <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.title}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input id="describe" name="actPageConfigUserinfo-description"
+                                                   placeholder="例如：客户手机号" class="form-control" type="text" th:value="*{actPageConfigUserinfo.description}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
+                                              [[*{actPageConfigUserinfo.agreement}]]
+                                            </textarea>
+                                            <input type="hidden" >
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
+
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigUserinfo.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="picture" name="actPageConfigUserinfo-bgImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+
+                                        </div>
+                                    </div>
+                                    <input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg" th:value="*{actPageConfigUserinfo.bgImg}"
+                                           value="">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">自定义按钮：</label>
+                                        <div class="col-sm-8">
+                                            <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnText}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
+                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-userName" id="name"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.userName == 'on' ? true : false}" >姓名</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.mobile == 'on' ? true : false}">手机号</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.gender == 'on' ? true : false}">性别</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
+                                                       onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label ">代理人信息：</label>
+                                        <div class="col-sm-8">
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentName"
+                                                       id="agentName" onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.agentName == 'on' ? true : false}">代理人姓名</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentMobile"
+                                                       id="agentPhone" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentMobile == 'on' ? true : false}">代理人手机号</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentGender"
+                                                       id="agentSex" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentGender == 'on' ? true : false}">代理人性别</input>
+                                            </label>
+                                            <label class="checkbox-inline">
+                                                <input type="checkbox" name="actPageConfigUserinfo-agentNo"
+                                                       id="agentNumber" onclick="updateText(this)"th:checked="*{actPageConfigUserinfo.agentNo == 'on' ? true : false}">代理人工号</input>
+                                            </label>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="pictureimg" src="../../img/shj.jpg" width="380" height="500">
+                                <span class="drawTotalPri" id="titlePri">标题</span>
+                                <span class="drawDescribePri" id="describePri">描述</span>
+                                <span class="drawTextPri">请填写您的基本信息</span>
+                                <div class="drawText2Pri">
+                                    <input type="checkbox">
+                                    <span id="agreementPri">信息页文本协议提示</span>
+                                </div>
+
+                                <div class="drawText3Pri">
+                                    <div>
+                                        <input placeholder="姓名" type="hidden" id="namePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="手机号" type="hidden" id="phonePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="性别" height="10px" type="hidden" id="sexPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="地址" type="hidden" id="addressPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人姓名" type="hidden" id="agentNamePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人手机号" type="hidden" id="agentPhonePri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人性别" type="hidden" id="agentSexPri">
+                                    </div>
+                                    <div>
+                                        <input placeholder="代理人地址" type="hidden" id="agentNumberPri">
+                                    </div>
+                                </div>
+
+                                <span class="drawbtnPri">
+                                    <a id="btnPri" class="btn btn-success btn-xs ">自定义按钮</a>
+                                    </span>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+                <div id="step-6" class="tab-pane" role="tabpanel" aria-labelledby="step-6">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第六步-配置分享信息</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">分享连接：</label>
+                                        <div class="col-sm-8">
+                                            <input id="shareConnect" name="actConfig-shareLink"
+                                                   placeholder="例如：http://XX" class="form-control" type="text"
+                                                   th:value="*{actConfig.shareLink}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <input id="shareTitle" name="actConfig-shareTitle"
+                                                   placeholder="例如：2021XX客户节" class="form-control" type="text"
+                                                   th:value="*{actConfig.shareTitle}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </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>
+                                        <div class="col-sm-8">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
+                                             [[*{actConfig.shareDesc}]]
+                                            </textarea>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">分享图片：</label>
+
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actConfig.shareImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="shareImg" name="actConfig-shareImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                    <input id="shareImgval" type="hidden" name="actConfig-shareImg" value="" th:value="*{actConfig.shareImg}">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="height: 210px">
+                                <div class="drawShareImg2Pic">
+                                    <img  src="../../img/bj.png" height="170" width="340">
+                                </div>
+                                <div class="drawShareImgPic">
+                                    <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
+                                </div>
+                                <div>
+                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
+                                </div>
+                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div id="step-7" class="tab-pane" role="tabpanel" aria-labelledby="step-7">
+                    <div style="height: 610px">
+                        <div class="leftarea">
+                            <h4 class="form-header h4">第七步-关注二维码</h4>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div class="form-group">
+                                        <label class="col-sm-4 control-label is-required">关注二维码描述：</label>
+                                        <div class="col-sm-8">
+                                            <input id="qrCode" name="actPageConfigSubscribe-description"
+                                                   placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
+                                                   th:value="*{actPageConfigSubscribe.description}"
+                                                   maxlength="30" onkeyup="updatePri(this)">
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">背景图片：</label>
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.bgImg}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="backdropImg"
+                                                           name="actPageConfigSubscribe-bgImg" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
+                                       th:value="*{actPageConfigSubscribe.bgImg}"
+                                       value="">
+                            </div>
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <label class="col-sm-4 control-label is-required">二维码图片：</label>
+                                    <div class="fileinput fileinput-new" data-provides="fileinput">
+                                        <div class="fileinput-preview thumbnail" data-trigger="fileinput"
+                                             style="width: 200px; height: 150px;">
+                                            <img th:src="*{actPageConfigSubscribe.qrCode}">
+                                        </div>
+                                        <div>
+                                                <span class="btn btn-white btn-file"><span
+                                                        class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
+                                                    <input type="file" id="qrCodeImg"
+                                                           name="actPageConfigSubscribe-bgImg2" onchange="syncPic(this)"></span>
+                                            <a href="#" class="btn btn-white fileinput-exists"
+                                               data-dismiss="fileinput">清除</a>
+                                        </div>
+                                    </div>
+                                </div>
+                                <input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-qrCode"
+                                       th:value="*{actPageConfigSubscribe.qrCode}"
+                                       value="">
+                            </div>
+                        </div>
+                        <div class="rightarea">
+                            <h4 class="form-header h4">效果图</h4>
+                            <div style="position: relative;text-align:center">
+                                <img id="backdropImgimg" src="../../img/shj.jpg" width="400" height="400">
+                                <div class="drawCodeImgPic">
+                                    <img id="qrCodeImgimg" src="../../img/shj.jpg" width="80" height="80">
+                                </div>
+
+                                <span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer"/>
+<th:block th:include="include :: datetimepicker-js"/>
+<th:block th:include="include :: jquery-smartwizard-js"/>
+<th:block th:include="include :: jasny-bootstrap-js"/>
+<script th:inline="javascript">
+    var prefix = ctx + "activity/info"
+
+    /**获取奖品及信息列表*/
+    $(document).ready(function () {
+        var DAILYFLAG = $("#DAILYFLAG").val();
+        alert(DAILYFLAG);
+        if(DAILYFLAG==0){
+            $("#dailynumber").attr('disabled','true');
+            $("#dailystarttime").attr('disabled','true');
+            $("#dailyendtime").attr('disabled','true');
+        }
+        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
+        if(WILLDRAWFLAG==0){
+            $("#willdrawawardnumber").attr('disabled','true');
+            $("#willdrawawardprize").attr('disabled','true');
+        }
+        var FIRSTFLAG = $("#FIRSTFLAG").val();
+        if(FIRSTFLAG==0){
+            $("#firstawardprize").attr('disabled','true');
+        }
+
+
+    });
+
+    $("#form-info-add").validate({
+        focusCleanup: true
+    });
+
+
+
+
+    //时间段抽奖配置
+    function dailyflag() {
+        var DAILYFLAG = $("#DAILYFLAG").val();
+        if (DAILYFLAG == 1) {
+            $('#dailynumber').removeAttr('disabled');
+            $('#dailystarttime').removeAttr('disabled');
+            $('#dailyendtime').removeAttr('disabled');
+        } else if (DAILYFLAG == 0) {
+            $("#dailynumber").attr('disabled', 'true');
+            $("#dailystarttime").attr('disabled', 'true');
+            $("#dailyendtime").attr('disabled', 'true');
+        }
+    }
+
+    //抽奖必中配置
+    function willdrawflag() {
+        var WILLDRAWFLAG = $("#WILLDRAWFLAG").val();
+        if (WILLDRAWFLAG == 1) {
+            $('#willdrawawardnumber').removeAttr('disabled');
+            $('#willdrawawardprize').removeAttr('disabled');
+        } else if (WILLDRAWFLAG == 0) {
+            $("#willdrawawardnumber").attr('disabled', 'true');
+            $("#willdrawawardprize").attr('disabled', 'true');
+
+        }
+    }
+
+    //首次中奖配置
+    function firstflag() {
+        var FIRSTFLAG = $("#FIRSTFLAG").val();
+        if (FIRSTFLAG == 1) {
+            $('#firstawardprize').removeAttr('disabled');
+        } else if (FIRSTFLAG == 0) {
+            $("#firstawardprize").attr('disabled', 'true');
+        }
+
+    }
+
+    $("input[name='drawInfo-starttime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'yyyy-mm-dd hh:ii:ss'
+    });
+
+    $("input[name='drawInfo-endtime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'yyyy-mm-dd hh:ii:ss'
+    });
+
+    $("input[name='drawRule-dailystarttime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'hh:ii:ss'
+    });
+
+    $("input[name='drawRule-dailyendtime']").datetimepicker({
+        weekStart: 1,
+        todayBtn: 1,
+        autoclose: 1,
+        todayHighlight: 1,
+        startView: 2,
+        forceParse: 0,
+        showMeridian: 1,
+        format: 'hh:ii:ss'
+    });
+</script>
+<script th:inline="javascript">
+    $(document).ready(function () {
+        // 工具栏按钮
+        var btnFinish = $('<a id="btn-finish"></a>').text('完成')
+            .addClass('btn btn-info')
+            .on('click', function () {
+                //添加保存逻辑
+                var data = customSerialize("form-info-add", true);
+                $.ajax({
+                    url: prefix + "/edit",
+                    data: data,
+                    type: "post",
+                    contentType: "application/json;charset=UTF-8",
+                    success: function (result) {
+                        if (typeof callback == "function") {
+                            callback(result);
+                        }
+                        $.operate.successTabCallback(result);
+                    }
+            });
+        var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
+            .addClass('btn btn-danger')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("reset");
+            });
+        // 下面两个按钮是为了因为插件默认的是botton,这里换成<a>,也可以选择用样式替换,或者不替换
+        var btnNext = $('<a id="btn-next"></a>').text('下一步')
+            .addClass('btn btn-info')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("next");
+            });
+        var btnPrev = $('<a id="btn-prev"></a>').text('上一步')
+            .addClass('btn btn-success disabled')
+            .on('click', function () {
+                $('#smartwizard').smartWizard("prev");
+            });
+        // 初始化表单向导组件
+        $('#smartwizard').smartWizard({
+            theme: 'dots', // default, arrows, dots, progress
+            autoAdjustHeight: true, // 自动调整高度, 默认true
+            enableURLhash: false, //开启URL hash,开启后点击浏览器前进后退按钮会执行下一步和上一步操作
+            transition: {
+                animation: 'slide-horizontal', // Effect on navigation, none/fade/slide-horizontal/slide-vertical/slide-swing
+            },
+            toolbarSettings: {
+                showNextButton: false,// 因为上面自定义了下一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
+                showPreviousButton: false,// 因为上面自定义了上一步按钮, 所以隐藏掉插件自带的按钮, 如果不使用自定义按钮, 需要改为true或者去掉该属性
+                toolbarExtraButtons: [btnCancel, btnPrev, btnNext, btnFinish]// 扩展的按钮集合
+            }
+        });
+        //加载步骤2数据
+        var path = "../../../img/act/";
+        var val = $("#activityTemplateval").val();
+        $("a[id = 'activityTemplate']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityTemplateh4").text(this.text);
+                $("#activityTemplateimg").attr("src",path+val+".jpg");
+            }
+        });
+        //加载步骤3数据
+        var title = $("#actTitle").val();
+        $("#actTitlePic").text(title);
+        var desc = $("#actDesc").val();
+        $("#actDescPic").text(desc);
+        var picval = $("#picval").val();
+        $("#picimg").attr("src", picval);
+        var btn1 = $("#btn1").val();
+        $("#btn1Pic").text(btn1);
+        var btn2 = $("#btn2").val();
+        $("#btn2Pic").text(btn2);
+        //加载步骤4数据
+        var val = $("#activityPlayval").val();
+        $("a[id = 'activityPlay']").each(function (){
+            if ($(this).attr("value") == val){
+                $(this).addClass('btn-success').siblings().removeClass('btn-success');
+                $("#activityPlayh4").text(this.text);
+                $("#activityPlayimg").attr("src",path+val+".jpg");
+                if (val != "0"){
+                    $("#activityPlaydiv").css('display','block');//显示
+                }else{
+                    $("#activityPlaydiv").css('display','none');//隐藏
+                }
+            }
+        });
+     //记载步骤5数据
+        var title = $("#title").val();
+        $("#titlePri").text(title);
+        var describe = $("#describe").val();
+        $("#describePri").text(describe);
+        var agreement = $("#agreement").val();
+        $("#agreementPri").text(agreement);
+        var btn = $("#btn").val();
+        $("#btnPri").text(btn);
+        var pictureval = $("#pictureval").val();
+        $("#pictureimg").attr("src", picval);
+        $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
+            var id = this.id;
+            var boolean = $("#" + id).prop("checked");
+            if (boolean) {
+                $("#" + id + "Pri").attr('type', 'text');
+            } else {
+                $("#" + id + "Pri").attr('type', 'hidden');
+            }
+
+        });
+
+        //记载步骤6数据
+        var shareDescribe = $("#shareDescribe").val();
+        $("#shareDescribePri").text(shareDescribe);
+        var shareTitle = $("#shareTitle").val();
+        $("#shareTitlePri").text(shareTitle);
+        var shareImgval = $("#shareImgval").val();
+        $("#shareImgimg").attr("src", shareImgval);
+        //记载步骤7数据
+        var qrCode = $("#qrCode").val();
+        $("#qrCodePri").text(qrCode);
+        var backdropImgval = $("#backdropImgval").val();
+        $("#backdropImgimg").attr("src", backdropImgval);
+        var qrCodeImgval = $("#qrCodeImgval").val();
+        $("#qrCodeImgimg").attr("src", qrCodeImgval);
+    });
+
+    // 显示步骤时将触发事件
+    $("#smartwizard").on("showStep", function (e, anchorObject, stepNumber, stepDirection, stepPosition) {
+        // 下面按钮是快速操作栏的
+        $("#prev-btn").removeClass('disabled');
+        $("#next-btn").removeClass('disabled');
+        // 下面按钮是工具栏的
+        $("#btn-prev").removeClass('disabled');
+        $("#btn-next").removeClass('disabled');
+        $("#btn-finish").removeClass('disabled');
+        if (stepPosition === 'first') {
+            $("#prev-btn").addClass('disabled');// 快速操作栏（演示用）
+            $("#btn-prev").addClass('disabled');
+            $("#btn-finish").addClass('disabled');
+        } else if (stepPosition === 'last') {
+            $("#next-btn").addClass('disabled');// 快速操作栏（演示用）
+            $("#btn-next").addClass('disabled');
+        } else {
+            $("#prev-btn").removeClass('disabled');// 快速操作栏（演示用）
+            $("#next-btn").removeClass('disabled');// 快速操作栏（演示用）
+            $("#btn-prev").removeClass('disabled');
+            $("#btn-next").removeClass('disabled');
+            $("#btn-finish").addClass('disabled');
+        }
+    });
+
+    // 该事件在离开某个步骤之前触发
+    $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
+        if (stepDirection == 'forward') {
+            var form = $("#step-" + (currentStepNumber + 1)).find('.form');
+            if (form.length > 0) {
+                return form.validate().form();
+            }
+            return true;
+        }
+        return true;
+    });
+
+    $("#theme-selector").on("change", function () {
+        // Change theme
+        var options = {
+            theme: $(this).val()
+        };
+        $('#smartwizard').smartWizard("setOptions", options);
+        return true;
+    });
+
+    $("#reset-btn").on("click", function () {
+        // Reset wizard
+        $('#smartwizard').smartWizard("reset");
+        return true;
+    });
+
+    $("#prev-btn").on("click", function () {
+        // Navigate previous
+        $('#smartwizard').smartWizard("prev");
+        return true;
+    });
+
+    $("#next-btn").on("click", function () {
+        // Navigate next
+        $('#smartwizard').smartWizard("next");
+        return true;
+    });
+</script>
+<script th:inline="javascript">
+
+
+    function updateText(val) {
+
+        var id = val.id;
+        var boolean = $("#" + id).prop("checked");
+        if (boolean) {
+            $("#" + id + "Pri").attr('type', 'text');
+        } else {
+            $("#" + id + "Pri").attr('type', 'hidden');
+        }
+    }
+
+
+    function updatePic(val) {
+        var id = val.id;
+        var value = val.value;
+        if (value == null || value == "" && id.indexOf("btn") != -1) {
+            //默认值
+            value = "自定义按钮" + id.charAt(id.length - 1);
+        }
+        $("#" + id + "Pic").text(value);
+
+    }
+
+    function updatePri(val) {
+        var id = val.id;
+        var value = val.value;
+        if (value == null || value == "" && id.indexOf("btn") != -1) {
+            //默认值
+            value = "自定义按钮";
+        }
+        $("#" + id + "Pri").text(value);
+    }
+
+    //图片同步
+    function syncPic(val){
+        previewURL(val);
+    }
+
+    function previewURL(input) {
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+            var id = input.id;
+            reader.onload = function (e) {
+                //效果图
+                $("#"+id+"img").attr("src", e.target.result);
+                //传递值
+                $("#"+id+"val").val(e.target.result);
+            }
+
+            reader.readAsDataURL(input.files[0]);
+        } else{
+            //清除
+            //效果图
+            var id = input.id;
+            $("#"+id+"img").attr("src", "");
+            //传递值
+            $("#"+id+"val").val("");
+        }
+    }
+
+    function activityTemplate(val) {
+        var path = "../../img/act/";
+        $(val).addClass('btn-success').siblings().removeClass('btn-success');
+        var id = val.id;
+        var valus = $("#"+id+".btn-success").attr("value");
+        $("#"+id+"val").val(valus);
+        $("#"+id+"h4").text(val.text);
+        $("#"+id+"img").attr("src",path+valus+".jpg");
+        if (valus != "0"){
+            $("#activityPlaydiv").css('display','block');//显示
+        }else{
+            $("#activityPlaydiv").css('display','none');//隐藏
+        }
+
+    }
+
+</script>
+</body>
+</html>
\ No newline at end of file

From 0bbbb3615253246fd86ba39c2faa30a8adfd86c4 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:40:05 +0800
Subject: [PATCH 15/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/edit.html         | 1 -
 1 file changed, 1 deletion(-)

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 4c9ebc64e..ac6ed2618 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -933,7 +933,6 @@
     /**获取奖品及信息列表*/
     $(document).ready(function () {
         var DAILYFLAG = $("#DAILYFLAG").val();
-        alert(DAILYFLAG);
         if(DAILYFLAG==0){
             $("#dailynumber").attr('disabled','true');
             $("#dailystarttime").attr('disabled','true');

From 01d592a093ee368c705d33ad0e599a5cc8f8b8b5 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 10:45:40 +0800
Subject: [PATCH 16/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/edit.html         | 1 +
 1 file changed, 1 insertion(+)

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 ac6ed2618..28f151048 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -1059,6 +1059,7 @@
                         }
                         $.operate.successTabCallback(result);
                     }
+                })
             });
         var btnCancel = $('<a id="btn-cancel"></a>').text('取消')
             .addClass('btn btn-danger')

From 4b21e1a86916225ab69e4f5881566a0429e05677 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 11:24:42 +0800
Subject: [PATCH 17/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=B8=BA=E7=A9=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/edit.html         | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

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 28f151048..36d22dae6 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -947,8 +947,6 @@
         if(FIRSTFLAG==0){
             $("#firstawardprize").attr('disabled','true');
         }
-
-
     });
 
     $("#form-info-add").validate({
@@ -1109,9 +1107,17 @@
         var picval = $("#picval").val();
         $("#picimg").attr("src", picval);
         var btn1 = $("#btn1").val();
-        $("#btn1Pic").text(btn1);
+        if (btn1!= null && btn1 != ''){
+            $("#btn1Pic").text(btn1);
+        }else{
+            $("#btn1Pic").text("自定义按钮1");
+        }
         var btn2 = $("#btn2").val();
-        $("#btn2Pic").text(btn2);
+        if (btn2!= null && btn2 != ''){
+            $("#btn2Pic").text(btn2);
+        }else{
+            $("#btn2Pic").text("自定义按钮2");
+        }
         //加载步骤4数据
         var val = $("#activityPlayval").val();
         $("a[id = 'activityPlay']").each(function (){
@@ -1134,7 +1140,11 @@
         var agreement = $("#agreement").val();
         $("#agreementPri").text(agreement);
         var btn = $("#btn").val();
-        $("#btnPri").text(btn);
+        if (btn!= null && btn != ''){
+            $("#btnPri").text(btn);
+        }else{
+            $("#btnPri").text("自定义按钮");
+        }
         var pictureval = $("#pictureval").val();
         $("#pictureimg").attr("src", picval);
         $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
@@ -1292,7 +1302,7 @@
     }
 
     function activityTemplate(val) {
-        var path = "../../img/act/";
+        var path = "../../../img/act/";
         $(val).addClass('btn-success').siblings().removeClass('btn-success');
         var id = val.id;
         var valus = $("#"+id+".btn-success").attr("value");

From fde75a9b3629723253d3ec377f0245c2e8c5293c Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 14:20:17 +0800
Subject: [PATCH 18/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/info/add.html  | 12 +++++-------
 .../resources/templates/activity/info/edit.html | 17 ++++++-----------
 2 files changed, 11 insertions(+), 18 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 91bcc5059..856266eca 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -605,10 +605,9 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">协议内容：</label>
-                                        <div class="col-sm-8">
-                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement"   cols="40" rows="6" onkeyup="updatePri(this)">
-                                            </textarea>
+                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
+                                        <div class="col-xs-8">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement"  onkeyup="updatePri(this)" maxlength="500" class="form-control" rows="5"></textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -789,9 +788,8 @@
                                 <div class="col-sm-6">
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">分享描述：</label>
-                                        <div class="col-sm-8">
-                                             <textarea id="shareDescribe"  name="actConfig-shareDesc"  cols="40" rows="6" onkeyup="updatePri(this)">
-                                            </textarea>
+                                        <div class="col-xs-8">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"  onkeyup="updatePri(this)" maxlength="500" class="form-control" rows="5"></textarea>
                                         </div>
                                     </div>
                                 </div>
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 36d22dae6..b8db8ab4c 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -606,11 +606,8 @@
                                 <div class="col-sm-6">
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">协议内容：</label>
-                                        <div class="col-sm-8">
-                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
-                                              [[*{actPageConfigUserinfo.agreement}]]
-                                            </textarea>
-                                            <input type="hidden" >
+                                        <div class="col-xs-8">
+                                            <textarea id="agreement"  name="actPageConfigUserinfo-agreement" maxlength="500" onkeyup="updatePri(this)" class="form-control" rows="3">[[*{actPageConfigUserinfo.agreement}]]</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -795,10 +792,8 @@
                                 <div class="col-sm-6">
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">分享描述：</label>
-                                        <div class="col-sm-8">
-                                            <textarea id="shareDescribe"  name="actConfig-shareDesc"   cols="40" rows="6" onkeyup="updatePri(this)">
-                                             [[*{actConfig.shareDesc}]]
-                                            </textarea>
+                                        <div class="col-xs-8">
+                                            <textarea id="shareDescribe"  name="actConfig-shareDesc" maxlength="500" onkeyup="updatePri(this)" class="form-control" rows="3">[[*{actConfig.shareDesc}]]</textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -828,7 +823,7 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="height: 210px">
                                 <div class="drawShareImg2Pic">
-                                    <img  src="../../img/bj.png" height="170" width="340">
+                                    <img  src="../../../img/bj.png" height="170" width="340">
                                 </div>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
@@ -1116,7 +1111,7 @@
         if (btn2!= null && btn2 != ''){
             $("#btn2Pic").text(btn2);
         }else{
-            $("#btn2Pic").text("自定义按钮2");
+                $("#btn2Pic").text("自定义按钮2");
         }
         //加载步骤4数据
         var val = $("#activityPlayval").val();

From a184dad08a18d08ae2b7af408cd209a1c6e03b3b Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 15:13:21 +0800
Subject: [PATCH 19/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/activity/info/add.html     | 14 +-------------
 .../resources/templates/activity/info/edit.html    | 12 ------------
 2 files changed, 1 insertion(+), 25 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 856266eca..f973f9d89 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -644,18 +644,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>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
@@ -817,7 +805,7 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="height: 210px">
                                 <div class="drawShareImg2Pic">
-                                    <img id="ss" src="../../img/bj.png" height="170" width="340">
+                                    <img id="ss" src="../../../img/bj.png" height="170" width="340">
                                 </div>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
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 b8db8ab4c..d266ed9db 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -646,18 +646,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>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接"
-                                                   class="form-control" type="text" th:value="*{actPageConfigUserinfo.btnLink}"
-                                                   maxlength="30" onkeyup="updatePri(this)">
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">

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

---
 .../templates/activity/info/add.html          | 76 ++++++++++++-------
 .../templates/activity/info/edit.html         | 70 +++++++++++------
 2 files changed, 94 insertions(+), 52 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 856266eca..a091f26da 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -7,6 +7,18 @@
     <th:block th:include="include :: jasny-bootstrap-css"/>
 </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;
+    }
     .rightarea {
         float: left;
         width: 40%;
@@ -204,9 +216,12 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
     <form class="form-horizontal m" id="form-info-add">
-
+        <div class="row">
+        <div class="col-sm-12">
+        <div class="ibox">
+        <div class="ibox-content">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -231,7 +246,7 @@
                     <a class="nav-link" href="#step-7"> 关注二维码 </a>
                 </li>
             </ul>
-            <div class="tab-content" style="height: 610px;">
+            <div class="tab-content" >
                 <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
                     <div>
                         <form class="form form-horizontal m-t">
@@ -322,7 +337,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="500">
+                        <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">
@@ -377,7 +392,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
                                                    class="form-control"
                                                    type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
@@ -385,25 +400,25 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30">
-                                        </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">按钮1跳转链接：</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30">-->
+<!--                                        </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">自定义按钮2：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
                                                    class="form-control" type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
                                         </div>
@@ -413,13 +428,14 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30">
-                                        </div>
+                                        <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
+<!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30">-->
+                                            <div class="col-xs-8">
+                                                <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
+                                            </div>
                                     </div>
                                 </div>
                             </div>
@@ -575,7 +591,7 @@
                     </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
+                    <div style="height: 600px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -900,9 +916,12 @@
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
+        </div>
+        </div>
+        </div>
+        </div>
     </form>
 </div>
 <th:block th:include="include :: footer"/>
@@ -1193,6 +1212,7 @@
             $("#activityPlaydiv").css('display','block');//显示
         }else{
             $("#activityPlaydiv").css('display','none');//隐藏
+            $('#smartwizard').smartWizard();
         }
 
     }
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 b8db8ab4c..b77d34bf6 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -7,6 +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;
+    }
     .rightarea {
         float: left;
         width: 40%;
@@ -204,10 +215,14 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
         <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
         <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox">
+                    <div class="ibox-content">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -322,7 +337,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="500">
+                        <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">
@@ -379,7 +394,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
                                                    class="form-control"
                                                    type="text"
                                                    maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
@@ -387,25 +402,25 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
-                                        </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">按钮1跳转链接：</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">-->
+<!--                                        </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">自定义按钮2：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
                                                    class="form-control" type="text"
                                                    maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
                                         </div>
@@ -415,12 +430,13 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
+                                        <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
+                                        <!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
+                                        <!--                                                   class="form-control"-->
+                                        <!--                                                   type="text"-->
+                                        <!--                                                   maxlength="30">-->
+                                        <div class="col-xs-8">
+                                            <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -444,6 +460,7 @@
                     </div>
                 </div>
                 <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                    <div style="height: 600px">
                     <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}"
@@ -573,9 +590,10 @@
                             </div>
                         </div>
                     </div>
+                    </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
+                    <div style="height: 600px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -915,6 +933,10 @@
                 </div>
 
             </div>
+        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </form>
 </div>

From 8f1b28da10c7b40490282804874e860a007781f9 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Tue, 13 Apr 2021 16:30:27 +0800
Subject: [PATCH 21/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/add.html          | 76 ++++++++++++-------
 .../templates/activity/info/edit.html         | 70 +++++++++++------
 2 files changed, 94 insertions(+), 52 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 f973f9d89..798dd061b 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -7,6 +7,18 @@
     <th:block th:include="include :: jasny-bootstrap-css"/>
 </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;
+    }
     .rightarea {
         float: left;
         width: 40%;
@@ -204,9 +216,12 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
     <form class="form-horizontal m" id="form-info-add">
-
+        <div class="row">
+        <div class="col-sm-12">
+        <div class="ibox">
+        <div class="ibox-content">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -231,7 +246,7 @@
                     <a class="nav-link" href="#step-7"> 关注二维码 </a>
                 </li>
             </ul>
-            <div class="tab-content" style="height: 610px;">
+            <div class="tab-content" >
                 <div id="step-1" class="tab-pane" role="tabpanel" aria-labelledby="step-1">
                     <div>
                         <form class="form form-horizontal m-t">
@@ -322,7 +337,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="500">
+                        <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">
@@ -377,7 +392,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
                                                    class="form-control"
                                                    type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
@@ -385,25 +400,25 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30">
-                                        </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">按钮1跳转链接：</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30">-->
+<!--                                        </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">自定义按钮2：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
                                                    class="form-control" type="text"
                                                    maxlength="30" onkeyup="updatePic(this)">
                                         </div>
@@ -413,13 +428,14 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30">
-                                        </div>
+                                        <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
+<!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30">-->
+                                            <div class="col-xs-8">
+                                                <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
+                                            </div>
                                     </div>
                                 </div>
                             </div>
@@ -575,7 +591,7 @@
                     </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
+                    <div style="height: 600px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -888,9 +904,12 @@
                         </div>
                     </div>
                 </div>
-
             </div>
         </div>
+        </div>
+        </div>
+        </div>
+        </div>
     </form>
 </div>
 <th:block th:include="include :: footer"/>
@@ -1181,6 +1200,7 @@
             $("#activityPlaydiv").css('display','block');//显示
         }else{
             $("#activityPlaydiv").css('display','none');//隐藏
+            $('#smartwizard').smartWizard();
         }
 
     }
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 d266ed9db..7c2f10fa1 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -7,6 +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;
+    }
     .rightarea {
         float: left;
         width: 40%;
@@ -204,10 +215,14 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
         <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
         <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
+        <div class="row">
+            <div class="col-sm-12">
+                <div class="ibox">
+                    <div class="ibox-content">
         <div id="smartwizard">
             <ul class="nav">
                 <li class="nav-item">
@@ -322,7 +337,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="500">
+                        <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">
@@ -379,7 +394,7 @@
                                     <div class="form-group">
                                         <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1"
+                                            <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
                                                    class="form-control"
                                                    type="text"
                                                    maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}">
@@ -387,25 +402,25 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">
-                                        </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">按钮1跳转链接：</label>-->
+<!--                                        <div class="col-sm-8">-->
+<!--                                            <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接"-->
+<!--                                                   class="form-control"-->
+<!--                                                   type="text"-->
+<!--                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink}">-->
+<!--                                        </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">自定义按钮2：</label>
                                         <div class="col-sm-8">
-                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2"
+                                            <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
                                                    class="form-control" type="text"
                                                    maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText2}">
                                         </div>
@@ -415,12 +430,13 @@
                             <div class="row">
                                 <div class="col-sm-6">
                                     <div class="form-group">
-                                        <label class="col-sm-4 control-label is-required">按钮2跳转链接：</label>
-                                        <div class="col-sm-8">
-                                            <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接"
-                                                   class="form-control"
-                                                   type="text"
-                                                   maxlength="30" th:value="*{actPageConfigGuide.btnLink2}">
+                                        <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
+                                        <!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
+                                        <!--                                                   class="form-control"-->
+                                        <!--                                                   type="text"-->
+                                        <!--                                                   maxlength="30">-->
+                                        <div class="col-xs-8">
+                                            <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
                                         </div>
                                     </div>
                                 </div>
@@ -444,6 +460,7 @@
                     </div>
                 </div>
                 <div id="step-4" class="tab-pane" role="tabpanel" aria-labelledby="step-4">
+                    <div style="height: 600px">
                     <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}"
@@ -573,9 +590,10 @@
                             </div>
                         </div>
                     </div>
+                    </div>
                 </div>
                 <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
-                    <div style="height: 810px">
+                    <div style="height: 600px">
                         <div class="leftarea">
                             <h4 class="form-header h4">第五步-配置收集信息</h4>
                             <div class="row">
@@ -903,6 +921,10 @@
                 </div>
 
             </div>
+        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </form>
 </div>

From fbecd5c611712428b000ad2fde88717670adebf8 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 17:06:10 +0800
Subject: [PATCH 22/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/IDrawInfoService.java    |  6 ++++-
 .../service/impl/DrawInfoServiceImpl.java     |  5 ++++
 .../templates/activity/info/add.html          | 27 +++++++------------
 .../templates/activity/info/edit.html         | 26 ++++++------------
 4 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
index 1e2029118..10572ff94 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/IDrawInfoService.java
@@ -68,6 +68,10 @@ public interface IDrawInfoService
      */
     public int deleteDrawInfoById(String DRAWID);
 
-
+    /**
+     * 新增抽奖活动信息
+     * @param vo
+     * @return
+     */
    public  int updateActVO(ActVO vo);
 }
diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
index e4ca30f39..d2010bf00 100644
--- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
+++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/DrawInfoServiceImpl.java
@@ -136,6 +136,11 @@ public class DrawInfoServiceImpl implements IDrawInfoService
         return drawInfoMapper.deleteDrawInfoById(DRAWID);
     }
 
+    /**
+     * 新增抽奖活动信息
+     * @param vo
+     * @return
+     */
     @Override
     public int updateActVO(ActVO vo) {
         Date date = new Date();
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 798dd061b..d8221cf1f 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -152,19 +152,21 @@
 
     /* 配置分享信息*/
     .drawShareTitlePri {
+        text-align: center;
         position: absolute;
-        top: 45%;
+        top: 20%;
         font-size: 20px;
-        left: 73%;
+        right : 5%;
         color: #F00;
         width: 100%;
     }
 
     .drawShareDescribePri {
+        text-align: center;
         position: absolute;
         top: 50%;
         font-size: 10px;
-        left: 73%;
+        right : 8%;
         color: #F00;
         width: 100%;
     }
@@ -172,22 +174,13 @@
     .drawShareImgPic {
         text-align: center;
         position: absolute;
-        top: 52%;
+        top: 50%;
         font-size: 37px;
-        left: 38%;
+        left: 25%;
         color: #F00;
         width: 100%;
     }
 
-    .drawShareImg2Pic {
-        text-align: center;
-        position: absolute;
-        top: 40%;
-        font-size: 37px;
-        left: 30%;
-        color: #F00;
-        width: 100%;
-    }
 
     /* 关注二维码*/
 
@@ -819,10 +812,8 @@
                         </div>
                         <div class="rightarea">
                             <h4 class="form-header h4">效果图</h4>
-                            <div style="height: 210px">
-                                <div class="drawShareImg2Pic">
-                                    <img id="ss" src="../../../img/bj.png" height="170" width="340">
-                                </div>
+                            <div style="position: relative;text-align:center">
+                                    <img  src="../../../img/bj.png" height="170" width="340">
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
                                 </div>
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 7c2f10fa1..2702013bc 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -151,19 +151,21 @@
 
     /* 配置分享信息*/
     .drawShareTitlePri {
+        text-align: center;
         position: absolute;
-        top: 45%;
+        top: 20%;
         font-size: 20px;
-        left: 73%;
+        right : 5%;
         color: #F00;
         width: 100%;
     }
 
     .drawShareDescribePri {
+        text-align: center;
         position: absolute;
         top: 50%;
         font-size: 10px;
-        left: 73%;
+        right : 8%;
         color: #F00;
         width: 100%;
     }
@@ -171,19 +173,9 @@
     .drawShareImgPic {
         text-align: center;
         position: absolute;
-        top: 52%;
+        top: 50%;
         font-size: 37px;
-        left: 38%;
-        color: #F00;
-        width: 100%;
-    }
-
-    .drawShareImg2Pic {
-        text-align: center;
-        position: absolute;
-        top: 40%;
-        font-size: 37px;
-        left: 30%;
+        left: 25%;
         color: #F00;
         width: 100%;
     }
@@ -827,10 +819,8 @@
                         </div>
                         <div class="rightarea">
                             <h4 class="form-header h4">效果图</h4>
-                            <div style="height: 210px">
-                                <div class="drawShareImg2Pic">
+                            <div style="position: relative;text-align:center">
                                     <img  src="../../../img/bj.png" height="170" width="340">
-                                </div>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
                                 </div>

From 5a2f2edbde2dac0cab92df416c6b35b14d9bdd70 Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Tue, 13 Apr 2021 17:50:54 +0800
Subject: [PATCH 23/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/activity/info/add.html   | 11 +++++------
 .../main/resources/templates/activity/info/edit.html  | 10 ++++------
 2 files changed, 9 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 d8221cf1f..e24a5c833 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -156,7 +156,7 @@
         position: absolute;
         top: 20%;
         font-size: 20px;
-        right : 5%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
@@ -166,7 +166,7 @@
         position: absolute;
         top: 50%;
         font-size: 10px;
-        right : 8%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
@@ -814,13 +814,12 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="position: relative;text-align:center">
                                     <img  src="../../../img/bj.png" height="170" width="340">
+                                <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
+                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
+
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
                                 </div>
-                                <div>
-                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
-                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
 
                             </div>
                         </div>
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..cd6fcd81a 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -155,7 +155,7 @@
         position: absolute;
         top: 20%;
         font-size: 20px;
-        right : 5%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
@@ -165,7 +165,7 @@
         position: absolute;
         top: 50%;
         font-size: 10px;
-        right : 8%;
+        left: 0%;
         color: #F00;
         width: 100%;
     }
@@ -821,13 +821,11 @@
                             <h4 class="form-header h4">效果图</h4>
                             <div style="position: relative;text-align:center">
                                     <img  src="../../../img/bj.png" height="170" width="340">
+                                <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
+                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
                                 <div class="drawShareImgPic">
                                     <img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
                                 </div>
-                                <div>
-                                    <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
-                                </div>
-                                <span class="drawShareDescribePri" id="shareDescribePri">分享必得奖品</span>
 
                             </div>
                         </div>

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 24/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B7=BB=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">

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 25/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B7=BB=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');
                 }
             }
         });

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

---
 .../src/main/resources/templates/activity/info/edit.html      | 4 ++++
 1 file changed, 4 insertions(+)

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 3de324615..debeb3d18 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -1308,8 +1308,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');//隐藏
+            $("#activityTemplateimg").css('display','none');
+            $("#activityPlayimg").css('display','none');
         }
 
     }

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 27/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B7=BB=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')}">

From 2e993dbc8f16aa1a4057fb22a9abe76e0a117794 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Wed, 14 Apr 2021 17:20:30 +0800
Subject: [PATCH 28/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/add.html         | 2 +-
 .../src/main/resources/templates/activity/info/edit.html        | 2 +-
 2 files changed, 2 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 451d8d305..6bb16adfd 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 style="height: 500px">
+                    <div style="height: 600px">
                         <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}"
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 b32d89484..5bac31a7f 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 style="height: 500px">
+                    <div style="height: 600px">
                         <h4 class="form-header h4">第2步-选择UI模板</h4>
                         <div th:with="type=${@dict.getType('activityTemplate')}">
 

From e510c937f1ce28743fabe3ee82d46ca2e6a3aa8c Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Thu, 15 Apr 2021 09:27:18 +0800
Subject: [PATCH 29/33] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/activity/info/edit.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5bac31a7f..a82144965 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -1143,7 +1143,7 @@
             $("#btnPri").text("自定义按钮");
         }
         var pictureval = $("#pictureval").val();
-        $("#pictureimg").attr("src", picval);
+        $("#pictureimg").attr("src", pictureval);
         $("input[type='checkbox'][name ^='actPageConfigUserinfo']").each(function (){
             var id = this.id;
             var boolean = $("#" + id).prop("checked");

From 5785e6863fcd38c96349e06be47fb17354d0d3b9 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 15 Apr 2021 14:28:01 +0800
Subject: [PATCH 30/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=8C=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/activity/info/add.html          | 31 ++++++++++++-------
 .../templates/activity/info/edit.html         | 31 ++++++++++++-------
 2 files changed, 39 insertions(+), 23 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 6bb16adfd..13b0e3d79 100644
--- a/sino-activity/src/main/resources/templates/activity/info/add.html
+++ b/sino-activity/src/main/resources/templates/activity/info/add.html
@@ -5,6 +5,7 @@
     <th:block th:include="include :: datetimepicker-css"/>
     <th:block th:include="include :: jquery-smartwizard-css"/>
     <th:block th:include="include :: jasny-bootstrap-css"/>
+    <th:block th:include="include :: summernote-css" />
 </head>
 <style type='text/css'>
     /* 如果要让工具栏固定在页面底部,使用下面的样式,不需要的可以注释 */
@@ -209,7 +210,7 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" >
     <form class="form-horizontal m" id="form-info-add">
         <div class="row">
         <div class="col-sm-12">
@@ -333,7 +334,7 @@
                         <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%">
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 130%">
                     <div >
                         <div class="leftarea">
                             <h4 class="form-header h4">第3步-配置展现内容</h4>
@@ -418,19 +419,18 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
+                            <div class="row" style="height: 850">
+                                    <div class="form-group" style="float: left">
+                                        <div  style="width: 60%">
                                         <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
-<!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
-<!--                                                   class="form-control"-->
-<!--                                                   type="text"-->
-<!--                                                   maxlength="30">-->
-                                            <div class="col-xs-8">
-                                                <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
+                                        </div>
+                                        <div class="col-sm-8">
+                                            <div class="summernote">
+                                                例如：http：//xx
                                             </div>
+                                        </div>
+                                        <textarea id="btnLink2"  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
                                     </div>
-                                </div>
                             </div>
 
                         </div>
@@ -908,6 +908,7 @@
 <th:block th:include="include :: datetimepicker-js"/>
 <th:block th:include="include :: jquery-smartwizard-js"/>
 <th:block th:include="include :: jasny-bootstrap-js"/>
+<th:block th:include="include :: summernote-js" />
 <script th:inline="javascript">
     var prefix = ctx + "activity/info"
 
@@ -1002,11 +1003,17 @@
 </script>
 <script th:inline="javascript">
     $(document).ready(function () {
+        $('.summernote').summernote({
+            height:200,
+            lang: 'zh-CN'
+        });
         // 工具栏按钮
         var btnFinish = $('<a id="btn-finish"></a>').text('完成')
             .addClass('btn btn-info')
             .on('click', function () {
                 //添加保存逻辑
+                var markupStr  = $('.summernote').summernote('code');
+                $("btnLink2").val(markupStr);
                 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 5bac31a7f..446529aa4 100644
--- a/sino-activity/src/main/resources/templates/activity/info/edit.html
+++ b/sino-activity/src/main/resources/templates/activity/info/edit.html
@@ -5,6 +5,7 @@
     <th:block th:include="include :: datetimepicker-css"/>
     <th:block th:include="include :: jquery-smartwizard-css"/>
     <th:block th:include="include :: jasny-bootstrap-css"/>
+    <th:block th:include="include :: summernote-css" />
 </head>
 <style type='text/css'>
     /*.sw>.toolbar-bottom{*/
@@ -207,7 +208,7 @@
 
 </style>
 <body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content" style="height: 100%;">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" >
     <form class="form-horizontal m" id="form-info-add" th:object="${vo}">
         <input name="drawInfo-drawid" th:value="*{drawInfo.DRAWID}" type="hidden">
         <input name="drawInfo-drawcode" th:value="*{drawInfo.DRAWCODE}" type="hidden">
@@ -332,7 +333,7 @@
                         <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%">
+                <div id="step-3" class="tab-pane" role="tabpanel" aria-labelledby="step-3" style="height: 130%">
                     <div style="">
                         <div class="leftarea">
                             <h4 class="form-header h4">第3步-配置展现内容</h4>
@@ -419,18 +420,17 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    <div class="form-group">
+                            <div class="row" style="height: 850">
+                                <div class="form-group" style="float: left">
+                                    <div  style="width: 60%">
                                         <label class="col-sm-4 control-label is-required">按钮2页面内容：</label>
-                                        <!--                                            <input name="actPageConfigGuide-btnLink2" placeholder="例如：http：//xx"-->
-                                        <!--                                                   class="form-control"-->
-                                        <!--                                                   type="text"-->
-                                        <!--                                                   maxlength="30">-->
-                                        <div class="col-xs-8">
-                                            <textarea  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="例如：http：//xx"></textarea>
+                                    </div>
+                                    <div class="col-sm-8">
+                                        <div class="summernote">
+                                            例如：http：//xx
                                         </div>
                                     </div>
+                                    <textarea id="btnLink2"  type="text" th:value="*{actPageConfigGuide.btnLink2}"  name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea>
                                 </div>
                             </div>
 
@@ -920,6 +920,7 @@
 <th:block th:include="include :: datetimepicker-js"/>
 <th:block th:include="include :: jquery-smartwizard-js"/>
 <th:block th:include="include :: jasny-bootstrap-js"/>
+<th:block th:include="include :: summernote-js" />
 <script th:inline="javascript">
     var prefix = ctx + "activity/info"
 
@@ -1038,6 +1039,8 @@
             .addClass('btn btn-info')
             .on('click', function () {
                 //添加保存逻辑
+                var markupStr  = $('.summernote').summernote('code');
+                $("#btnLink2").val(markupStr);
                 var data = customSerialize("form-info-add", true);
                 $.ajax({
                     url: prefix + "/edit",
@@ -1114,6 +1117,12 @@
         }else{
                 $("#btn2Pic").text("自定义按钮2");
         }
+        $('.summernote').summernote({
+            height:200,
+            lang: 'zh-CN'
+        });
+        var linkvar = [[${vo.actPageConfigGuide.btnLink2}]];
+        $('.summernote').summernote('code',linkvar);
         //加载步骤4数据
         var val = $("#activityPlayval").val();
         $("a[id = 'activityPlay']").each(function (){

From 0c0a2a89a5a51008dabc4e3a6d3eccc79cc4c85b Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 15 Apr 2021 15:25:49 +0800
Subject: [PATCH 31/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=AC=A2=E8=BF=8E?=
 =?UTF-8?q?=E9=A1=B5=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/draw/DrawController.java   |  53 ++++++-
 .../com/ruoyi/web/vo/draw/ActGuideResult.java |  25 ++++
 .../main/resources/public/draw/actGuide.html  | 139 ++++++++++++++++++
 3 files changed, 212 insertions(+), 5 deletions(-)
 create mode 100644 sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActGuideResult.java
 create mode 100644 sino-act-web/src/main/resources/public/draw/actGuide.html

diff --git a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
index 6f63937ed..eb539034f 100644
--- a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
+++ b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
@@ -1,17 +1,20 @@
 package com.ruoyi.web.controller.draw;
 
-import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.web.vo.Const;
 import com.ruoyi.web.vo.Result;
 import com.ruoyi.web.vo.draw.*;
+import com.sinosoft.activity.domain.ActConfig;
+import com.sinosoft.activity.domain.ActPageConfigGuide;
 import com.sinosoft.activity.domain.DrawConfig;
 import com.sinosoft.activity.domain.DrawInfo;
-import com.sinosoft.activity.service.IDrawConfigService;
-import com.sinosoft.activity.service.IDrawInfoService;
-import com.sinosoft.activity.service.IDrawTaskNotifyService;
+import com.sinosoft.activity.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
 import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.mp.api.WxMpService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,13 +29,13 @@ import javax.servlet.http.HttpSession;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 抽奖Controller
  * @author huayue
  * @since 2020-08-13
  */
+@Api("活动管理")
 @Controller
 @RequestMapping("/draw")
 public class DrawController {
@@ -46,6 +49,10 @@ public class DrawController {
     private IDrawInfoService drawInfoService;
     @Autowired
     private WxMpService wxService;
+    @Autowired
+    private IActPageConfigGuideService actPageConfigGuideService;
+    @Autowired
+    private IActConfigService actConfigService;
 
     private WxOAuth2UserInfo getUserInfo(HttpServletRequest request, String code) throws Exception {
 //        if (!this.wxService.switchover(appid)) {
@@ -341,4 +348,40 @@ public class DrawController {
         return result;
     }
 
+    /**
+     *  获取活动配置展示信息，根据活动编码
+     *  todo 判断活动状态
+     * @param request
+     * @param actCode
+     * @return
+     */
+    @ApiOperation("获取活动配置展示信息")
+    @ApiImplicitParam(name = "actCode", value = "活动编码", required = true, dataType = "string", paramType = "path")
+    @RequestMapping(value="/guide", method = RequestMethod.POST)
+    @ResponseBody
+    public Result getActGuide(HttpServletRequest request, String actCode) {
+        ActGuideResult result = new ActGuideResult();
+        try {
+            //查询活动内容
+            DrawInfo drawInfo = new DrawInfo();
+            drawInfo.setDRAWCODE(actCode);
+            drawInfo.setSTATUS("1");
+            List<DrawInfo> drawInfos = drawInfoService.selectDrawInfoList(drawInfo);
+            result.setDrawInfo(drawInfos.get(0));
+            //查询获取风格
+            ActConfig actConfig = actConfigService.selectActConfigByCode(actCode);
+            result.setPageStyle(actConfig.getPageStyle());
+            result.setActType(actConfig.getActType());
+            //获取页面展示内容配置
+            ActPageConfigGuide actPageConfigGuide = actPageConfigGuideService.selectActPageConfigGuideByCode(actCode);
+            result.setActPageConfigGuide(actPageConfigGuide);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.saveAddress ex: ", e);
+        }
+        return result;
+    }
+
+
 }
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActGuideResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActGuideResult.java
new file mode 100644
index 000000000..b2b03cb9b
--- /dev/null
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActGuideResult.java
@@ -0,0 +1,25 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigGuide;
+import com.sinosoft.activity.domain.DrawInfo;
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author dy
+ * @version 1.0
+ * @date 2021/4/14 14:38
+ */
+@Data
+public class ActGuideResult extends Result {
+    private ActPageConfigGuide actPageConfigGuide;
+
+    private DrawInfo drawInfo;
+
+    private Integer pageStyle;
+
+    private  Integer actType;
+
+}
diff --git a/sino-act-web/src/main/resources/public/draw/actGuide.html b/sino-act-web/src/main/resources/public/draw/actGuide.html
new file mode 100644
index 000000000..a2052961e
--- /dev/null
+++ b/sino-act-web/src/main/resources/public/draw/actGuide.html
@@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <meta charset="UTF-8">
+    <meta name="format-detection" content="telephone=no"/>
+    <title>活动</title>
+    <link rel="stylesheet" href="css/reset.css">
+    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" type="text/css" href="css/popup.css"/>
+    <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/register.css"/>
+    <link rel="stylesheet" type="text/css" href="css/winPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/goods.css"/>
+    <link rel="stylesheet" type="text/css" href="css/rule.css"/>
+    <script src="/js/config.js"></script>
+    <style type="text/css">
+        .button { /* 按钮美化 */
+            width: 200px; /* 宽度 */
+            height: 40px; /* 高度 */
+            border-width: 0px; /* 边框宽度 */
+            border-radius: 3px; /* 边框半径 */
+            background: #1E90FF; /* 背景颜色 */
+            cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
+            outline: none; /* 不显示轮廓线 */
+            font-family: Microsoft YaHei; /* 设置字体 */
+            color: white; /* 字体颜色 */
+            font-size: 17px; /* 字体大小 */
+        }
+        .button:hover { /* 鼠标移入按钮范围时改变颜色 */
+            background: #5599FF;
+        }
+        p {
+            clear: both;
+            padding-bottom: 2em;
+        }
+        .title {
+            text-align: center;
+            position: absolute;
+            top: 20%;
+            font-size: 37px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .desc {
+            text-align: center;
+            position: absolute;
+            top: 30%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .btntext {
+            text-align: center;
+            position: absolute;
+            top: 60%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+        .btntext2 {
+            text-align: center;
+            position: absolute;
+            top: 70%;
+            font-size: 22px;
+            left: 0px;
+            color: #fef6e1;
+            width: 100%;
+        }
+    </style>
+    <link rel="stylesheet" href="css/main.css">
+    <script src="js/jquery-1.9.1.min.js"></script>
+    <script src="js/awardRotate.js"></script>
+    <script src="js/util.js"></script>
+    <script src="js/draw.js"></script>
+    <script>
+        var num = 0;
+        var prizeImgs = [];
+
+        $(document).ready(function () {
+            $.ajax({
+                type: "POST",
+                async: false,
+                url: contextRootPath + "/draw/guide",
+                data: {actCode: drawCode},
+                dataType: "json",
+                success: function (data) {
+                    //todo 根据风格改变css样式
+                        $('title').html(data.drawInfo.drawname);
+                        $(".act_guide").attr("background",data.actPageConfigGuide.bgImg);
+                        $("#title").text(data.actPageConfigGuide.actTitle);
+                        $("#desc").text(data.actPageConfigGuide.actDesc);
+                        $("#btntext").val(data.actPageConfigGuide.btnText);
+                        $("#btntext2").val(data.actPageConfigGuide.btnText2);
+                        $("#flag").val(data.actType);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    console.log('网络异常', textStatus, errorThrown);
+                }
+            });
+        });
+
+    </script>
+</head>
+
+<body  class="template_bg popupBox act_guide" style="background-color: #fbdaaf;
+                background-repeat:no-repeat;
+               background-attachment:fixed;
+               background-size:100% 100%;">
+    <div>
+        <h1 class="title" id="title"></h1>
+        <h2 class="desc" id="desc"></h2>
+<!--        <p><a href="#" class="button" id="btntext" ></a></p>-->
+        <p class="btntext"><input class="button" id="btntext" type="button" onclick="jump()"/></p>
+        <p class="btntext2"><input class="button" id="btntext2" type="button"/></p>
+        <input id="flag" type="hidden" value=""/>
+    </div>
+
+<script src="js/main.js"></script>
+<script src="js/scroll.js"></script>
+<script src="js/common.js"></script>
+</body>
+<script>
+    function jump(){
+        var flag = $("#flag").val;
+        //根据不同玩法跳转不同页面
+        if (flag == "0"){
+            window.location.href='turntable.html';
+        }else{
+            window.location.href='scratchcard.html';
+        }
+    }
+</script>
+
+</html>
\ No newline at end of file

From 3746c7d3dee9e96d8cdc75dd197d176c06b72851 Mon Sep 17 00:00:00 2001
From: dy <1197793912@qq.com>
Date: Thu, 15 Apr 2021 15:32:28 +0800
Subject: [PATCH 32/33] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sino-act-web/src/main/resources/public/draw/actGuide.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/sino-act-web/src/main/resources/public/draw/actGuide.html b/sino-act-web/src/main/resources/public/draw/actGuide.html
index a2052961e..204474061 100644
--- a/sino-act-web/src/main/resources/public/draw/actGuide.html
+++ b/sino-act-web/src/main/resources/public/draw/actGuide.html
@@ -78,9 +78,6 @@
     <script src="js/util.js"></script>
     <script src="js/draw.js"></script>
     <script>
-        var num = 0;
-        var prizeImgs = [];
-
         $(document).ready(function () {
             $.ajax({
                 type: "POST",
@@ -114,7 +111,6 @@
     <div>
         <h1 class="title" id="title"></h1>
         <h2 class="desc" id="desc"></h2>
-<!--        <p><a href="#" class="button" id="btntext" ></a></p>-->
         <p class="btntext"><input class="button" id="btntext" type="button" onclick="jump()"/></p>
         <p class="btntext2"><input class="button" id="btntext2" type="button"/></p>
         <input id="flag" type="hidden" value=""/>
@@ -129,9 +125,9 @@
         var flag = $("#flag").val;
         //根据不同玩法跳转不同页面
         if (flag == "0"){
-            window.location.href='turntable.html';
+            window.location.href='turntable.html?drawCode='+drawCode;
         }else{
-            window.location.href='scratchcard.html';
+            window.location.href='scratchcard.html?drawCode='+drawCode;
         }
     }
 </script>

From 87ada3cbe7d8a7defd68dba928f65286d59a6d6a Mon Sep 17 00:00:00 2001
From: xu0625 <1212>
Date: Thu, 15 Apr 2021 16:59:29 +0800
Subject: [PATCH 33/33] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=89=8D=E7=AB=AF=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 +
 .../web/controller/draw/DrawController.java   |  58 ++++++++-
 .../vo/draw/ActPageConfigSubscribeResult.java |  18 +++
 .../vo/draw/ActPageConfigUserinfoResult.java  |  21 ++++
 .../main/resources/public/draw/qrCode.html    | 111 ++++++++++++++++++
 5 files changed, 206 insertions(+), 4 deletions(-)
 create mode 100644 sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java
 create mode 100644 sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java
 create mode 100644 sino-act-web/src/main/resources/public/draw/qrCode.html

diff --git a/pom.xml b/pom.xml
index d29292ca4..bb389d57d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,6 +238,8 @@
         <module>ruoyi-generator</module>
         <module>sino-activity</module>
         <module>ruoyi-common</module>
+        <module>sino-act-web</module>
+
     </modules>
     <packaging>pom</packaging>
 
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
index eb539034f..9620aef26 100644
--- a/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
+++ b/sino-act-web/src/main/java/com/ruoyi/web/controller/draw/DrawController.java
@@ -3,10 +3,11 @@ package com.ruoyi.web.controller.draw;
 import com.ruoyi.web.vo.Const;
 import com.ruoyi.web.vo.Result;
 import com.ruoyi.web.vo.draw.*;
-import com.sinosoft.activity.domain.ActConfig;
-import com.sinosoft.activity.domain.ActPageConfigGuide;
-import com.sinosoft.activity.domain.DrawConfig;
-import com.sinosoft.activity.domain.DrawInfo;
+import com.sinosoft.activity.domain.*;
+import com.sinosoft.activity.service.IActPageConfigUserinfoService;
+import com.sinosoft.activity.service.IDrawConfigService;
+import com.sinosoft.activity.service.IDrawInfoService;
+import com.sinosoft.activity.service.IDrawTaskNotifyService;
 import com.sinosoft.activity.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -53,6 +54,11 @@ public class DrawController {
     private IActPageConfigGuideService actPageConfigGuideService;
     @Autowired
     private IActConfigService actConfigService;
+    @Autowired
+    private IActPageConfigSubscribeService iActPageConfigSubscribeService;
+
+    @Autowired
+    private IActPageConfigUserinfoService  iActPageConfigUserinfoService;
 
     private WxOAuth2UserInfo getUserInfo(HttpServletRequest request, String code) throws Exception {
 //        if (!this.wxService.switchover(appid)) {
@@ -204,6 +210,23 @@ public class DrawController {
         return result;
     }
 
+    @RequestMapping(value="/info.action", method = RequestMethod.POST)
+    @ResponseBody
+    public ActPageConfigUserinfoResult info(HttpServletRequest request, String drawCode) {
+        ActPageConfigUserinfoResult result = new ActPageConfigUserinfoResult();
+        logger.info("活动编码"+drawCode);
+        try{
+            List<ActPageConfigUserinfo> prizes = new ArrayList<ActPageConfigUserinfo>();
+            ActPageConfigUserinfo actPageConfigUserinfo = iActPageConfigUserinfoService.selectActPageConfigUserinfoByCode(drawCode);
+            prizes.add(actPageConfigUserinfo);
+            result.setActPageConfigUserinfo(prizes);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.prizes ex: ", e);
+        }
+        return  result;
+    }
     @RequestMapping(value="/prizes.action", method = RequestMethod.POST)
     @ResponseBody
     public PrizeResult prizes(HttpServletRequest request, String drawCode, String isAll) {
@@ -383,5 +406,32 @@ public class DrawController {
         return result;
     }
 
+    /**
+     *  获取活动配置展示信息，根据活动编码
+     *
+     * @param request
+     * @param actCode
+     * @return
+     */
+    @ApiOperation("获取二维码信息")
+    @ApiImplicitParam(name = "actCode", value = "活动编码", required = true, dataType = "string", paramType = "path")
+    @RequestMapping(value="/qrCode", method = RequestMethod.POST)
+    @ResponseBody
+    public ActPageConfigSubscribeResult qrcode(HttpServletRequest request, String actCode) {
+        ActPageConfigSubscribeResult result = new  ActPageConfigSubscribeResult ();
+        try {
+            List<ActPageConfigSubscribe> list = new ArrayList<>();
+
+            ActPageConfigSubscribe subscribe = iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(actCode);
+            list.add(subscribe);
+            result.setActPageConfigSubscribe(list);
+        }catch (Exception e){
+            result.setRespCode("-1");
+            result.setRespMsg("系统异常，请稍后再试");
+            logger.error("DrawController.saveAddress ex: ", e);
+        }
+        return result;
+    }
+
 
 }
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java
new file mode 100644
index 000000000..beadd88c2
--- /dev/null
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigSubscribeResult.java
@@ -0,0 +1,18 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigSubscribe;
+
+import java.util.List;
+
+public class ActPageConfigSubscribeResult extends Result {
+    private List<ActPageConfigSubscribe> actPageConfigSubscribe;
+
+    public List<ActPageConfigSubscribe> getActPageConfigSubscribe() {
+        return actPageConfigSubscribe;
+    }
+
+    public void setActPageConfigSubscribe(List<ActPageConfigSubscribe> actPageConfigSubscribe) {
+        this.actPageConfigSubscribe = actPageConfigSubscribe;
+    }
+}
diff --git a/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java
new file mode 100644
index 000000000..2e06b5161
--- /dev/null
+++ b/sino-act-web/src/main/java/com/ruoyi/web/vo/draw/ActPageConfigUserinfoResult.java
@@ -0,0 +1,21 @@
+package com.ruoyi.web.vo.draw;
+
+import com.ruoyi.web.vo.Result;
+import com.sinosoft.activity.domain.ActPageConfigUserinfo;
+
+import java.util.List;
+
+
+public class ActPageConfigUserinfoResult extends Result
+{
+
+ private List<ActPageConfigUserinfo> actPageConfigUserinfo;
+
+    public List<ActPageConfigUserinfo> getActPageConfigUserinfo() {
+        return actPageConfigUserinfo;
+    }
+
+    public void setActPageConfigUserinfo(List<ActPageConfigUserinfo> actPageConfigUserinfo) {
+        this.actPageConfigUserinfo = actPageConfigUserinfo;
+    }
+}
diff --git a/sino-act-web/src/main/resources/public/draw/qrCode.html b/sino-act-web/src/main/resources/public/draw/qrCode.html
new file mode 100644
index 000000000..a09ceda19
--- /dev/null
+++ b/sino-act-web/src/main/resources/public/draw/qrCode.html
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+    <meta name="viewport"
+          content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
+    <meta charset="UTF-8">
+    <meta name="format-detection" content="telephone=no"/>
+    <title>活动</title>
+    <link rel="stylesheet" href="css/reset.css">
+    <link rel="stylesheet" href="css/style.css">
+    <link rel="stylesheet" type="text/css" href="css/popup.css"/>
+    <link rel="stylesheet" type="text/css" href="css/myPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/register.css"/>
+    <link rel="stylesheet" type="text/css" href="css/winPrize.css"/>
+    <link rel="stylesheet" type="text/css" href="css/goods.css"/>
+    <link rel="stylesheet" type="text/css" href="css/rule.css"/>
+    <script src="/js/config.js"></script>
+    <style type="text/css">
+        .button { /* 按钮美化 */
+            width: 200px; /* 宽度 */
+            height: 40px; /* 高度 */
+            border-width: 0px; /* 边框宽度 */
+            border-radius: 3px; /* 边框半径 */
+            background: #1E90FF; /* 背景颜色 */
+            cursor: pointer; /* 鼠标移入按钮范围时出现手势 */
+            outline: none; /* 不显示轮廓线 */
+            font-family: Microsoft YaHei; /* 设置字体 */
+            color: white; /* 字体颜色 */
+            font-size: 17px; /* 字体大小 */
+        }
+        .button:hover { /* 鼠标移入按钮范围时改变颜色 */
+            background: #5599FF;
+        }
+        p {
+            clear: both;
+            padding-bottom: 2em;
+        }
+        .drawCodeImgPic {
+            display: block;
+            margin:250px auto;
+            width: 200px;
+            height: 200px;
+        }
+
+        .drawQrCodePri {
+            text-align: center;
+            position: absolute;
+            top: 70%;
+            font-size: 25px;
+            left: 0%;
+            color: #F00;
+            width: 100%;
+        }
+    </style>
+    <link rel="stylesheet" href="css/main.css">
+    <script src="js/jquery-1.9.1.min.js"></script>
+    <script src="js/awardRotate.js"></script>
+    <script src="js/util.js"></script>
+    <script src="js/draw.js"></script>
+    <script>
+        $(document).ready(function () {
+            $.ajax({
+                type: "POST",
+                async: false,
+                url: contextRootPath + "/draw/qrCode",
+                data: {actCode: drawCode},
+                dataType: "json",
+                success: function (data) {
+                    //todo 根据风格改变css样式
+                        $(".act_guide").attr("background",data.actPageConfigSubscribe[0].bgImg);
+                        $("#qrCodeImgimg").attr("src",data.actPageConfigSubscribe[0].qrCode);
+                        $("#qrCodePri").text(data.actPageConfigSubscribe[0].description);
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    console.log('网络异常', textStatus, errorThrown);
+                }
+            });
+        });
+
+    </script>
+</head>
+
+<body  class="template_bg popupBox act_guide" style="background-color: #fbdaaf;
+                background-repeat:no-repeat;
+               background-attachment:fixed;
+               background-size:100% 100%;">
+    <div>
+               <p class="drawCodeImgPic">
+                    <img id="qrCodeImgimg" src=""  >
+                </p>
+                <h1 class="drawQrCodePri" id="qrCodePri"></h1>
+
+    </div>
+
+<script src="js/main.js"></script>
+<script src="js/scroll.js"></script>
+<script src="js/common.js"></script>
+</body>
+<script>
+    function jump(){
+        var flag = $("#flag").val;
+        //根据不同玩法跳转不同页面
+        if (flag == "0"){
+            window.location.href='turntable.html?drawCode='+drawCode;
+        }else{
+            window.location.href='scratchcard.html?drawCode='+drawCode;
+        }
+    }
+</script>
+
+</html>
\ No newline at end of file