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

Skip to content

L
liquidnet-bus-v1
Commit 2b446ac7 authored by dongchun's avatar dongchun
Browse files
Options

opt

parent 272e27ae
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 20 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/common.js
View file @ 2b446ac7
......@@ -224,6 +224,7 @@ var refreshItem = function(){
/** 关闭选项卡 */
var closeItem = function(dataId){
console.log(dataId, '这个科技')
var topWindow = $(window.parent.document);
if($.common.isNotEmpty(dataId)){
window.parent.$.modal.closeLoading();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js
View file @ 2b446ac7
......@@ -929,6 +929,7 @@ var table = {
},
// 关闭选项卡
closeTab: function (dataId) {
console.log(dataId, '看看这个是啥')
closeItem(dataId);
},
// 禁用按钮
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
View file @ 2b446ac7
......@@ -183,7 +183,7 @@
<div class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" required />
张
<span id="unit">张</span>
</div>
<div class="dataOne">
<span class="labelName"><i class="required">*</i>券的有效期：</span>
......@@ -216,7 +216,7 @@
<div class="main_bottom">
<div class="describe">
<span class="labelName">
描述说明：
<i class="required">*</i>描述说明：
</span>
<textarea id="describeTxt" class="form-control" rows="4"></textarea>
</div>
......@@ -361,7 +361,12 @@
});
$("input[name=typeOne]").change(function(e){
typeOne = e.target.value;
if (typeOne == 1) {
$("#searchIpt").val('');
$("#searchIpt").attr('placeholder', '全部');
}
if (typeOne != 0) {
console.log('???')
showId = ''; // 选中演出id
selectTwoId = ''; // 选中演出下级的ID
selectThreeId = ''; // 选中演出三级的ID
......@@ -383,7 +388,8 @@
$('#selectThree').empty();
$('#dataList').empty();
if (typeOne == 2) {
$("#searchIpt").val('全部商品');
$("#searchIpt").val('');
$("#searchIpt").attr('placeholder', '全部商品');
}
} else {
$('#selectTwo').show();
......@@ -401,6 +407,7 @@
$("input[name=typeTwo]").change(function(e){
typeTwo = e.target.value;
if (typeTwo == 1) {
$('#unit').text('张/账户')
$('#iptModal').show();
$('.sendType').show();
$('#exchangeTime').val('')
......@@ -409,6 +416,7 @@
$('.phoneNumber').show();
}
} else {
$('#unit').text('张')
$('#iptModal').hide();
$('#exchange').show();
$('.sendType').hide();
......@@ -451,7 +459,7 @@
});
function create() {
if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val()) {
if (!$('#valFace').val() || !$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) {
if (!$('#exchangeTime').val()) {
......@@ -532,7 +540,8 @@
}
console.log(data,'data')
promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
console.log(res)
layer.msg('创建成功！');
closeItem();
})
}
function promiseMethods(url,type,data,contentType) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html
View file @ 2b446ac7
......@@ -186,7 +186,7 @@
<div class="dataOne">
<span class="labelName"><i class="required">*</i>数量：</span>
<input type="text" id="num" required />
张
<span id="unit">张</span>
</div>
<div class="dataOne">
<span class="labelName"><i class="required">*</i>券的有效期：</span>
......@@ -219,7 +219,7 @@
<div class="main_bottom">
<div class="describe">
<span class="labelName">
描述说明：
<i class="required">*</i>描述说明：
</span>
<textarea id="describeTxt" class="form-control" rows="4"></textarea>
</div>
......@@ -363,6 +363,10 @@
});
$("input[name=typeOne]").change(function(e){
typeOne = e.target.value;
if (typeOne == 1) {
$("#searchIpt").val('');
$("#searchIpt").attr('placeholder', '全部');
}
if (typeOne != 0) {
showId = ''; // 选中演出id
selectTwoId = ''; // 选中演出下级的ID
......@@ -385,7 +389,8 @@
$('#selectThree').empty();
$('#dataList').empty();
if (typeOne == 2) {
$("#searchIpt").val('全部商品');
$("#searchIpt").val('');
$("#searchIpt").attr('placeholder', '全部商品');
}
} else {
$('#selectTwo').show();
......@@ -403,6 +408,7 @@
$("input[name=typeTwo]").change(function(e){
typeTwo = e.target.value;
if (typeTwo == 1) {
$('#unit').text('张/账户')
$('#iptModal').show();
$('.sendType').show();
$('#exchangeTime').val('')
......@@ -411,6 +417,7 @@
$('.phoneNumber').show();
}
} else {
$('#unit').text('张')
$('#iptModal').hide();
$('#exchange').show();
$('.sendType').hide();
......@@ -453,7 +460,7 @@
});
function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val()) {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#valOver').val() || !$('#valMinus').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) {
if (!$('#exchangeTime').val()) {
......@@ -534,9 +541,9 @@
if (sendType != 2) {
delete data.eventLimit;
}
console.log(data,'data')
promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
console.log(res)
layer.msg('创建成功！');
closeItem();
})
}
function promiseMethods(url,type,data,contentType) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add3.html
View file @ 2b446ac7
......@@ -185,7 +185,7 @@
<div class="main_bottom">
<div class="describe">
<span class="labelName">
描述说明：
<i class="required">*</i>描述说明：
</span>
<textarea id="describeTxt" class="form-control" rows="4"></textarea>
</div>
......@@ -243,7 +243,7 @@
selectTwoId = ''; // 选中演出下级的ID
selectThreeId = ''; // 选中演出三级的ID
$('#selectTwo').empty().append(str);
$('#selectThree').empty();
$('#selectThree').empty().append('<option value="0" label="">所有</option>');
};
$("#searchIpt").focus(function(){
search()
......@@ -281,7 +281,7 @@
selectThreeName = $('#selectThree').find('option:selected').attr('label');
});
function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val()) {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
}
let useScope = 100;
......@@ -323,9 +323,9 @@
"validity": Number($('#ticketTime').val()),
"redeemValidity": Number($('#ticketTime').val()) // 兑换有效期
}
console.log(data,'data')
promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
console.log(res)
layer.msg('创建成功！');
closeItem();
})
}
function promiseMethods(url,type,data,contentType) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add4.html
View file @ 2b446ac7
......@@ -209,7 +209,7 @@
<div class="main_bottom">
<div class="describe">
<span class="labelName">
描述说明：
<i class="required">*</i>描述说明：
</span>
<textarea id="describeTxt" class="form-control" rows="4"></textarea>
</div>
......@@ -259,6 +259,7 @@
$("input[name=typeTwo]").change(function(e){
typeTwo = e.target.value;
if (typeTwo == 1) {
$('#unit').text('张/账户')
$('.sendType').show();
$('#exchangeTime').val('')
$('#exchange').hide();
......@@ -266,6 +267,7 @@
$('.phoneNumber').show();
}
} else {
$('#unit').text('张')
$('#exchange').show();
$('.sendType').hide();
$('.phoneNumber').hide();
......@@ -294,7 +296,7 @@
}
});
function create() {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#discount').val()) {
if (!$('#title').val() || !$('#num').val() || !$('#ticketTime').val() || !$('#discount').val() || !$('#describeTxt').val()) {
return layer.msg('请将必填项输入完整～！');
if (typeTwo != 1) {
if (!$('#exchangeTime').val()) {
......@@ -349,9 +351,9 @@
if (sendType != 2) {
delete data.eventLimit;
}
console.log(data,'data')
promiseMethods('/candy/coupon/mgt/add','post',JSON.stringify(data),'application/json').then(res=>{
console.log(res)
layer.msg('创建成功！');
closeItem();
})
}
function promiseMethods(url,type,data,contentType) {
......
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