记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit d7966355 authored by liuran's avatar liuran
Browse files
Options

修改优先购 代金券 满减券 折扣券

parent 1abbb26a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 427 additions and 128 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ d7966355
......@@ -137,6 +137,19 @@
#iptModal {
display: none;
}
.ticketTimeCheckBox_inner {
display: none;
margin-left: 10px;
}
#ticketTimeCheckBox {
position: relative;
top: 10px;
width: 14px;
border: 1px solid #e5e6e7;
}
.phoneNumber {
display: none;
}
</style>
</head>
<body>
......@@ -162,7 +175,9 @@
<div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
<input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="3" class="typeTwo" name="typeTwo"><span>发送需领取</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
<input type="radio" value="4" class="typeTwo" name="typeTwo"><span>会员专属</span>
</div>
</div>
......@@ -179,6 +194,20 @@
<option value="">所有</option>
</select>
</div>
<div class="sendType">
<div style="display: flex;align-items: center;">
<span class="labelName">发送类型：</span>
<div class="layui-input-block" style="display: flex">
<input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div>
</div>
</div>
<div class="phoneNumber">
<span style="display:inline-block;margin-bottom: 12px;"><i class="required">*</i>请输入手机号<span style="color: #ccc">（手机号可填多个，使用"，"隔开）</span>：</span>
<textarea id="phoneNum" class="form-control" rows="4" style="margin-left: 100px"></textarea>
</div>
<div class="changeData">
<div id="modalOne">
<div id="dataOne1" class="dataOne">
......@@ -188,8 +217,8 @@
</div>
<div class="dataOne">
<span class="labelName"><i class="required">*</i>券的有效期：</span>
<input type="text" id="ticketTime" required />
天
<span class="ticketTime_inner"><input type="text" id="ticketTime" />天</span>
<span class="ticketTimeCheckBox_inner"><input type="checkbox" id="ticketTimeCheckBox" />会员有效期</span>
<p class="prompt">*兑换后的有效时间</p>
</div>
<div class="dataOne" id="exchange">
......@@ -200,20 +229,7 @@
</div>
</div>
</div>
<div class="sendType">
<div style="display: flex;align-items: center;">
<span class="labelName">发送类型：</span>
<div class="layui-input-block" style="display: flex">
<input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div>
</div>
</div>
<div class="phoneNumber">
<span style="display:inline-block;margin-bottom: 12px;"><i class="required">*</i>请输入手机号<span style="color: #ccc">（手机号可填多个，使用"，"隔开）</span>：</span>
<textarea id="phoneNum" class="form-control" rows="4" style="margin-left: 100px"></textarea>
</div>
<div class="main_bottom">
<div class="describe">
<span class="labelName">
......@@ -420,17 +436,24 @@
});
$("input[name=typeTwo]").change(function(e){
typeTwo = e.target.value;
if (typeTwo == 1) {
$("input[name=sendType]").attr('checked', false);
$("#ticketTimeCheckBox").attr('checked', false);
$('.ticketTimeCheckBox_inner').hide();
$('.ticketTimeCheckBox_inner').hide();
$('.ticketTime_inner').show();
$('.phoneNumber').hide();
if (typeTwo == 1) { // 发送至“我的券”
$('#unit').text('张/账户')
$('#iptModal').show();
$('.sendType').show();
$('#exchangeTime').val('')
$('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) {
$('.phoneNumber').show();
}
} else if (typeTwo == 2) {
// $('.ticketTimeCheckBox_inner').hide();
// if (sendType == 2) {
// $('.phoneNumber').show();
// }
} else if (typeTwo == 2) { // 积分兑换
$('#unit').text('张')
$('#iptModal').hide();
$('.sendType').hide();
......@@ -440,6 +463,32 @@
$('.test1').hide();
$('#exchange').hide();
$('#dataOne1').hide();
$('.ticketTimeCheckBox_inner').hide();
} else if (typeTwo == 3) { // 发送需领取
$('#unit').text('张/账户');
$('#dataOne1').show();
$('#iptModal').show();
$('#exchange').hide();
$('.sendType').show();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').hide();
if (this.sendTypeNum == 1) {
$('.ticketTimeCheckBox_inner').show();
}
} else if (typeTwo == 4) { // 会员专属
$('#unit').hide();
$('#dataOne1').hide();
$('#iptModal').hide();
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').show();
} else {
$('#unit').text('张')
$('#dataOne1').show();
......@@ -450,17 +499,25 @@
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').hide();
}
});
$("input[name=sendType]").change(function(e){
sendType = e.target.value;
if (e.target.value == 2) {
this.sendTypeNum = sendType;
$('.phoneNumber').hide();
if (sendType == 2) {
$('.phoneNumber').show();
$('.test1').show();
} else if (sendType == 1) {
$('.ticketTimeCheckBox_inner').show();
$('.phoneNumber').hide();
$('.test1').hide();
} else {
$('.phoneNumber').hide();
$('.test1').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').hide();
}
});
$("input[name=sex]").change(function(e){
......@@ -475,6 +532,16 @@
$("input[name=playMethod]").change(function(e){
playMethod = e.target.value;
});
$("#ticketTimeCheckBox").change(function(e){
// console.log()
this.memberCoupenType = e.target.checked;
if (e.target.checked) {
$('.ticketTime_inner').hide();
} else {
$('.ticketTime_inner').show();
}
// playMethod = e.target.value;
});
layui.use('laydate', function(){
var laydate = layui.laydate;
//执行一个laydate实例
......@@ -485,7 +552,8 @@
});
function create() {
if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
if (typeTwo == 0) {
if (!$('#exchangeTime').val()) {
......@@ -549,9 +617,10 @@
"redeemValidity": Number($('#exchangeTime').val()), // 兑换有效期
"title": $('#title').val(),
"valFace": $('#valFace').val(), // 金额
"validity": Number($('#ticketTime').val()),
"exclusively": this.memberCoupenType ? 1 : 0,
"validity": this.memberCoupenType ? 0 : Number($('#ticketTime').val()),
}
if (typeTwo == 1) {
if (typeTwo == 1 || typeTwo == 3) {
delete data.redeemValidity
} else {
delete data.eventType
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @ d7966355
......@@ -140,6 +140,19 @@
#valOver, #valMinus {
margin: 0 12px;
}
.ticketTimeCheckBox_inner {
display: none;
margin-left: 10px;
}
#ticketTimeCheckBox {
position: relative;
top: 10px;
width: 14px;
border: 1px solid #e5e6e7;
}
.phoneNumber {
display: none;
}
</style>
</head>
<body>
......@@ -165,9 +178,10 @@
<div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span>
<input type="radio" value="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="3" class="typeTwo" name="typeTwo"><span>发送需领取</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
<input type="radio" value="4" class="typeTwo" name="typeTwo"><span>会员专属</span>
</div>
</div>
<div class="scope_application" id="scope_application">
<span class="labelName">适用范围：</span>
......@@ -182,6 +196,20 @@
<option value="">所有</option>
</select>
</div>
<div class="sendType">
<div style="display: flex;align-items: center;">
<span class="labelName">发送类型：</span>
<div class="layui-input-block" style="display: flex">
<input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div>
</div>
</div>
<div class="phoneNumber">
<span style="display:inline-block;margin-bottom: 12px;"><i class="required">*</i>请输入手机号<span style="color: #ccc">（手机号可填多个，使用"，"隔开）</span>：</span>
<textarea id="phoneNum" class="form-control" rows="4" style="margin-left: 100px"></textarea>
</div>
<div class="changeData">
<div id="modalOne">
<div id="dataOne1" class="dataOne">
......@@ -191,9 +219,9 @@
</div>
<div class="dataOne">
<span class="labelName"><i class="required">*</i>券的有效期：</span>
<input type="text" id="ticketTime" required />
天
<p class="prompt">*可兑换的时间</p>
<span class="ticketTime_inner"><input type="text" id="ticketTime" />天</span>
<span class="ticketTimeCheckBox_inner"><input type="checkbox" id="ticketTimeCheckBox" />会员有效期</span>
<p class="prompt">*兑换后的有效时间</p>
</div>
<div class="dataOne" id="exchange">
<span class="labelName"><i class="required">*</i>兑换有效期：</span>
......@@ -203,20 +231,7 @@
</div>
</div>
</div>
<div class="sendType">
<div style="display: flex;align-items: center;">
<span class="labelName">发送类型：</span>
<div class="layui-input-block" style="display: flex">
<input type="radio" value="10" class="sendType" name="sendType" checked><span>全体用户</span>
<input type="radio" value="1" class="sendType" name="sendType"><span>会员</span>
<input type="radio" value="2" class="sendType" name="sendType"><span>手机号</span>
</div>
</div>
</div>
<div class="phoneNumber">
<span style="display:inline-block;margin-bottom: 12px;"><i class="required">*</i>请输入手机号<span style="color: #ccc">（手机号可填多个，使用"，"隔开）</span>：</span>
<textarea id="phoneNum" class="form-control" rows="4" style="margin-left: 100px"></textarea>
</div>
<div class="main_bottom">
<div class="describe">
<span class="labelName">
......@@ -422,6 +437,12 @@
});
$("input[name=typeTwo]").change(function(e){
typeTwo = e.target.value;
$("input[name=sendType]").attr('checked', false);
$("#ticketTimeCheckBox").attr('checked', false);
$('.ticketTimeCheckBox_inner').hide();
$('.ticketTimeCheckBox_inner').hide();
$('.ticketTime_inner').show();
$('.phoneNumber').hide();
if (typeTwo == 1) {
$('#unit').text('张/账户')
$('#iptModal').show();
......@@ -429,19 +450,42 @@
$('#exchangeTime').val('')
$('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) {
$('.phoneNumber').show();
}
} else if (typeTwo == 2) {
$('#unit').text('张')
$('#iptModal').hide();
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('#exchange').hide();
$('#dataOne1').hide();
$('.ticketTimeCheckBox_inner').hide();
} else if (typeTwo == 3) {
$('#unit').text('张/账户');
$('#dataOne1').show();
$('#iptModal').show();
$('#exchange').hide();
$('.sendType').show();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').hide();
if (this.sendTypeNum == 1) {
$('.ticketTimeCheckBox_inner').show();
}
} else if (typeTwo == 4) { // 会员专属
$('#unit').hide();
$('#dataOne1').hide();
$('#iptModal').hide();
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').show();
} else {
$('#unit').text('张')
$('#iptModal').hide();
......@@ -452,17 +496,25 @@
$('.phoneNum').val('');
$('.test1').hide();
$('#dataOne1').show();
$('.ticketTimeCheckBox_inner').hide();
}
});
$("input[name=sendType]").change(function(e){
sendType = e.target.value;
if (e.target.value == 2) {
this.sendTypeNum = sendType;
$('.phoneNumber').hide();
if (sendType == 2) {
$('.phoneNumber').show();
$('.test1').show();
} else if (sendType == 1) {
$('.ticketTimeCheckBox_inner').show();
$('.phoneNumber').hide();
$('.test1').hide();
} else {
$('.phoneNumber').hide();
$('.test1').val('');
$('.test1').hide();
$('.ticketTimeCheckBox_inner').hide();
}
});
$("input[name=sex]").change(function(e){
......@@ -477,6 +529,16 @@
$("input[name=playMethod]").change(function(e){
playMethod = e.target.value;
});
$("#ticketTimeCheckBox").change(function(e){
// console.log()
this.memberCoupenType = e.target.checked;
if (e.target.checked) {
$('.ticketTime_inner').hide();
} else {
$('.ticketTime_inner').show();
}
// playMethod = e.target.value;
});
layui.use('laydate', function(){
var laydate = layui.laydate;
//执行一个laydate实例
......@@ -487,14 +549,14 @@
});
function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
if (typeTwo == 0) {
if (!$('#exchangeTime').val()) {
return layer.msg('请将必填项输入完整～！');
}
}
}
// if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#describeTxt').val()) {
// return layer.msg('请将必填项输入完整～！');
// if (typeTwo == 0) {
// if (!$('#exchangeTime').val()) {
// return layer.msg('请将必填项输入完整～！');
// }
// }
// }
let useScope = 100;
let busiName = $('#searchIpt').val();
let busiId = '';
......@@ -548,15 +610,16 @@
"eventType": Number(sendType),
"label": "标注", // 不需管
"notice": $('#describeTxt').val(),
"overlay": playMethod, // 优先购ticketTime
"overlay": playMethod, // 优先购ticketTime
"redeemValidity": Number($('#exchangeTime').val()), // 兑换有效期
"title": $('#title').val(),
"valOver": $('#valOver').val(),
"valMinus": $('#valMinus').val(),
// "valFace": $('#valFace').val(), // 金额
"validity": Number($('#ticketTime').val()),
"exclusively": this.memberCoupenType ? 1 : 0,
"validity": this.memberCoupenType ? 0 : Number($('#ticketTime').val()),
}
if (typeTwo == 1) {
if (typeTwo == 1 || typeTwo == 3) {
delete data.redeemValidity
} else {
delete data.eventType
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment