From ce610ff3a40d071f67dffcbf6e46067638b6ea60 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 16 Sep 2022 17:55:51 +0800
Subject: [PATCH] 20220902
---
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 78 ++++++++++++++++++++++++++++----------
1 files changed, 57 insertions(+), 21 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 7583fa5..cc358f2 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -9,12 +9,12 @@
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="用户名" name="name" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="用户昵称" name="name" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input type="text" placeholder="手机号/邮箱/邀请码" name="account" autocomplete="off" class="layui-input">
+ <input type="text" placeholder="手机号/邀请码" name="account" autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
@@ -27,19 +27,19 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label layui-form-label-sm">会员类型</label>
- <div class="layui-input-inline">
- <select name="level">
- <option value="">请选择</option>
- <option value="FIRST_LEVEL">普通会员</option>
- <option value="SECOND_LEVEL">一星</option>
- <option value="THIRD_LEVEL">二星</option>
- <option value="FOUR_LEVEL">三星</option>
- <option value="FIFTH_LEVEL">四星</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="level">-->
+<!-- <option value="">请选择</option>-->
+<!-- <option value="FIRST_LEVEL">普通会员</option>-->
+<!-- <option value="SECOND_LEVEL">一星</option>-->
+<!-- <option value="THIRD_LEVEL">二星</option>-->
+<!-- <option value="FOUR_LEVEL">三星</option>-->
+<!-- <option value="FIFTH_LEVEL">四星</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
<div class="layui-col-md2 layui-col-sm12 layui-col-xs12 table-action-area">
@@ -150,6 +150,18 @@
}
});
}
+
+ if (layEvent === 'addLeader') {
+ febs.modal.open( '团长新增', 'modules/leader/addLeader/' + data.id, {
+ btn: ['提交', '取消'],
+ yes: function (index, layero) {
+ $('#user-addLeader').find('#submit').trigger('click');
+ },
+ btn2: function () {
+ layer.closeAll();
+ }
+ });
+ }
if (layEvent === 'moneyFlow') {
febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
maxmin: true,
@@ -225,10 +237,10 @@
defaultToolbar:[],
cols: [[
// {type: 'checkbox'},
- {field: 'phone', title: '账号', minWidth: 150,align:'left'},
- {field: 'name', title: '名称', minWidth: 100,align:'left'},
+ {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: 'balance', title: '余额', minWidth: 100,align:'left'},
// {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
// {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
// {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
@@ -246,13 +258,37 @@
return ''
}
}, minWidth: 100,align:'center'},
+ {field: 'leaderState', title: '是否是团长',
+ templet: function (d) {
+ if (d.leaderState === 1) {
+ return '<span style="color:green;">团长</span>'
+ }else if (d.leaderState === 3) {
+ return '<span">申请中</span>'
+ }else if (d.leaderState === 4) {
+ return '<span">普通用户(取消团长资格)</span>'
+ }else{
+ return '<span">普通用户</span>'
+ }
+ }, minWidth: 100,align:'center'},
// {field: 'accountStatus', title: '账号状态', templet: '#switchStatus', minWidth: 100,align:'center'},
{field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
{title: '操作',
templet: function (d) {
- // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
+ if(d.leaderState === 1 ){
return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
- // + '<button class="layui-btn layui-btn-normal layui-btn-xs" type="button" lay-event="updateReferer">修改推荐人</button>'
+ }else if(d.leaderState === 2){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+ }else if(d.leaderState === 3){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ }else if(d.leaderState === 4){
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+ }else{
+ return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
+ + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'
+ }
+
},minWidth: 200,align:'center', fixed:"right"}
]]
});
@@ -355,7 +391,7 @@
name: $searchForm.find('input[name="name"]').val().trim(),
account: $searchForm.find('input[name="account"]').val().trim(),
accountStatus: $searchForm.find("select[name='accountStatus']").val(),
- level: $searchForm.find("select[name='level']").val(),
+ // level: $searchForm.find("select[name='level']").val(),
};
}
--
Gitblit v1.9.1