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

Skip to content

L
liquidnet-bus-v1
Commit 633357a1 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into... 

Merge remote-tracking branch 'origin/dev_member_voucher_refund_09151' into dev_member_voucher_refund_09151
parents 4898736e 0bf5e328
Show whitespace changes
Inline Side-by-side
Showing with 172 additions and 50 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ruoyi/js/ry-ui.js
View file @ 633357a1
...@@ -1234,6 +1234,33 @@ var table = { ...@@ -1234,6 +1234,33 @@ var table = {
}; };
$.ajax(config) $.ajax(config)
}, },
// 保存信息 弹出提示框
saveModalBody: function(url, data, callback) {
var config = {
url: url,
type: "post",
dataType: "json",
contentType: 'application/json',
data: data,
beforeSend: function () {
$.modal.loading("正在处理中，请稍后...");
},
success: function(result) {
if (typeof callback == "function") {
callback(result);
}
if (result.code == web_status.SUCCESS) {
$.modal.alertSuccess(result.msg)
} else if (result.code == web_status.WARNING) {
$.modal.alertWarning(result.msg)
} else {
$.modal.alertError(result.msg);
}
$.modal.closeLoading();
}
};
$.ajax(config)
},
// 保存选项卡信息 // 保存选项卡信息
saveTab: function(url, data, callback) { saveTab: function(url, data, callback) {
var config = { var config = {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html
View file @ 633357a1
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<label class="col-sm-2 control-label">会员说明：</label> <label class="col-sm-2 control-label">会员说明：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<textarea class="form-control" name="subTitle" th:field="*{subTitle}" placeholder="简略描述会员功能"/> <textarea class="form-control" name="subTitle" th:field="*{subTitle}" placeholder="简略描述会员功能"/>
<!-- <input type="text" class="form-control" name="subTitle" th:field="*{subTitle}" placeholder="简略描述会员功能">--> <!-- <input type="text" class="form-control" name="subTitle" th:field="*{subTitle}" placeholder="简略描述会员功能">-->
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
...@@ -172,19 +172,19 @@ ...@@ -172,19 +172,19 @@
</p> </p>
</div> </div>
</div> </div>
<!-- <div class="form-group">--> <!-- <div class="form-group">-->
<!-- <label class="col-sm-2 control-label">是否限购：</label>--> <!-- <label class="col-sm-2 control-label">是否限购：</label>-->
<!-- <div class="col-sm-10">--> <!-- <div class="col-sm-10">-->
<!-- <div class="radio-box">--> <!-- <div class="radio-box">-->
<!-- <input type="radio" id="radio1" th:field="*{limitation}" name="limitation" value="0">--> <!-- <input type="radio" id="radio1" th:field="*{limitation}" name="limitation" value="0">-->
<!-- <label for="radio1">否</label>--> <!-- <label for="radio1">否</label>-->
<!-- </div>--> <!-- </div>-->
<!-- <div class="radio-box">--> <!-- <div class="radio-box">-->
<!-- <input type="radio" id="radio2" th:field="*{limitation}" name="limitation" value="1">--> <!-- <input type="radio" id="radio2" th:field="*{limitation}" name="limitation" value="1">-->
<!-- <label for="radio2">是</label>--> <!-- <label for="radio2">是</label>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<!-- </div>--> <!-- </div>-->
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">会员弹窗文案：</label> <label class="col-sm-2 control-label">会员弹窗文案：</label>
<div class="col-sm-10"> <div class="col-sm-10">
...@@ -266,7 +266,50 @@ ...@@ -266,7 +266,50 @@
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">权益描述：</label> <label class="col-sm-2 control-label">权益描述：</label>
</div> </div>
<ul th:each="mr:${memberRightsList}" class="interests_inner">
<div th:if="${#lists.isEmpty(memberRightsList)}">
<div class="form-group interests_item">
<div class="text-center">
<p class="user-info-head avatar_img vip_icon" onclick="icon(this)">
<img class="img-circle img-lg interestsIcon" id="interestsIcon"/>
</p>
<input type="text" class="form-control" id="interestsTitle" name="interestsTitle" placeholder="请输入标题"/>
<input type="text" class="form-control" id="interestsSubTitle" name="interestsSubTitle" placeholder="请输入副标题"/>
<textarea class="form-control" id="interestsDesc" name="interestsDesc" placeholder="详情内容"></textarea>
<div class="member-coupes-item">
<ul>
<div class="member-coupes-inner">
<div class="member-coupes-detail">
<input type="hidden"/>
<span class="member-coupes-mcouponId" hidden></span>
<span class="member-coupes-busiType"></span>
<span class="member-coupes-type"></span>
<span class="member-coupes-title"></span>
<span class="member-coupes-mark"></span>
<span class="member-coupes-num"></span>
<span class="member-coupes-time"></span>
</div>
<div class="member-coupes-bth">
<!-- <span onclick="">编辑</span>-->
<span onclick="editCoupes(this)">编辑</span>
<span class="delCoupes" onclick="delCoupes(this)">删除</span>
</div>
</div>
</ul>
</div>
<div class="member-coupes" onclick="addCoupes(this)">+添加券<br/>*全场券不需要重复添加</div>
<div class="go-member-item" onclick="addColumn(this)">继续添加</div>
<div class="go-member-item save_mermber" onclick="saveColumn(this, 1)">保存</div>
</div>
</div>
</div>
<div th:each="mr:${memberRightsList}" class="interests_inner">
<div class="form-group interests_item"> <div class="form-group interests_item">
<div class="text-center"> <div class="text-center">
<p class="user-info-head avatar_img vip_icon" onclick="icon(this)"> <p class="user-info-head avatar_img vip_icon" onclick="icon(this)">
...@@ -279,6 +322,7 @@ ...@@ -279,6 +322,7 @@
<ul th:each="mrc:${couponMemberDtoListMap.get(mr.mrightsId)}"> <ul th:each="mrc:${couponMemberDtoListMap.get(mr.mrightsId)}">
<div class="member-coupes-inner"> <div class="member-coupes-inner">
<div class="member-coupes-detail"> <div class="member-coupes-detail">
<input type="hidden" th:value="${mrc}"/>
<span class="member-coupes-mcouponId" th:text="${mrc.mcouponId}" hidden></span> <span class="member-coupes-mcouponId" th:text="${mrc.mcouponId}" hidden></span>
<span class="member-coupes-busiType" th:if="${mrc.busiType == 0}">全场</span> <span class="member-coupes-busiType" th:if="${mrc.busiType == 0}">全场</span>
...@@ -299,7 +343,8 @@ ...@@ -299,7 +343,8 @@
<span class="member-coupes-time" th:text="${memberPrice.days} + '天'"></span> <span class="member-coupes-time" th:text="${memberPrice.days} + '天'"></span>
</div> </div>
<div class="member-coupes-bth"> <div class="member-coupes-bth">
<span onclick="editCoupes(this)">编辑</span> <!-- <span onclick="">编辑</span>-->
<span th:onclick="editCoupes(this, [[${mrc}]]);">编辑</span>
<span class="delCoupes" onclick="delCoupes(this)">删除</span> <span class="delCoupes" onclick="delCoupes(this)">删除</span>
</div> </div>
</div> </div>
...@@ -311,7 +356,7 @@ ...@@ -311,7 +356,7 @@
<div class="go-member-item del_mermber" onclick="saveColumn(this, 2)">删除</div> <div class="go-member-item del_mermber" onclick="saveColumn(this, 2)">删除</div>
</div> </div>
</div> </div>
</ul> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
...@@ -359,7 +404,7 @@ ...@@ -359,7 +404,7 @@
<input type="hidden" class="parentsIndex"/> <input type="hidden" class="parentsIndex"/>
<input type="hidden" class="childIndex"/> <input type="hidden" class="childIndex"/>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="coupeAdd_title" placeholder="券标题"/> <input type="text" id="coupeAdd_title" name="coupeAdd_title" placeholder="券标题"/>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">类别：</label> <label class="col-sm-2 control-label">类别：</label>
...@@ -391,24 +436,24 @@ ...@@ -391,24 +436,24 @@
<div class="col-sm-10"> <div class="col-sm-10">
<div class="radio-box"> <div class="radio-box">
<label for="radio1" onclick="coupetType(this)"> <label for="radio1" onclick="coupetType(this)">
<input type="radio" id="coupetypr1" name="coupe_type" value="0"/>满减券 <input type="radio" id="coupetypr1" name="coupe_type" value="1"/>满减券
</label> </label>
</div> </div>
<div class="radio-box"> <div class="radio-box">
<label for="radio2" onclick="coupetType(this)"> <label for="radio2" onclick="coupetType(this)">
<input type="radio" id="coupetypr2" name="coupe_type" value="1"/>代金券 <input type="radio" id="coupetypr2" name="coupe_type" value="2"/>代金券
</label> </label>
</div> </div>
</div> </div>
<div class="col-sm-10 discount"> <div class="col-sm-10 discount">
<div class="coupetypr_discount">满 ￥ <input type="text"/> 减 ￥ <input type="text"/></div> <div class="coupetypr_discount">满 ￥ <input type="text" id="valOver"/> 减 ￥ <input type="text" id="valMinus"/></div>
<div class="coupetypr_price" style="display: none;">金额 ￥ <input type="text"/></div> <div class="coupetypr_price" style="display: none;">金额 ￥ <input type="text" id="valFace"/></div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-2 control-label">数量：</label> <label class="col-sm-2 control-label">数量：</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text"/> 张 <input type="text" id="eventAmt" value="1"/> 张
</div> </div>
</div> </div>
<div class="form-group alltrack_limit"> <div class="form-group alltrack_limit">
...@@ -448,6 +493,8 @@ ...@@ -448,6 +493,8 @@
var memberPrice = [[${memberPrice}]]; var memberPrice = [[${memberPrice}]];
console.log(member); console.log(member);
var typeRadio = '';
var prefix = ctx + "adam/member"; var prefix = ctx + "adam/member";
// 弹窗 // 弹窗
$(function () { $(function () {
...@@ -471,12 +518,78 @@ ...@@ -471,12 +518,78 @@
}); });
}); });
// 弹窗确认取消按钮
function popBtn (num) {
if (num == 0) {
$('.cover_pop').hide();
$('.coupe_pop').hide();
} else if (num == 2) {
if ($('.coverFunNum').val() == 1) {
var bannerCon = $('.coverCon').val();
$('.memberBanner').attr('src', bannerCon);
} else if ($('.coverFunNum').val() == 2) {
var mermberCon = $('.coverCon').val();
$('.memberLast').attr('src', mermberCon);
} else {
var coverIndex = $('.coverIndex').val();
var coverCon = $('.coverCon').val();
$('.vip_icon').find('img').eq(coverIndex).attr('src', coverCon);
}
$('.cover_pop').hide();
} else {
var coupeTitle = $('#coupeAdd_title').val();
var busiType = this.typeRadio;
if (this.typeRadio == 0 || this.typeRadio == 1 || this.typeRadio == 3) {
var couponRuleList = [{
useScope: 100,
busiName: '全部演出'
}]
} else {
var couponRuleList = [{
useScope: 100,
busiName: '全部商品'
}]
}
if (this.typeRadio == 3) {
var eventAmt = $('#eventAmt').val();
var overlay = this.overlay;
} else {
var couType = this.typeCoupe;
var valOver = $('#valOver').val();
var valMinus = $('#valMinus').val();
if (couType == 2) {
var valFace = $('#valFace').val();
}
}
var itemIndex = $('.parentsIndex').val();
var MembercoupenData = {
busiType: Number(busiType),
couType: Number(couType),
couponId: '',
couponRuleList: couponRuleList,
eventAmt: $('#eventAmt').val(),
label: "标注",
memberId: member.memberId,
mrightsId: memberRightsList[itemIndex].mrightsId ? memberRightsList[itemIndex].mrightsId : 'string',
overlay: overlay ? overlay : 0,
title: coupeTitle,
valFace: valFace ? valFace : 1,
valOver: valOver ? valOver : 1,
valMinus: valMinus ? valMinus : 1
};
$.operate.saveModalBody(prefix + "/edit_coupon", JSON.stringify(MembercoupenData));
$('.cover_pop').hide();
}
}
function limitType (obj) { function limitType (obj) {
$(obj).find('input').val(); this.overlay = $(obj).find('input').val();
} }
// 类别
function radioType (obj) { function radioType (obj) {
var typeRadio = $(obj).find('input').val(); var typeRadio = $(obj).find('input').val();
this.typeRadio = typeRadio;
if (typeRadio == 3) { if (typeRadio == 3) {
$('.alltrack').hide(); $('.alltrack').hide();
$('.alltrack_limit').show(); $('.alltrack_limit').show();
...@@ -486,9 +599,11 @@ ...@@ -486,9 +599,11 @@
} }
} }
// 类型
function coupetType (obj) { function coupetType (obj) {
var typeCoupe = $(obj).find('input').val(); var typeCoupe = $(obj).find('input').val();
if (typeCoupe == 1) { this.typeCoupe = typeCoupe;
if (typeCoupe == 2) {
$('.coupetypr_price').show(); $('.coupetypr_price').show();
$('.coupetypr_discount').hide(); $('.coupetypr_discount').hide();
} else { } else {
...@@ -513,34 +628,14 @@ ...@@ -513,34 +628,14 @@
var addItemIndex = $('.member-coupes').index($(obj)); var addItemIndex = $('.member-coupes').index($(obj));
$('.parentsIndex').val(addItemIndex); $('.parentsIndex').val(addItemIndex);
$('.coupe_pop').show(); $('.coupe_pop').show();
}
// 弹窗确认取消按钮
function popBtn (num) {
if (num == 0) {
$('.cover_pop').hide();
$('.coupe_pop').hide();
} else if (num == 2) {
if ($('.coverFunNum').val() == 1) {
var bannerCon = $('.coverCon').val();
$('.memberBanner').attr('src', bannerCon);
} else if ($('.coverFunNum').val() == 2) {
var mermberCon = $('.coverCon').val();
$('.memberLast').attr('src', mermberCon);
} else {
var coverIndex = $('.coverIndex').val();
var coverCon = $('.coverCon').val();
$('.vip_icon').find('img').eq(coverIndex).attr('src', coverCon);
}
$('.cover_pop').hide();
} else {
var itemIndex = $('.parentsIndex').val();
console.log()
// $(obj).prev().prepend($(obj).prev().find('.member-coupes-inner').prop('outerHTML'))
$('.cover_pop').hide();
} }
function editCoupes (obj, dataObj) {
var coupenObj = dataObj;
$('.coupe_pop').show();
} }
function addColumn (obj) { function addColumn (obj) {
let appendDom = $(obj).parents('.interests_column'); let appendDom = $(obj).parents('.interests_column');
appendDom.append(appendDom.find('.interests_item').prop('outerHTML')); appendDom.append(appendDom.find('.interests_item').prop('outerHTML'));
......
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