Merge branch 'activity_xlh' of E:\intermarketing with conflicts.
This commit is contained in:
parent
936a2235f2
commit
74a44880b6
|
|
@ -8,7 +8,7 @@ spring:
|
|||
master:
|
||||
url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password:
|
||||
password: root
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ ruoyi:
|
|||
# 开发环境配置
|
||||
server:
|
||||
# 服务器的HTTP端口,默认为80
|
||||
port: 80
|
||||
port: 8088
|
||||
servlet:
|
||||
# 应用的访问路径
|
||||
context-path: /
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 8.2 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 84 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 16 KiB |
|
|
@ -203,7 +203,7 @@
|
|||
<a class="close-link">
|
||||
<i class="fa fa-times"></i>
|
||||
</a>
|
||||
</div>
|
||||
</div>复选框&
|
||||
</div>
|
||||
<div class="ibox-content">
|
||||
<form method="get" class="form-horizontal">
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
<!-- 避免IE使用兼容模式 -->
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
|
||||
|
||||
<style type="text/css">label.error { position:inherit; }</style>
|
||||
<script>
|
||||
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};
|
||||
|
|
|
|||
|
|
@ -67,16 +67,13 @@
|
|||
left: 0px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.btnSelect {
|
||||
.btnSelect{
|
||||
cursor: pointer;
|
||||
background-color: #4CAF50;
|
||||
color: white;
|
||||
padding: 15px 32px;
|
||||
color: white;padding: 15px 32px;
|
||||
display: inline-block;
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
/* 配置收集信息*/
|
||||
.drawTotalPri {
|
||||
text-align: center;
|
||||
|
|
@ -87,8 +84,7 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawDescribePri {
|
||||
.drawDescribePri{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 25%;
|
||||
|
|
@ -97,8 +93,7 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawTextPri {
|
||||
.drawTextPri{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
|
|
@ -107,8 +102,7 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawText2Pri {
|
||||
.drawText2Pri{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 55%;
|
||||
|
|
@ -117,8 +111,7 @@
|
|||
color: #F00;
|
||||
width: 80%;
|
||||
}
|
||||
|
||||
.drawText3Pri {
|
||||
.drawText3Pri{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 60%;
|
||||
|
|
@ -127,7 +120,6 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawbtnPri {
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
|
|
@ -158,7 +150,6 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawShareImgPic {
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
|
|
@ -169,7 +160,7 @@
|
|||
width: 100%;
|
||||
}
|
||||
|
||||
.drawShareImg2Pic {
|
||||
.drawShareImg2Pic{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 40%;
|
||||
|
|
@ -178,11 +169,11 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
/* 关注二维码*/
|
||||
|
||||
|
||||
.drawCodeImgPic {
|
||||
|
||||
.drawCodeImgPic{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
|
|
@ -191,8 +182,7 @@
|
|||
color: #F00;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.drawQrCodePri {
|
||||
.drawQrCodePri{
|
||||
text-align: center;
|
||||
position: absolute;
|
||||
top: 70%;
|
||||
|
|
@ -203,6 +193,7 @@
|
|||
}
|
||||
|
||||
|
||||
|
||||
</style>
|
||||
<body class="white-bg">
|
||||
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
|
||||
|
|
@ -242,8 +233,7 @@
|
|||
<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">
|
||||
<input name="drawInfo-drawname" placeholder="活动名称" class="form-control" type="text" maxlength="30">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -251,10 +241,8 @@
|
|||
<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}"></option>
|
||||
<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}" ></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -265,10 +253,8 @@
|
|||
<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}"></option>
|
||||
<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}" ></option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -277,8 +263,7 @@
|
|||
<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">
|
||||
<input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -289,8 +274,7 @@
|
|||
<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"
|
||||
placeholder="yyyy-MM-dd HH:mm:ss" type="text">
|
||||
<input name="drawInfo-starttime" 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>
|
||||
</div>
|
||||
|
|
@ -301,8 +285,7 @@
|
|||
<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"
|
||||
placeholder="yyyy-MM-dd HH:mm:ss" type="text">
|
||||
<input name="drawInfo-endtime" 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>
|
||||
</div>
|
||||
|
|
@ -316,8 +299,7 @@
|
|||
<div>
|
||||
<h4 class="form-header h4">第2步-选择UI模板</h4>
|
||||
<div th:with="type=${@dict.getType('activityTemplate')}">
|
||||
<a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||
th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
|
||||
<a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
|
||||
</div>
|
||||
<h4 class="form-header h4">字典表显示字段</h4>
|
||||
<img src="../../img/1.jpg" width="104" height="142">
|
||||
|
|
@ -362,12 +344,12 @@
|
|||
<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>
|
||||
<input type="file" id="pic" name="actPageConfigGuide-bgImg"></span>
|
||||
<a href="#" class="btn btn-white fileinput-exists"
|
||||
data-dismiss="fileinput">清除</a>
|
||||
</div>
|
||||
</div>
|
||||
<input id="picval" type="hidden" name="actPageConfigGuide-bgImg" value="">
|
||||
<input id="picval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
|
@ -375,8 +357,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"
|
||||
class="form-control"
|
||||
<input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1" class="form-control"
|
||||
type="text"
|
||||
maxlength="30" onkeyup="updatePic(this)">
|
||||
</div>
|
||||
|
|
@ -388,8 +369,7 @@
|
|||
<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"
|
||||
<input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接" class="form-control"
|
||||
type="text"
|
||||
maxlength="30">
|
||||
</div>
|
||||
|
|
@ -401,8 +381,7 @@
|
|||
<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"
|
||||
<input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePic(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -413,8 +392,7 @@
|
|||
<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"
|
||||
<input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接" class="form-control"
|
||||
type="text"
|
||||
maxlength="30">
|
||||
</div>
|
||||
|
|
@ -426,7 +404,7 @@
|
|||
<div class="rightarea">
|
||||
<h4 class="form-header h4">效果图</h4>
|
||||
<div style="position: relative;text-align:center">
|
||||
<img id="picimg" src="../../img/1.jpg" width="380" height="500">
|
||||
<img id="imgPic" src="../../img/1.jpg" width="380" height="500">
|
||||
<span class="drawNamePic" id="actTitlePic">活动标题</span>
|
||||
<span class="drawDescribePic" id="actDescPic">活动描述</span>
|
||||
<span class="drawbtnPic">
|
||||
|
|
@ -442,8 +420,7 @@
|
|||
<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 class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}"
|
||||
th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
|
||||
<a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
|
||||
</div>
|
||||
<img src="../../img/1.jpg" width="104" height="142">
|
||||
<h4 class="form-header h4">活动规则</h4>
|
||||
|
|
@ -452,8 +429,7 @@
|
|||
<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"
|
||||
<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}"></option>
|
||||
|
|
@ -465,8 +441,7 @@
|
|||
<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"
|
||||
disabled>
|
||||
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize" disabled>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -478,8 +453,7 @@
|
|||
<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"
|
||||
<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}"></option>
|
||||
|
|
@ -542,8 +516,7 @@
|
|||
<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="抽奖必中计数"
|
||||
<input name="drawRule-willdrawawardnumber" id="willdrawawardnumber" placeholder="抽奖必中计数"
|
||||
class="form-control" type="text" maxlength="30" disabled>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -555,8 +528,7 @@
|
|||
<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"
|
||||
<select name="drawRule-willdrawawardprize" class="form-control" id="willdrawawardprize"
|
||||
disabled>
|
||||
</select>
|
||||
</div>
|
||||
|
|
@ -573,8 +545,7 @@
|
|||
<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"
|
||||
<input id="title" name="actPageConfigUserinfo-title" placeholder="例如:客户姓名" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -585,8 +556,7 @@
|
|||
<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"
|
||||
<input id="describe" name="actPageConfigUserinfo-description" placeholder="例如:客户手机号" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -597,8 +567,7 @@
|
|||
<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"
|
||||
<input id="agreement" name="actPageConfigUserinfo-agreement" height="100px" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -614,23 +583,21 @@
|
|||
<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>
|
||||
<input type="file" id="picture" name="actPageConfigUserinfo-bgImg"></span>
|
||||
<a href="#" class="btn btn-white fileinput-exists"
|
||||
data-dismiss="fileinput">清除</a>
|
||||
<input id="pictureval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<input id="pictureval" type="hidden" name="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"
|
||||
<input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -641,9 +608,8 @@
|
|||
<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)">
|
||||
<input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)" >
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -654,20 +620,16 @@
|
|||
<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)">姓名</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-userName" id="name" onclick="updateText(this)">姓名</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-phone" id="phone"
|
||||
onclick="updateText(this)">手机号</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone" onclick="updateText(this)">手机号</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-gender" id="sex"
|
||||
onclick="updateText(this)">性别</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-gender" id="sex" onclick="updateText(this)">性别</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-address" id="address"
|
||||
onclick="updateText(this)">地址</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-address" id="address" onclick="updateText(this)">地址</input>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -679,20 +641,16 @@
|
|||
<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)">代理人姓名</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentName" id="agentName" onclick="updateText(this)">代理人姓名</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentMobile"
|
||||
id="agentPhone" onclick="updateText(this)">代理人手机号</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentMobile" id="agentPhone" onclick="updateText(this)">代理人手机号</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentGender"
|
||||
id="agentSex" onclick="updateText(this)">代理人性别</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentGender" id="agentSex" onclick="updateText(this)">代理人性别</input>
|
||||
</label>
|
||||
<label class="checkbox-inline">
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentNo"
|
||||
id="agentNumber" onclick="updateText(this)">代理人工号</input>
|
||||
<input type="checkbox" name="actPageConfigUserinfo-agentNo" id="agentNumber" onclick="updateText(this)">代理人工号</input>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -704,7 +662,7 @@
|
|||
<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">
|
||||
<img id="imgPri" src="../../img/shj.jpg" width="380" height="500">
|
||||
<span class="drawTotalPri" id="titlePri">标题</span>
|
||||
<span class="drawDescribePri" id="describePri">描述</span>
|
||||
<span class="drawTextPri">请填写您的基本信息</span>
|
||||
|
|
@ -757,8 +715,7 @@
|
|||
<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"
|
||||
<input id="shareConnect" name="actConfig-shareLink" placeholder="例如:http://XX" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -769,8 +726,7 @@
|
|||
<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"
|
||||
<input id="shareTitle" name="actConfig-shareTitle" placeholder="例如:2021XX客户节" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -781,8 +737,7 @@
|
|||
<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"
|
||||
<input id="shareDescribe" name="actConfig-shareDesc" placeholder="例如:参与活动,赢大奖" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -798,12 +753,13 @@
|
|||
<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>
|
||||
<input type="file" id="shareImg" name="actConfig-shareImg"></span>
|
||||
<a href="#" class="btn btn-white fileinput-exists"
|
||||
data-dismiss="fileinput">清除</a>
|
||||
<input id="shareImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
|
||||
</div>
|
||||
</div>
|
||||
<input id="shareImgval" type="hidden" name="actConfig-shareImg" value="">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -814,7 +770,7 @@
|
|||
<img id="ss" src="../../img/shj.jpg" width="254" height="142">
|
||||
</div>
|
||||
<div class="drawShareImgPic">
|
||||
<img id="shareImgimg" src="../../img/shj.jpg" width="50" height="50">
|
||||
<img id="shareImgPic" src="../../img/shj.jpg" width="50" height="50">
|
||||
</div>
|
||||
<div>
|
||||
<span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
|
||||
|
|
@ -834,8 +790,7 @@
|
|||
<div class="form-group">
|
||||
<label class="col-sm-4 control-label is-required">关注二维码描述:</label>
|
||||
<div class="col-sm-8">
|
||||
<input id="qrCode" name="actPageConfigSubscribe-qrCode"
|
||||
placeholder="例如:扫描二维码参加活动" class="form-control" type="text"
|
||||
<input id="qrCode" name="actPageConfigSubscribe-qrCode" placeholder="例如:扫描二维码参加活动" class="form-control" type="text"
|
||||
maxlength="30" onkeyup="updatePri(this)">
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -844,21 +799,21 @@
|
|||
<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;"></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>
|
||||
<input type="file" id="backdropImg" name="actPageConfigSubscribe-bgImg"></span>
|
||||
<a href="#" class="btn btn-white fileinput-exists"
|
||||
data-dismiss="fileinput">清除</a>
|
||||
<input id="backdropImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
|
||||
value="">
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
|
|
@ -869,23 +824,22 @@
|
|||
<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>
|
||||
<input type="file" id="qrCodeImg" name="actPageConfigSubscribe-bgImg2"></span>
|
||||
<a href="#" class="btn btn-white fileinput-exists"
|
||||
data-dismiss="fileinput">清除</a>
|
||||
<input id="qrCodeImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-bgImg2"
|
||||
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">
|
||||
<img id="backdropImgPri" src="../../img/shj.jpg" width="400" height="400">
|
||||
<div class="drawCodeImgPic">
|
||||
<img id="qrCodeImgimg" src="../../img/shj.jpg" width="80" height="80">
|
||||
<img id="qrCodeImgPri" src="../../img/shj.jpg" width="80" height="80">
|
||||
</div>
|
||||
|
||||
<span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
|
||||
|
|
@ -976,7 +930,7 @@
|
|||
|
||||
}
|
||||
|
||||
$("input[name='drawInfo-STARTTIME']").datetimepicker({
|
||||
$("input[name='drawInfo-starttime']").datetimepicker({
|
||||
weekStart: 1,
|
||||
todayBtn: 1,
|
||||
autoclose: 1,
|
||||
|
|
@ -987,7 +941,7 @@
|
|||
format: 'yyyy-mm-dd hh:ii:ss'
|
||||
});
|
||||
|
||||
$("input[name='drawInfo-ENDTIME']").datetimepicker({
|
||||
$("input[name='drawInfo-endtime']").datetimepicker({
|
||||
weekStart: 1,
|
||||
todayBtn: 1,
|
||||
autoclose: 1,
|
||||
|
|
@ -998,7 +952,7 @@
|
|||
format: 'yyyy-mm-dd hh:ii:ss'
|
||||
});
|
||||
|
||||
$("input[name='drawRule-DAILYSTARTTIME']").datetimepicker({
|
||||
$("input[name='drawRule-dailystarttime']").datetimepicker({
|
||||
weekStart: 1,
|
||||
todayBtn: 1,
|
||||
autoclose: 1,
|
||||
|
|
@ -1009,7 +963,7 @@
|
|||
format: 'hh:ii:ss'
|
||||
});
|
||||
|
||||
$("input[name='drawRule-DAILYENDTIME']").datetimepicker({
|
||||
$("input[name='drawRule-dailyendtime']").datetimepicker({
|
||||
weekStart: 1,
|
||||
todayBtn: 1,
|
||||
autoclose: 1,
|
||||
|
|
@ -1027,20 +981,20 @@
|
|||
.addClass('btn btn-info')
|
||||
.on('click', function () {
|
||||
//添加保存逻辑
|
||||
var data = customSerialize("form-info-add", true);
|
||||
var data = customSerialize("form-info-add",true);
|
||||
alert(data);
|
||||
$.ajax({
|
||||
url: prefix + "/add/test",
|
||||
url: prefix + "/add",
|
||||
data: data,
|
||||
type: "post",
|
||||
contentType: "application/json;charset=UTF-8",
|
||||
success: function (result) {
|
||||
success: function(result) {
|
||||
if (result.code == web_status.SUCCESS) {
|
||||
layer.msg("保存成功,正在刷新数据请稍后……", {
|
||||
icon: 1,
|
||||
time: 500,
|
||||
shade: [0.1, '#8F8F8F']
|
||||
}, function () {
|
||||
},function() {
|
||||
location.reload();
|
||||
});
|
||||
} else {
|
||||
|
|
@ -1148,14 +1102,14 @@
|
|||
<script th:inline="javascript">
|
||||
|
||||
|
||||
function updateText(val) {
|
||||
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');
|
||||
var boolean = $("#"+id).prop("checked");
|
||||
if (boolean){
|
||||
$("#" + id + "Pri").attr('type','text');
|
||||
}else{
|
||||
$("#" + id + "Pri").attr('type','hidden');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1163,45 +1117,168 @@
|
|||
function updatePic(val) {
|
||||
var id = val.id;
|
||||
var value = val.value;
|
||||
if (value == null || value == "" && id.indexOf("btn") != -1) {
|
||||
if (value == null || value == ""&& id.indexOf("btn") != -1){
|
||||
//默认值
|
||||
value = "自定义按钮" + id.charAt(id.length - 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) {
|
||||
if (value == null || value == ""&& id.indexOf("btn") != -1){
|
||||
//默认值
|
||||
value = "自定义按钮";
|
||||
}
|
||||
$("#" + id + "Pri").text(value);
|
||||
}
|
||||
//分享图片
|
||||
$("#qrCodeImg").change(function () {
|
||||
qrCodeImg(this);
|
||||
if ($(this).val() != '') {
|
||||
$("#qrCodeImgPri").attr("src", $(this).val());
|
||||
|
||||
//图片同步
|
||||
function syncPic(val){
|
||||
previewURL(val);
|
||||
}
|
||||
|
||||
function previewURL(input) {
|
||||
});
|
||||
function qrCodeImg(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);
|
||||
//$('#prevImg').attr('src', e.target.result);
|
||||
$("#qrCodeImgPri").attr("src", e.target.result);
|
||||
$("#qrCodeImgPrival").val(e.target.result);
|
||||
//$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
|
||||
}
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
}
|
||||
}
|
||||
//分享图片
|
||||
$("#backdropImg").change(function () {
|
||||
backdropImg(this);
|
||||
if ($(this).val() != '') {
|
||||
$("#backdropImgPri").attr("src", $(this).val());
|
||||
|
||||
}
|
||||
});
|
||||
function backdropImg(input) {
|
||||
if (input.files && input.files[0]) {
|
||||
var reader = new FileReader();
|
||||
|
||||
reader.onload = function (e) {
|
||||
//$('#prevImg').attr('src', e.target.result);
|
||||
$("#backdropImgPri").attr("src", e.target.result);
|
||||
$("#backdropImgPrival").val(e.target.result);
|
||||
//$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
|
||||
}
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
}
|
||||
}
|
||||
//分享图片
|
||||
$("#shareImg").change(function () {
|
||||
shareImg(this);
|
||||
if ($(this).val() != '') {
|
||||
$("#shareImgPic").attr("src", $(this).val());
|
||||
|
||||
}
|
||||
});
|
||||
function shareImg(input) {
|
||||
if (input.files && input.files[0]) {
|
||||
var reader = new FileReader();
|
||||
|
||||
reader.onload = function (e) {
|
||||
//$('#prevImg').attr('src', e.target.result);
|
||||
$("#shareImgPic").attr("src", e.target.result);
|
||||
$("#shareImgPicval").val(e.target.result);
|
||||
//$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
|
||||
}
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
}
|
||||
}
|
||||
|
||||
function activityTemplate(val) {
|
||||
$("#picture").change(function () {
|
||||
btnURL(this);
|
||||
if ($(this).val() != '') {
|
||||
// var formData = new FormData();
|
||||
// formData.append('file', $(this)[0].files[0]);
|
||||
// $.ajax({
|
||||
// url: '/path/to/upload',
|
||||
// type: 'POST',
|
||||
// data: formData,
|
||||
// async: false,
|
||||
// success: function (r) {
|
||||
// if(r.success) {
|
||||
// //success work
|
||||
// }
|
||||
// },
|
||||
// cache: false,
|
||||
// contentType: false,
|
||||
// processData: false
|
||||
// });
|
||||
$("#imgPri").attr("src", $(this).val());
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
function btnURL(input) {
|
||||
if (input.files && input.files[0]) {
|
||||
var reader = new FileReader();
|
||||
|
||||
reader.onload = function (e) {
|
||||
//$('#prevImg').attr('src', e.target.result);
|
||||
$("#imgPri").attr("src", e.target.result);
|
||||
$("#imgPrival").val(e.target.result);
|
||||
//$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
|
||||
}
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
}
|
||||
}
|
||||
|
||||
$("#pic").change(function () {
|
||||
previewURL(this);
|
||||
if ($(this).val() != '') {
|
||||
// var formData = new FormData();
|
||||
// formData.append('file', $(this)[0].files[0]);
|
||||
// $.ajax({
|
||||
// url: '/path/to/upload',
|
||||
// type: 'POST',
|
||||
// data: formData,
|
||||
// async: false,
|
||||
// success: function (r) {
|
||||
// if(r.success) {
|
||||
// //success work
|
||||
// }
|
||||
// },
|
||||
// cache: false,
|
||||
// contentType: false,
|
||||
// processData: false
|
||||
// });
|
||||
$("#imgPic").attr("src", $(this).val());
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
function previewURL(input) {
|
||||
if (input.files && input.files[0]) {
|
||||
var reader = new FileReader();
|
||||
|
||||
reader.onload = function (e) {
|
||||
//$('#prevImg').attr('src', e.target.result);
|
||||
$("#imgPic").attr("src", e.target.result);
|
||||
$("#picval").val(e.target.result);
|
||||
//$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
|
||||
}
|
||||
|
||||
reader.readAsDataURL(input.files[0]);
|
||||
}
|
||||
}
|
||||
|
||||
function activityTemplate(val){
|
||||
$(val).addClass('btn-success').siblings().removeClass('btn-success');
|
||||
//todo 添加逻辑
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue