From 9b0211dcf5bf657307b72f7fb1e9c2e607ecc35c Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 26 Feb 2024 10:27:26 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
index df6c15c..f2b2154 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -111,13 +111,8 @@
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>-->
-<!-- <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>-->
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
+ <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>
</div>
</script>
<!-- 表格操作栏 end -->
@@ -288,16 +283,16 @@
toolbar:"#toolbar",
defaultToolbar:[],
cols: [[
- // {type: 'checkbox'},
+ {type: 'checkbox'},
{field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
{field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
{field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
{field: 'balance', title: '余额', minWidth: 100,align:'left'},
// {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
- // {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
+ {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
{field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
- {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
+ {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
// {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
{field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
// {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
@@ -363,11 +358,33 @@
if (layEvent == 'updateReferer') {
if (checkData.length > 1) {
febs.alert.warn('每次只能修改一个用户');
+ return;
}
- febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + data.id, {
+ febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + checkData[0].id, {
btn: ['提交', '取消'],
yes: function (index, layero) {
$('#referer-update').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
+
+ if (layEvent === 'updateVipLevel') {
+ var checkData = table.checkStatus('userTable').data;
+ if (checkData.length > 1) {
+ febs.alert.warn('每次只能修改一个用户');
+ return;
+ }
+ // var idList = [];
+ // for (var i = 0; i < checkData.length; i++) {
+ // idList.push(checkData[i].id);
+ // }
+ febs.modal.open('设置会员等级', 'modules/mallMember/vipLevelSetting/' + checkData[0].id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#vip-level-set').find('#submit').trigger('click');
},
btn2: function () {
layer.closeAll();
@@ -428,6 +445,18 @@
}
});
}
+
+ if (layEvent === 'addCoupon') {
+ febs.modal.open('添加优惠券', 'modules/mallMember/addCoupon/' + checkData[0].id, {
+ btn: ['确认', '取消'],
+ yes: function (index, layero) {
+ $('#member-coupon-select').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
});
function systemPay(text, id, type) {
--
Gitblit v1.9.1