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

Skip to content

L
liquidnet-bus-v1
Commit 59d50061 authored by dongchun's avatar dongchun
Browse files
Options

新增修改

parent 4c69546b
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 15 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ 59d50061
...@@ -162,6 +162,7 @@ ...@@ -162,6 +162,7 @@
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span> <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="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
</div> </div>
</div> </div>
...@@ -180,22 +181,22 @@ ...@@ -180,22 +181,22 @@
</div> </div>
<div class="changeData"> <div class="changeData">
<div id="modalOne"> <div id="modalOne">
<div class="dataOne"> <div id="dataOne1" class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span> <span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" required /> <input type="text" id="num" value="1" required />
<span id="unit">张</span> <span id="unit">张</span>
</div> </div>
<div class="dataOne"> <div class="dataOne">
<span class="labelName"><i class="required">*</i>券的有效期：</span> <span class="labelName"><i class="required">*</i>券的有效期：</span>
<input type="text" id="ticketTime" required /> <input type="text" id="ticketTime" required />
天 天
<p class="prompt">*可兑换的时间</p> <p class="prompt">*兑换后的有效时间</p>
</div> </div>
<div class="dataOne" id="exchange"> <div class="dataOne" id="exchange">
<span class="labelName"><i class="required">*</i>兑换有效期：</span> <span class="labelName"><i class="required">*</i>兑换有效期：</span>
<input type="text" id="exchangeTime" required /> <input type="text" id="exchangeTime" required />
天 天
<p class="prompt">*兑换后的有效时间</p> <p class="prompt">*可兑换的时间</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -425,11 +426,23 @@ ...@@ -425,11 +426,23 @@
$('.sendType').show(); $('.sendType').show();
$('#exchangeTime').val('') $('#exchangeTime').val('')
$('#exchange').hide(); $('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) { if (sendType == 2) {
$('.phoneNumber').show(); $('.phoneNumber').show();
} }
} else if (typeTwo == 2) {
$('#unit').text('张')
$('#iptModal').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('#exchange').hide();
$('#dataOne1').hide();
} else { } else {
$('#unit').text('张') $('#unit').text('张')
$('#dataOne1').show();
$('#iptModal').hide(); $('#iptModal').hide();
$('#exchange').show(); $('#exchange').show();
$('.sendType').hide(); $('.sendType').hide();
...@@ -474,7 +487,7 @@ ...@@ -474,7 +487,7 @@
function create() { function create() {
if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) { if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) { if (typeTwo == 0) {
if (!$('#exchangeTime').val()) { if (!$('#exchangeTime').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add101.html
View file @ 59d50061
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span> <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="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
</div> </div>
</div> </div>
...@@ -176,9 +177,9 @@ ...@@ -176,9 +177,9 @@
</div> </div>
<div class="changeData"> <div class="changeData">
<div id="modalOne"> <div id="modalOne">
<div class="dataOne"> <div id="dataOne1" class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span> <span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" required /> <input type="text" value="1" id="num" required />
张 张
</div> </div>
<div class="dataOne"> <div class="dataOne">
...@@ -359,9 +360,19 @@ ...@@ -359,9 +360,19 @@
$('.sendType').show(); $('.sendType').show();
$('#exchangeTime').val('') $('#exchangeTime').val('')
$('#exchange').hide(); $('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) { if (sendType == 2) {
$('.phoneNumber').show(); $('.phoneNumber').show();
} }
} else if (typeTwo == 2) {
$('#iptModal').hide();
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('#dataOne1').hide();
} else { } else {
$('#iptModal').hide(); $('#iptModal').hide();
$('#exchange').show(); $('#exchange').show();
...@@ -370,6 +381,7 @@ ...@@ -370,6 +381,7 @@
$('.test1').val(''); $('.test1').val('');
$('.phoneNum').val(''); $('.phoneNum').val('');
$('.test1').hide(); $('.test1').hide();
$('#dataOne1').show();
} }
}); });
$("input[name=sendType]").change(function(e){ $("input[name=sendType]").change(function(e){
...@@ -407,7 +419,7 @@ ...@@ -407,7 +419,7 @@
function create() { function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) { if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) { if (typeTwo == 0) {
if (!$('#exchangeTime').val()) { if (!$('#exchangeTime').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @ 59d50061
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span> <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="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
</div> </div>
</div> </div>
...@@ -183,9 +184,9 @@ ...@@ -183,9 +184,9 @@
</div> </div>
<div class="changeData"> <div class="changeData">
<div id="modalOne"> <div id="modalOne">
<div class="dataOne"> <div id="dataOne1" class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span> <span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" required /> <input type="text" id="num" value="1" required />
<span id="unit">张</span> <span id="unit">张</span>
</div> </div>
<div class="dataOne"> <div class="dataOne">
...@@ -427,9 +428,20 @@ ...@@ -427,9 +428,20 @@
$('.sendType').show(); $('.sendType').show();
$('#exchangeTime').val('') $('#exchangeTime').val('')
$('#exchange').hide(); $('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) { if (sendType == 2) {
$('.phoneNumber').show(); $('.phoneNumber').show();
} }
} else if (typeTwo == 2) {
$('#unit').text('张')
$('#iptModal').hide();
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.test1').val('');
$('.phoneNum').val('');
$('.test1').hide();
$('#dataOne1').hide();
} else { } else {
$('#unit').text('张') $('#unit').text('张')
$('#iptModal').hide(); $('#iptModal').hide();
...@@ -439,6 +451,7 @@ ...@@ -439,6 +451,7 @@
$('.test1').val(''); $('.test1').val('');
$('.phoneNum').val(''); $('.phoneNum').val('');
$('.test1').hide(); $('.test1').hide();
$('#dataOne1').show();
} }
}); });
$("input[name=sendType]").change(function(e){ $("input[name=sendType]").change(function(e){
...@@ -476,7 +489,7 @@ ...@@ -476,7 +489,7 @@
function create() { function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val() || !$('#describeTxt').val()) { if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) { if (typeTwo == 0) {
if (!$('#exchangeTime').val()) { if (!$('#exchangeTime').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html
View file @ 59d50061
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
<div class="layui-input-block" style="display: flex"> <div class="layui-input-block" style="display: flex">
<input type="radio" value="0" class="typeTwo" name="typeTwo" checked><span>用户输入兑换</span> <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="1" class="typeTwo" name="typeTwo"><span>发送至“我的券”</span>
<input type="radio" value="2" class="typeTwo" name="typeTwo"><span>积分兑换</span>
</div> </div>
</div> </div>
<div class="scope_application" id="scope_application"> <div class="scope_application" id="scope_application">
...@@ -173,9 +174,9 @@ ...@@ -173,9 +174,9 @@
</div> </div>
<div class="changeData"> <div class="changeData">
<div id="modalOne"> <div id="modalOne">
<div class="dataOne"> <div id="dataOne1" class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span> <span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" /> <input type="text" value="1" id="num" />
张 张
</div> </div>
<div class="dataOne"> <div class="dataOne">
...@@ -266,15 +267,24 @@ ...@@ -266,15 +267,24 @@
$('.sendType').show(); $('.sendType').show();
$('#exchangeTime').val('') $('#exchangeTime').val('')
$('#exchange').hide(); $('#exchange').hide();
$('#dataOne1').show();
if (sendType == 2) { if (sendType == 2) {
$('.phoneNumber').show(); $('.phoneNumber').show();
} }
} else if (typeTwo == 2) {
$('#unit').text('张')
$('#exchange').hide();
$('.sendType').hide();
$('.phoneNumber').hide();
$('.phoneNum').val('');
$('#dataOne1').hide();
} else { } else {
$('#unit').text('张') $('#unit').text('张')
$('#exchange').show(); $('#exchange').show();
$('.sendType').hide(); $('.sendType').hide();
$('.phoneNumber').hide(); $('.phoneNumber').hide();
$('.phoneNum').val(''); $('.phoneNum').val('');
$('#dataOne1').show();
} }
}); });
$("#searchIpt").focus(function(){ $("#searchIpt").focus(function(){
...@@ -301,7 +311,7 @@ ...@@ -301,7 +311,7 @@
function create() { function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#discount').val() || !$('#describeTxt').val()) { if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#discount').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) { if (typeTwo == 0) {
if (!$('#exchangeTime').val()) { if (!$('#exchangeTime').val()) {
return layer.msg('请将必填项输入完整～！'); return layer.msg('请将必填项输入完整～！');
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html
View file @ 59d50061
...@@ -388,7 +388,8 @@ ...@@ -388,7 +388,8 @@
keyword: searchVal, keyword: searchVal,
busiType: typeOne, busiType: typeOne,
pageSize: 20, pageSize: 20,
pageNum: 1 pageNum: 1,
bindType: 2
} }
let str = ''; let str = '';
promiseMethods(prefix + "/list",'post',data,'application/x-www-form-urlencoded').then(res=>{ promiseMethods(prefix + "/list",'post',data,'application/x-www-form-urlencoded').then(res=>{
......
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