ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/activity' into activity

This commit is contained in:
dy 2021-04-13 10:18:57 +08:00
parent f6a0ced77a 85e769e4b9
commit 5c2dcaf28c
3 changed files with 70 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java
View File

@ -178,7 +178,7 @@ public class DrawInfoController extends BaseController
ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE()); ActPageConfigSubscribe actPageConfigSubscribe= iActPageConfigSubscribeService.selectActPageConfigSubscribeByCode(drawInfo.getDRAWCODE());
vo.setActPageConfigSubscribe(actPageConfigSubscribe); vo.setActPageConfigSubscribe(actPageConfigSubscribe);
mmap.put("vo",vo); mmap.put("vo",vo);
return prefix + "/edit"; return prefix + "/edit1";
} }
/** /**
@ -188,7 +188,7 @@ public class DrawInfoController extends BaseController
@Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE) @Log(title = "抽奖活动管理", businessType = BusinessType.UPDATE)
@PostMapping("/edit") @PostMapping("/edit")
@ResponseBody @ResponseBody
public AjaxResult editSave(ActVO vo) public AjaxResult editSave(@RequestBody ActVO vo)
{ {
try{ try{
logger.info("前台传参"+ JSON.toJSONString(vo)); logger.info("前台传参"+ JSON.toJSONString(vo));

16
sino-activity/src/main/resources/mapper/activity/ActPageConfigUserinfoMapper.xml
View File

@ -110,14 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="btnText != null">btn_text = #{btnText},</if> <if test="btnText != null">btn_text = #{btnText},</if>
<if test="btnLink != null">btn_link = #{btnLink},</if> <if test="btnLink != null">btn_link = #{btnLink},</if>
<if test="agreement != null">agreement = #{agreement},</if> <if test="agreement != null">agreement = #{agreement},</if>
<if test="userName != null">user_name = #{userName},</if> user_name = #{userName},
<if test="mobile != null">mobile = #{mobile},</if> mobile = #{mobile},
<if test="gender != null">gender = #{gender},</if> gender = #{gender},
<if test="address != null">address = #{address},</if> address = #{address},
<if test="agentName != null">agent_name = #{agentName},</if> agent_name = #{agentName},
<if test="agentMobile != null">agent_mobile = #{agentMobile},</if> agent_mobile = #{agentMobile},
<if test="agentGender != null">agent_gender = #{agentGender},</if> agent_gender = #{agentGender},
<if test="agentNo != null">agent_no = #{agentNo},</if> agent_no = #{agentNo},
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateTime != null">update_time = #{updateTime},</if> <if test="updateTime != null">update_time = #{updateTime},</if>
</trim> </trim>

92
sino-activity/src/main/resources/templates/activity/info/edit1.html
View File

@ -15,8 +15,8 @@
.leftarea { .leftarea {
float: left; float: left;
width: 50%; width: 60%;
height: 300px; height: 500px;
} }
.sw > .tab-content { .sw > .tab-content {
@ -140,21 +140,19 @@
/* 配置分享信息*/ /* 配置分享信息*/
.drawShareTitlePri { .drawShareTitlePri {
text-align: center;
position: absolute; position: absolute;
top: 40%; top: 45%;
font-size: 20px; font-size: 20px;
left: 28%; left: 73%;
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawShareDescribePri { .drawShareDescribePri {
text-align: center;
position: absolute; position: absolute;
top: 50%; top: 50%;
font-size: 10px; font-size: 10px;
left: 25%; left: 73%;
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
@ -162,9 +160,9 @@
.drawShareImgPic { .drawShareImgPic {
text-align: center; text-align: center;
position: absolute; position: absolute;
top: 50%; top: 52%;
font-size: 37px; font-size: 37px;
left: 35%; left: 38%;
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
@ -579,7 +577,7 @@
</div> </div>
</div> </div>
<div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5"> <div id="step-5" class="tab-pane" role="tabpanel" aria-labelledby="step-5">
<div style="height: 610px"> <div style="height: 810px">
<div class="leftarea"> <div class="leftarea">
<h4 class="form-header h4">第五步-配置收集信息</h4> <h4 class="form-header h4">第五步-配置收集信息</h4>
<div class="row"> <div class="row">
@ -611,9 +609,10 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">协议内容：</label> <label class="col-sm-4 control-label is-required">协议内容：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="agreement" name="actPageConfigUserinfo-agreement" height="100px" <textarea id="agreement" name="actPageConfigUserinfo-agreement" cols="40" rows="6" onkeyup="updatePri(this)">
class="form-control" type="text" th:value="*{actPageConfigUserinfo.agreement}" [[*{actPageConfigUserinfo.agreement}]]
maxlength="30" onkeyup="updatePri(this)"> </textarea>
<input type="hidden" >
</div> </div>
</div> </div>
</div> </div>
@ -671,19 +670,19 @@
<div class="col-sm-8"> <div class="col-sm-8">
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-userName" id="name" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-gender" id="sex" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-address" id="address" <input type="checkbox" name="actPageConfigUserinfo-address" id="address"
onclick="updateText(this)">地址</input> onclick="updateText(this)" th:checked="*{actPageConfigUserinfo.address == 'on' ? true : false}">地址</input>
</label> </label>
</div> </div>
</div> </div>
@ -696,19 +695,19 @@
<div class="col-sm-8"> <div class="col-sm-8">
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-agentName" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-agentMobile" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-agentGender" <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>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-agentNo" <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> </label>
</div> </div>
</div> </div>
@ -799,10 +798,9 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">分享描述：</label> <label class="col-sm-4 control-label is-required">分享描述：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="shareDescribe" name="actConfig-shareDesc" <textarea id="shareDescribe" name="actConfig-shareDesc" cols="40" rows="6" onkeyup="updatePri(this)">
placeholder="例如：参与活动，赢大奖" class="form-control" type="text" [[*{actConfig.shareDesc}]]
th:value="*{actConfig.shareDesc}" </textarea>
maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
</div> </div>
@ -832,7 +830,7 @@
<h4 class="form-header h4">效果图</h4> <h4 class="form-header h4">效果图</h4>
<div style="height: 210px"> <div style="height: 210px">
<div class="drawShareImg2Pic"> <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>
<div class="drawShareImgPic"> <div class="drawShareImgPic">
<img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50"> <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() { 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) { function activityTemplate(val) {
var path = "../../../img/act/"; var path = "../../img/act/";
$(val).addClass('btn-success').siblings().removeClass('btn-success'); $(val).addClass('btn-success').siblings().removeClass('btn-success');
var id = val.id; var id = val.id;
var valus = $("#"+id+".btn-success").attr("value"); var valus = $("#"+id+".btn-success").attr("value");