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

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

This commit is contained in:
xu0625 2021-04-21 17:22:43 +08:00
parent 96b47d2730 d7922064e6
commit 3eab532cb1
3 changed files with 112 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
sino-activity/src/main/resources/templates/activity/info/add.html
View File

@ -47,7 +47,7 @@
top: 100px; top: 100px;
font-size: 37px; font-size: 37px;
left: 0px; left: 0px;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -57,7 +57,7 @@
top: 150px; top: 150px;
font-size: 20px; font-size: 20px;
left: 0px; left: 0px;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -66,7 +66,7 @@
position: absolute; position: absolute;
top: 70%; top: 70%;
font-size: 20px; font-size: 20px;
color: #F00; color: black;
left: 0px; left: 0px;
width: 100%; width: 100%;
} }
@ -76,7 +76,7 @@
position: absolute; position: absolute;
top: 78%; top: 78%;
font-size: 20px; font-size: 20px;
color: #F00; color: black;
left: 0px; left: 0px;
width: 100%; width: 100%;
} }
@ -97,7 +97,7 @@
top: 10%; top: 10%;
font-size: 37px; font-size: 37px;
left: 0; left: 0;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -107,7 +107,7 @@
top: 25%; top: 25%;
font-size: 20px; font-size: 20px;
left: 0; left: 0;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -117,7 +117,7 @@
top: 50%; top: 50%;
font-size: 15px; font-size: 15px;
left: 0; left: 0;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -127,7 +127,7 @@
top: 55%; top: 55%;
font-size: 10px; font-size: 10px;
left: 0; left: 0;
color: #F00; color: black;
width: 80%; width: 80%;
} }
@ -137,7 +137,7 @@
top: 60%; top: 60%;
font-size: 20px; font-size: 20px;
left: 0; left: 0;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -146,7 +146,7 @@
position: absolute; position: absolute;
top: 88%; top: 88%;
font-size: 20px; font-size: 20px;
color: #F00; color: black;
left: 0px; left: 0px;
width: 100%; width: 100%;
} }
@ -158,7 +158,7 @@
top: 20%; top: 20%;
font-size: 20px; font-size: 20px;
left: 0%; left: 0%;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -168,7 +168,7 @@
top: 50%; top: 50%;
font-size: 10px; font-size: 10px;
left: 0%; left: 0%;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -178,7 +178,7 @@
top: 50%; top: 50%;
font-size: 37px; font-size: 37px;
left: 25%; left: 25%;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -192,7 +192,7 @@
top: 50%; top: 50%;
font-size: 37px; font-size: 37px;
left: 0%; left: 0%;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -202,7 +202,7 @@
top: 70%; top: 70%;
font-size: 25px; font-size: 25px;
left: 0%; left: 0%;
color: #F00; color: black;
width: 100%; width: 100%;
} }
@ -250,8 +250,8 @@
<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 name="drawInfo-drawname" placeholder="活动名称" class="form-control" <input id="drawInfo-drawname" name="drawInfo-drawname" placeholder="活动名称" class="form-control"
type="text" maxlength="30"> type="text" maxlength="30" required>
</div> </div>
</div> </div>
</div> </div>
@ -286,7 +286,7 @@
<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 name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control" <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
type="text" maxlength="30"> type="text" maxlength="30" required>
</div> </div>
</div> </div>
</div> </div>
@ -298,7 +298,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawInfo-starttime" class="form-control" <input name="drawInfo-starttime" class="form-control"
placeholder="yyyy-MM-dd HH:mm:ss" type="text"> placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -310,7 +310,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawInfo-endtime" class="form-control" <input name="drawInfo-endtime" class="form-control"
placeholder="yyyy-MM-dd HH:mm:ss" type="text"> placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -345,7 +345,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称" <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
class="form-control" type="text" class="form-control" type="text"
maxlength="30" onkeyup="updatePic(this)"> maxlength="30" onkeyup="updatePic(this)" required>
</div> </div>
</div> </div>
</div> </div>
@ -357,28 +357,31 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述" <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
class="form-control" type="text" class="form-control" type="text"
maxlength="30" onkeyup="updatePic(this)"> maxlength="30" onkeyup="updatePic(this)" required>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6">
<div class="col-sm-6"> <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="fileinput fileinput-new" data-provides="fileinput"> <div class="fileinput fileinput-new" data-provides="fileinput">
<div class="fileinput-preview thumbnail" data-trigger="fileinput" <div class="fileinput-preview thumbnail" data-trigger="fileinput"
style="width: 200px; height: 150px;"></div> style="width: 200px; height: 150px;"></div>
<div> <div>
<span class="btn btn-white btn-file"><span <span class="btn btn-white btn-file"><span
class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span> class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
<input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span> <input type="file" id="pic" name="actPageConfigGuide-bgImg"
<a href="#" class="btn btn-white fileinput-exists" onchange="syncPic(this)" required></span>
data-dismiss="fileinput">清除</a> <a href="#" class="btn btn-white fileinput-exists"
data-dismiss="fileinput">清除</a>
</div>
</div>
</div> </div>
<input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="" >
</div> </div>
<input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="">
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -389,28 +392,15 @@
<input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与" <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
class="form-control" class="form-control"
type="text" type="text"
maxlength="30" onkeyup="updatePic(this)"> maxlength="30" onkeyup="updatePic(this)" required>
</div> </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">按钮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="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">自定义按钮2：</label> <label class="col-sm-4 control-label">自定义按钮2：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励" <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
class="form-control" type="text" class="form-control" type="text"
@ -419,18 +409,18 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row" style="height: 850"> <div class="row">
<div class="form-group" style="float: left"> <div class="col-sm-6" style="width: 70%;">
<div style="width: 60%"> <div class="form-group">
<label class="col-sm-4 control-label is-required">按钮2页面内容：</label> <label class="col-sm-4 control-label" style="width: 162.78px">按钮2页面内容：</label>
</div> <div class="col-sm-8">
<div class="col-sm-8"> <div class="summernote">
<div class="summernote">
例如：http：//xx 例如：http：//xx
</div> </div>
</div> </div>
<textarea id="btnLink2" name="actPageConfigGuide-btnLink2" maxlength="500" class="form-control" rows="5" aria-invalid="false" placeholder="" style="display: none"></textarea> <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> </div>
</div> </div>
@ -480,7 +470,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">首次中奖奖品：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize" <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}" th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"
@ -492,7 +482,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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>
@ -508,18 +497,16 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">时间段限制次数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数" <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
class="form-control" type="text" maxlength="30" disabled> class="form-control" type="text" maxlength="30" disabled>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖限制开始时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawRule-dailystarttime" id="dailystarttime" <input name="drawRule-dailystarttime" id="dailystarttime"
@ -532,7 +519,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖限制结束时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control"
@ -542,8 +529,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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>
@ -558,7 +543,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖必中计数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="drawRule-willdrawawardnumber" id="willdrawawardnumber" <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
placeholder="抽奖必中计数" placeholder="抽奖必中计数"
@ -566,11 +551,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖必中奖品：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="drawRule-willdrawawardprize" class="form-control" <select name="drawRule-willdrawawardprize" class="form-control"
id="willdrawawardprize" id="willdrawawardprize"
@ -583,12 +566,9 @@
</div> </div>
</div> </div>
</div> </div>
</div> <div class="col-sm-6">
<div class="row" style="height: 500"> <div class="form-group">
<div class="form-group" style="float: left"> <label class="col-sm-4 control-label">规则描述：</label>
<div style="width: 60%">
<label class="col-sm-4 control-label is-required">规则描述：</label>
</div>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="summernote1"> <div class="summernote1">
</div> </div>
@ -1020,6 +1000,10 @@
height:200, height:200,
lang: 'zh-CN' lang: 'zh-CN'
}); });
$('.summernote1').summernote({
height:200,
lang: 'zh-CN'
});
// 工具栏按钮 // 工具栏按钮
var btnFinish = $('<a id="btn-finish"></a>').text('完成') var btnFinish = $('<a id="btn-finish"></a>').text('完成')
.addClass('btn btn-info') .addClass('btn btn-info')
@ -1103,11 +1087,7 @@
// 该事件在离开某个步骤之前触发 // 该事件在离开某个步骤之前触发
$("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) { $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
if (stepDirection == 'forward') { if (stepDirection == 'forward') {
var form = $("#step-" + (currentStepNumber + 1)).find('.form'); return $("#step-" + (currentStepNumber + 1)).validate().form();
if (form.length > 0) {
return form.validate().form();
}
return true;
} }
return true; return true;
}); });

40
sino-activity/src/main/resources/templates/activity/info/edit.html
View File

@ -251,7 +251,7 @@
<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 name="drawInfo-drawname" placeholder="活动名称" class="form-control" <input name="drawInfo-drawname" placeholder="活动名称" class="form-control"
type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" > type="text" maxlength="30" th:value="*{drawInfo.DRAWNAME}" required>
</div> </div>
</div> </div>
</div> </div>
@ -286,7 +286,7 @@
<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 name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control" <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control"
type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}"> type="text" maxlength="30" th:value="*{drawInfo.EXPENOVALUE}" required>
</div> </div>
</div> </div>
</div> </div>
@ -298,7 +298,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <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')}" <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"> placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -310,7 +310,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <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')}" <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"> placeholder="yyyy-MM-dd HH:mm:ss" type="text" required>
<span class="input-group-addon"><i class="fa fa-calendar"></i></span> <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div> </div>
</div> </div>
@ -344,7 +344,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称" <input id="actTitle" name="actPageConfigGuide-actTitle" placeholder="活动名称"
class="form-control" type="text" class="form-control" type="text"
maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}"> maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actTitle}" required>
</div> </div>
</div> </div>
</div> </div>
@ -356,7 +356,7 @@
<div class="col-sm-8"> <div class="col-sm-8">
<input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述" <input id="actDesc" name="actPageConfigGuide-actDesc" placeholder="活动描述"
class="form-control" type="text" class="form-control" type="text"
maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}"> maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.actDesc}" required>
</div> </div>
</div> </div>
</div> </div>
@ -374,7 +374,7 @@
<div> <div>
<span class="btn btn-white btn-file"><span <span class="btn btn-white btn-file"><span
class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span> class="fileinput-new">选择图片</span><span class="fileinput-exists">更改</span>
<input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" ></span> <input type="file" id="pic" name="actPageConfigGuide-bgImg" onchange="syncPic(this)" required></span>
<a href="#" class="btn btn-white fileinput-exists" <a href="#" class="btn btn-white fileinput-exists"
data-dismiss="fileinput">清除</a> data-dismiss="fileinput">清除</a>
</div> </div>
@ -390,7 +390,7 @@
<input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与" <input id="btn1" name="actPageConfigGuide-btnText" placeholder="例如：立即参与"
class="form-control" class="form-control"
type="text" type="text"
maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}"> maxlength="30" onkeyup="updatePic(this)" th:value="*{actPageConfigGuide.btnText}" required>
</div> </div>
</div> </div>
</div> </div>
@ -411,7 +411,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">自定义按钮2：</label> <label class="col-sm-4 control-label">自定义按钮2：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励" <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="例如：查看奖励"
class="form-control" type="text" class="form-control" type="text"
@ -423,7 +423,7 @@
<div class="row" style="height: 850"> <div class="row" style="height: 850">
<div class="form-group" style="float: left"> <div class="form-group" style="float: left">
<div style="width: 60%"> <div style="width: 60%">
<label class="col-sm-4 control-label is-required">按钮2页面内容：</label> <label class="col-sm-4 control-label">按钮2页面内容：</label>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="summernote"> <div class="summernote">
@ -479,7 +479,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">首次中奖奖品：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize" <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize"
th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}"> th:with="drawPrize=${@drawPrize.findDrawPrizeInfoList()}">
@ -506,7 +506,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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 ">时间段限制次数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数" <input name="drawRule-dailynumber" id="dailynumber" placeholder="时间段限制次数"
class="form-control" type="text" maxlength="30" th:value="*{drawRule.DAILYNUMBER}"> class="form-control" type="text" maxlength="30" th:value="*{drawRule.DAILYNUMBER}">
@ -517,7 +517,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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 ">抽奖限制开始时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}" <input name="drawRule-dailystarttime" id="dailystarttime" th:value="*{drawRule.DAILYSTARTTIME}"
@ -530,7 +530,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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 ">抽奖限制结束时间：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="input-group date"> <div class="input-group date">
<input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}" <input name="drawRule-dailyendtime" id="dailyendtime" class="form-control" th:value="*{drawRule.DAILYENDTIME}"
@ -556,7 +556,7 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖必中计数：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="drawRule-willdrawawardnumber" id="willdrawawardnumber" <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber"
placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}" placeholder="抽奖必中计数" th:value="*{drawRule.WILLDRAWAWARDNUMBER}"
@ -568,7 +568,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<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">抽奖必中奖品：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="drawRule-willdrawawardprize" class="form-control" <select name="drawRule-willdrawawardprize" class="form-control"
id="willdrawawardprize" id="willdrawawardprize"
@ -584,7 +584,7 @@
<div class="row" style="height: 500"> <div class="row" style="height: 500">
<div class="form-group" style="float: left"> <div class="form-group" style="float: left">
<div style="width: 60%"> <div style="width: 60%">
<label class="col-sm-4 control-label is-required">规则描述：</label> <label class="col-sm-4 control-label">规则描述：</label>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="summernote1"> <div class="summernote1">
@ -1224,11 +1224,7 @@
// 该事件在离开某个步骤之前触发 // 该事件在离开某个步骤之前触发
$("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) { $("#smartwizard").on("leaveStep", function (e, anchorObject, currentStepNumber, nextStepNumber, stepDirection) {
if (stepDirection == 'forward') { if (stepDirection == 'forward') {
var form = $("#step-" + (currentStepNumber + 1)).find('.form'); return $("#step-" + (currentStepNumber + 1)).validate().form();
if (form.length > 0) {
return form.validate().form();
}
return true;
} }
return true; return true;
}); });

32
sino-activity/src/main/resources/templates/activity/prizeInfo/edit.html
View File

@ -3,6 +3,7 @@
<head> <head>
<th:block th:include="include :: header('修改存储奖品的基础信息')" /> <th:block th:include="include :: header('修改存储奖品的基础信息')" />
<th:block th:include="include :: datetimepicker-css" /> <th:block th:include="include :: datetimepicker-css" />
<th:block th:include="include :: jasny-bootstrap-css"/>
</head> </head>
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
@ -37,6 +38,26 @@
<input name="PRIZEVALUE" th:field="*{PRIZEVALUE}" class="form-control" type="text"> <input name="PRIZEVALUE" th:field="*{PRIZEVALUE}" class="form-control" type="text">
</div> </div>
</div> </div>
<div class="form-group">
<label class="col-sm-3 control-label">背景图片：</label>
<div class="col-sm-8">
<div class="fileinput fileinput-new" data-provides="fileinput">
<div class="fileinput-preview thumbnail" data-trigger="fileinput"
style="width: 200px; height: 150px;">
<img th:src="*{PRIZEIMG}">
</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>
</div>
<input id="picval" type="hidden" name="PRIZEIMG" value="" th:field="*{PRIZEIMG}">
</div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">备注：</label> <label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-8">
@ -84,6 +105,7 @@
</div> </div>
<th:block th:include="include :: footer" /> <th:block th:include="include :: footer" />
<th:block th:include="include :: datetimepicker-js" /> <th:block th:include="include :: datetimepicker-js" />
<th:block th:include="include :: jasny-bootstrap-js"/>
<script th:inline="javascript"> <script th:inline="javascript">
var prefix = ctx + "activity/prize"; var prefix = ctx + "activity/prize";
$("#form-info-edit").validate({ $("#form-info-edit").validate({
@ -107,6 +129,16 @@
minView: "month", minView: "month",
autoclose: true autoclose: true
}); });
function syncPic(val){
//传递值
var id = val.id;
var reader = new FileReader();
reader.onload = function (e) {
$("#"+id+"val").val(e.target.result);
}
reader.readAsDataURL(val.files[0]);
}
</script> </script>
</body> </body>
</html> </html>