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

Merge branch 'activity_xlh' of E:\intermarketing with conflicts.

This commit is contained in:
xu0625 2021-04-08 17:51:59 +08:00
parent 936a2235f2
commit 74a44880b6
9 changed files with 530 additions and 452 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -8,7 +8,7 @@ spring:
master: master:
url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://localhost:3306/intermarketing?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root username: root
password: password: root
# 从库数据源 # 从库数据源
slave: slave:
# 从数据源开关/默认关闭 # 从数据源开关/默认关闭

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -16,7 +16,7 @@ ruoyi:
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为80 # 服务器的HTTP端口，默认为80
port: 80 port: 8088
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: / context-path: /

BIN
ruoyi-admin/src/main/resources/static/img/hei.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
ruoyi-admin/src/main/resources/static/img/shj.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
ruoyi-admin/src/main/resources/static/img/yun.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

2
ruoyi-admin/src/main/resources/templates/demo/form/basic.html
View File

@ -203,7 +203,7 @@
<a class="close-link"> <a class="close-link">
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
</a> </a>
</div> </div>复选框&
</div> </div>
<div class="ibox-content"> <div class="ibox-content">
<form method="get" class="form-horizontal"> <form method="get" class="form-horizontal">

1
ruoyi-admin/src/main/resources/templates/login.html
View File

@ -15,6 +15,7 @@
<!-- 避免IE使用兼容模式 --> <!-- 避免IE使用兼容模式 -->
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/> <link rel="shortcut icon" href="../static/favicon.ico" th:href="@{favicon.ico}"/>
<style type="text/css">label.error { position:inherit; }</style> <style type="text/css">label.error { position:inherit; }</style>
<script> <script>
if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location}; if(window.top!==window.self){alert('未登录或登录超时。请重新登录');window.top.location=window.location};

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

@ -67,16 +67,13 @@
left: 0px; left: 0px;
width: 100%; width: 100%;
} }
.btnSelect{ .btnSelect{
cursor: pointer; cursor: pointer;
background-color: #4CAF50; background-color: #4CAF50;
color: white; color: white;padding: 15px 32px;
padding: 15px 32px;
display: inline-block; display: inline-block;
font-size: 15px; font-size: 15px;
} }
/* 配置收集信息*/ /* 配置收集信息*/
.drawTotalPri { .drawTotalPri {
text-align: center; text-align: center;
@ -87,7 +84,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawDescribePri{ .drawDescribePri{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -97,7 +93,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawTextPri{ .drawTextPri{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -107,7 +102,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawText2Pri{ .drawText2Pri{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -117,7 +111,6 @@
color: #F00; color: #F00;
width: 80%; width: 80%;
} }
.drawText3Pri{ .drawText3Pri{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -127,7 +120,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawbtnPri { .drawbtnPri {
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -158,7 +150,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawShareImgPic { .drawShareImgPic {
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -178,10 +169,10 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
/* 关注二维码*/ /* 关注二维码*/
.drawCodeImgPic{ .drawCodeImgPic{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -191,7 +182,6 @@
color: #F00; color: #F00;
width: 100%; width: 100%;
} }
.drawQrCodePri{ .drawQrCodePri{
text-align: center; text-align: center;
position: absolute; position: absolute;
@ -203,6 +193,7 @@
} }
</style> </style>
<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">
@ -242,8 +233,7 @@
<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 name="drawInfo-drawname" placeholder="活动名称" class="form-control" type="text" maxlength="30">
type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -251,10 +241,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">
<select name="drawInfo-status" class="form-control" <select name="drawInfo-status" class="form-control" th:with="type=${@dict.getType('start_stop')}">
th:with="type=${@dict.getType('start_stop')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -265,10 +253,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">
<select name="drawInfo-expeno" class="form-control" <select name="drawInfo-expeno" class="form-control" th:with="type=${@dict.getType('expeType')}">
th:with="type=${@dict.getType('expeType')}"> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
<option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option>
</select> </select>
</div> </div>
</div> </div>
@ -277,8 +263,7 @@
<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-expenovalue" placeholder="消耗价值" class="form-control" <input name="drawInfo-expenovalue" placeholder="消耗价值" class="form-control" type="text" maxlength="30">
type="text" maxlength="30">
</div> </div>
</div> </div>
</div> </div>
@ -289,8 +274,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">
<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">
<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>
@ -301,8 +285,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">
<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">
<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>
@ -316,8 +299,7 @@
<div> <div>
<h4 class="form-header h4">第2步-选择UI模板</h4> <h4 class="form-header h4">第2步-选择UI模板</h4>
<div th:with="type=${@dict.getType('activityTemplate')}"> <div th:with="type=${@dict.getType('activityTemplate')}">
<a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" <a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
</div> </div>
<h4 class="form-header h4">字典表显示字段</h4> <h4 class="form-header h4">字典表显示字段</h4>
<img src="../../img/1.jpg" width="104" height="142"> <img src="../../img/1.jpg" width="104" height="142">
@ -362,7 +344,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"></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>
@ -375,8 +357,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">自定义按钮1：</label> <label class="col-sm-4 control-label is-required">自定义按钮1：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1" <input id="btn1" name="actPageConfigGuide-btnText" placeholder="自定义按钮1" class="form-control"
class="form-control"
type="text" type="text"
maxlength="30" onkeyup="updatePic(this)"> maxlength="30" onkeyup="updatePic(this)">
</div> </div>
@ -388,8 +369,7 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-4 control-label is-required">按钮1跳转链接：</label> <label class="col-sm-4 control-label is-required">按钮1跳转链接：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接" <input name="actPageConfigGuide-btnLink" placeholder="按钮1跳转链接" class="form-control"
class="form-control"
type="text" type="text"
maxlength="30"> maxlength="30">
</div> </div>
@ -401,8 +381,7 @@
<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 is-required">自定义按钮2：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2" <input id="btn2" name="actPageConfigGuide-btnText2" placeholder="自定义按钮2" class="form-control" type="text"
class="form-control" type="text"
maxlength="30" onkeyup="updatePic(this)"> maxlength="30" onkeyup="updatePic(this)">
</div> </div>
</div> </div>
@ -413,8 +392,7 @@
<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 is-required">按钮2跳转链接：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接" <input name="actPageConfigGuide-btnLink2" placeholder="按钮2跳转链接" class="form-control"
class="form-control"
type="text" type="text"
maxlength="30"> maxlength="30">
</div> </div>
@ -426,7 +404,7 @@
<div class="rightarea"> <div class="rightarea">
<h4 class="form-header h4">效果图</h4> <h4 class="form-header h4">效果图</h4>
<div style="position: relative;text-align:center"> <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="drawNamePic" id="actTitlePic">活动标题</span>
<span class="drawDescribePic" id="actDescPic">活动描述</span> <span class="drawDescribePic" id="actDescPic">活动描述</span>
<span class="drawbtnPic"> <span class="drawbtnPic">
@ -442,8 +420,7 @@
<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">
<h4 class="form-header h4">第4步-选择玩法</h4> <h4 class="form-header h4">第4步-选择玩法</h4>
<div th:with="type=${@dict.getType('activityPlay')}"> <div th:with="type=${@dict.getType('activityPlay')}">
<a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" <a class="btn btn-rounded" href="#" th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
th:value="${dict.dictValue}" onclick="activityTemplate(this)"></a>
</div> </div>
<img src="../../img/1.jpg" width="104" height="142"> <img src="../../img/1.jpg" width="104" height="142">
<h4 class="form-header h4">活动规则</h4> <h4 class="form-header h4">活动规则</h4>
@ -452,8 +429,7 @@
<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">
<select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()" <select name="drawRule-firstflag" id="FIRSTFLAG" onchange="firstflag()" class="form-control"
class="form-control"
th:with="type=${@dict.getType('is_boolean')}"> th:with="type=${@dict.getType('is_boolean')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option> th:value="${dict.dictValue}"></option>
@ -465,8 +441,7 @@
<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">
<select name="drawRule-firstawardprize" class="form-control" id="firstawardprize" <select name="drawRule-firstawardprize" class="form-control" id="firstawardprize" disabled>
disabled>
</select> </select>
</div> </div>
</div> </div>
@ -478,8 +453,7 @@
<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">
<select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()" <select name="drawRule-dailyflag" id="DAILYFLAG" onchange="dailyflag()" class="form-control"
class="form-control"
th:with="type=${@dict.getType('is_boolean')}"> th:with="type=${@dict.getType('is_boolean')}">
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
th:value="${dict.dictValue}"></option> th:value="${dict.dictValue}"></option>
@ -542,8 +516,7 @@
<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="drawRule-willdrawawardnumber" id="willdrawawardnumber" <input name="drawRule-willdrawawardnumber" id="willdrawawardnumber" placeholder="抽奖必中计数"
placeholder="抽奖必中计数"
class="form-control" type="text" maxlength="30" disabled> class="form-control" type="text" maxlength="30" disabled>
</div> </div>
</div> </div>
@ -555,8 +528,7 @@
<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">
<select name="drawRule-willdrawawardprize" class="form-control" <select name="drawRule-willdrawawardprize" class="form-control" id="willdrawawardprize"
id="willdrawawardprize"
disabled> disabled>
</select> </select>
</div> </div>
@ -573,8 +545,7 @@
<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="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名" <input id="title" name="actPageConfigUserinfo-title" placeholder="例如：客户姓名" class="form-control" type="text"
class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -585,8 +556,7 @@
<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="describe" name="actPageConfigUserinfo-description" <input id="describe" name="actPageConfigUserinfo-description" placeholder="例如：客户手机号" class="form-control" type="text"
placeholder="例如：客户手机号" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -597,8 +567,7 @@
<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" <input id="agreement" name="actPageConfigUserinfo-agreement" height="100px" class="form-control" type="text"
class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -614,23 +583,21 @@
<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="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" <a href="#" class="btn btn-white fileinput-exists"
data-dismiss="fileinput">清除</a> data-dismiss="fileinput">清除</a>
<input id="pictureval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
</div>
</div>
</div> </div>
</div> </div>
<input id="pictureval" type="hidden" name="actPageConfigUserinfo-bgImg"
value="">
</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">自定义按钮：</label> <label class="col-sm-4 control-label is-required">自定义按钮：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮" <input id="btn" name="actPageConfigUserinfo-btnText" placeholder="自定义按钮" class="form-control" type="text"
class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -641,8 +608,7 @@
<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="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接" <input name="actPageConfigUserinfo-btnLink" placeholder="按钮跳转链接" class="form-control" type="text"
class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)" > maxlength="30" onkeyup="updatePri(this)" >
</div> </div>
</div> </div>
@ -654,20 +620,16 @@
<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">
<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)">姓名</input>
</label> </label>
<label class="checkbox-inline"> <label class="checkbox-inline">
<input type="checkbox" name="actPageConfigUserinfo-phone" id="phone" <input type="checkbox" name="actPageConfigUserinfo-mobile" id="phone" onclick="updateText(this)">手机号</input>
onclick="updateText(this)">手机号</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)">性别</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)">地址</input>
</label> </label>
</div> </div>
</div> </div>
@ -679,20 +641,16 @@
<label class="col-sm-4 control-label ">代理人信息：</label> <label class="col-sm-4 control-label ">代理人信息：</label>
<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)">代理人姓名</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)">代理人手机号</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)">代理人性别</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)">代理人工号</input>
</label> </label>
</div> </div>
</div> </div>
@ -704,7 +662,7 @@
<div class="rightarea"> <div class="rightarea">
<h4 class="form-header h4">效果图</h4> <h4 class="form-header h4">效果图</h4>
<div style="position: relative;text-align:center"> <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="drawTotalPri" id="titlePri">标题</span>
<span class="drawDescribePri" id="describePri">描述</span> <span class="drawDescribePri" id="describePri">描述</span>
<span class="drawTextPri">请填写您的基本信息</span> <span class="drawTextPri">请填写您的基本信息</span>
@ -757,8 +715,7 @@
<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="shareConnect" name="actConfig-shareLink" <input id="shareConnect" name="actConfig-shareLink" placeholder="例如：http://XX" class="form-control" type="text"
placeholder="例如：http://XX" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -769,8 +726,7 @@
<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="shareTitle" name="actConfig-shareTitle" <input id="shareTitle" name="actConfig-shareTitle" placeholder="例如：2021XX客户节" class="form-control" type="text"
placeholder="例如：2021XX客户节" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -781,8 +737,7 @@
<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" <input id="shareDescribe" name="actConfig-shareDesc" placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
placeholder="例如：参与活动，赢大奖" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -798,12 +753,13 @@
<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="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" <a href="#" class="btn btn-white fileinput-exists"
data-dismiss="fileinput">清除</a> data-dismiss="fileinput">清除</a>
<input id="shareImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
</div> </div>
</div> </div>
<input id="shareImgval" type="hidden" name="actConfig-shareImg" value="">
</div> </div>
</div> </div>
</div> </div>
@ -814,7 +770,7 @@
<img id="ss" src="../../img/shj.jpg" width="254" height="142"> <img id="ss" src="../../img/shj.jpg" width="254" height="142">
</div> </div>
<div class="drawShareImgPic"> <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>
<div> <div>
<span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span> <span class="drawShareTitlePri" id="shareTitlePri">中国人寿举办活动</span>
@ -834,8 +790,7 @@
<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="qrCode" name="actPageConfigSubscribe-qrCode" <input id="qrCode" name="actPageConfigSubscribe-qrCode" placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
placeholder="例如：扫描二维码参加活动" class="form-control" type="text"
maxlength="30" onkeyup="updatePri(this)"> maxlength="30" onkeyup="updatePri(this)">
</div> </div>
</div> </div>
@ -844,21 +799,21 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<label class="col-sm-4 control-label is-required">背景图片：</label> <label class="col-sm-4 control-label is-required">背景图片：</label>
<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="backdropImg" <input type="file" id="backdropImg" name="actPageConfigSubscribe-bgImg"></span>
name="actPageConfigSubscribe-bgImg" onchange="syncPic(this)"></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>
<input id="backdropImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
</div> </div>
</div> </div>
</div> </div>
<input id="backdropImgval" type="hidden" name="actPageConfigSubscribe-bgImg"
value="">
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
@ -869,23 +824,22 @@
<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="qrCodeImg" <input type="file" id="qrCodeImg" name="actPageConfigSubscribe-bgImg2"></span>
name="actPageConfigSubscribe-bgImg2" onchange="syncPic(this)"></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>
<input id="qrCodeImgval" type="hidden" name = "actPageConfigGuide-bgImg" value="">
</div> </div>
</div> </div>
</div> </div>
<input id="qrCodeImgval" type="hidden" name="actPageConfigSubscribe-bgImg2"
value="">
</div> </div>
</div> </div>
<div class="rightarea"> <div class="rightarea">
<h4 class="form-header h4">效果图</h4> <h4 class="form-header h4">效果图</h4>
<div style="position: relative;text-align:center"> <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"> <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> </div>
<span class="drawQrCodePri" id="qrCodePri">关注二维码</span> <span class="drawQrCodePri" id="qrCodePri">关注二维码</span>
@ -976,7 +930,7 @@
} }
$("input[name='drawInfo-STARTTIME']").datetimepicker({ $("input[name='drawInfo-starttime']").datetimepicker({
weekStart: 1, weekStart: 1,
todayBtn: 1, todayBtn: 1,
autoclose: 1, autoclose: 1,
@ -987,7 +941,7 @@
format: 'yyyy-mm-dd hh:ii:ss' format: 'yyyy-mm-dd hh:ii:ss'
}); });
$("input[name='drawInfo-ENDTIME']").datetimepicker({ $("input[name='drawInfo-endtime']").datetimepicker({
weekStart: 1, weekStart: 1,
todayBtn: 1, todayBtn: 1,
autoclose: 1, autoclose: 1,
@ -998,7 +952,7 @@
format: 'yyyy-mm-dd hh:ii:ss' format: 'yyyy-mm-dd hh:ii:ss'
}); });
$("input[name='drawRule-DAILYSTARTTIME']").datetimepicker({ $("input[name='drawRule-dailystarttime']").datetimepicker({
weekStart: 1, weekStart: 1,
todayBtn: 1, todayBtn: 1,
autoclose: 1, autoclose: 1,
@ -1009,7 +963,7 @@
format: 'hh:ii:ss' format: 'hh:ii:ss'
}); });
$("input[name='drawRule-DAILYENDTIME']").datetimepicker({ $("input[name='drawRule-dailyendtime']").datetimepicker({
weekStart: 1, weekStart: 1,
todayBtn: 1, todayBtn: 1,
autoclose: 1, autoclose: 1,
@ -1030,7 +984,7 @@
var data = customSerialize("form-info-add",true); var data = customSerialize("form-info-add",true);
alert(data); alert(data);
$.ajax({ $.ajax({
url: prefix + "/add/test", url: prefix + "/add",
data: data, data: data,
type: "post", type: "post",
contentType: "application/json;charset=UTF-8", contentType: "application/json;charset=UTF-8",
@ -1170,7 +1124,6 @@
$("#" + id + "Pic").text(value); $("#" + id + "Pic").text(value);
} }
function updatePri(val) { function updatePri(val) {
var id = val.id; var id = val.id;
var value = val.value; var value = val.value;
@ -1180,21 +1133,145 @@
} }
$("#" + id + "Pri").text(value); $("#" + id + "Pri").text(value);
} }
//分享图片
$("#qrCodeImg").change(function () {
qrCodeImg(this);
if ($(this).val() != '') {
$("#qrCodeImgPri").attr("src", $(this).val());
//图片同步
function syncPic(val){
previewURL(val);
} }
});
function qrCodeImg(input) {
if (input.files && input.files[0]) {
var reader = new FileReader();
reader.onload = function (e) {
//$('#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]);
}
}
$("#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) { function previewURL(input) {
if (input.files && input.files[0]) { if (input.files && input.files[0]) {
var reader = new FileReader(); var reader = new FileReader();
var id = input.id;
reader.onload = function (e) { reader.onload = function (e) {
//效果图 //$('#prevImg').attr('src', e.target.result);
$("#"+id+"img").attr("src", e.target.result); $("#imgPic").attr("src", e.target.result);
//传递值 $("#picval").val(e.target.result);
$("#"+id+"val").val(e.target.result); //$('#preview').css("background", "url(" + e.target.result +")" + " right top no-repeat");
} }
reader.readAsDataURL(input.files[0]); reader.readAsDataURL(input.files[0]);