From 58365e19449f21f8072e821521116164d0c722ae Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 22 Aug 2022 10:07:11 +0800
Subject: [PATCH] 20220822
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java | 12 +
src/main/java/cc/mrbird/febs/mall/entity/MallMember.java | 4
src/main/java/cc/mrbird/febs/mall/conversion/MallTeamLeaderConversion.java | 3
src/main/java/cc/mrbird/febs/mall/service/IAdminMallTeamLeaderService.java | 3
src/main/java/cc/mrbird/febs/mall/dto/AdminLeaderAddDto.java | 40 +++++
src/main/resources/templates/febs/views/modules/leader/addLeader.html | 164 +++++++++++++++++++++++
src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java | 6
src/main/resources/mapper/modules/MallMemberMapper.xml | 3
src/main/java/cc/mrbird/febs/mall/dto/ApiApplayLeaderDto.java | 1
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java | 31 ++++
src/main/resources/templates/febs/views/modules/leader/laderMap.html | 36 +++++
src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html | 60 ++++++--
12 files changed, 345 insertions(+), 18 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
index 9a42352..f1ae202 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallTeamLeaderController.java
@@ -4,7 +4,9 @@
import cc.mrbird.febs.common.controller.BaseController;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.mall.dto.AdminLeaderAddDto;
import cc.mrbird.febs.mall.dto.AdminLeaderUpdateDto;
+import cc.mrbird.febs.mall.dto.ApiApplayLeaderDto;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
import cc.mrbird.febs.mall.entity.MallLeaderStock;
import cc.mrbird.febs.mall.entity.MallMember;
@@ -49,6 +51,16 @@
return iAdminMallTeamLeaderService.leaderUpdate(adminLeaderUpdateDto);
}
+
+ /**
+ * 团长信息--新增
+ */
+ @PostMapping("addLeader")
+ @ControllerEndpoint(operation = "团长信息--新增", exceptionMessage = "新增失败")
+ public FebsResponse addLeader(@Valid AdminLeaderAddDto adminLeaderAddDto) {
+ return iAdminMallTeamLeaderService.addLeader(adminLeaderAddDto);
+ }
+
/**
* 团长信息--下拉列表
*/
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
index fef6585..91a12f5 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ViewMallTeamLeaderController.java
@@ -52,4 +52,10 @@
idLeaderGoodsUpdate = id;
return FebsUtil.view("modules/leader/leaderGoodsUpdate");
}
+
+ @GetMapping("addLeader/{id}")
+ public String addLeader(@PathVariable long id, Model model) {
+ model.addAttribute("memberId", id);
+ return FebsUtil.view("modules/leader/addLeader");
+ }
}
diff --git a/src/main/java/cc/mrbird/febs/mall/conversion/MallTeamLeaderConversion.java b/src/main/java/cc/mrbird/febs/mall/conversion/MallTeamLeaderConversion.java
index c05bffa..fb408d8 100644
--- a/src/main/java/cc/mrbird/febs/mall/conversion/MallTeamLeaderConversion.java
+++ b/src/main/java/cc/mrbird/febs/mall/conversion/MallTeamLeaderConversion.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.conversion;
+import cc.mrbird.febs.mall.dto.AdminLeaderAddDto;
import cc.mrbird.febs.mall.dto.ApiApplayLeaderDto;
import cc.mrbird.febs.mall.entity.MallTeamLeader;
import cc.mrbird.febs.mall.vo.AdminMallTeamLeaderVo;
@@ -22,5 +23,7 @@
public abstract AdminMallTeamLeaderVo entityToVo(MallTeamLeader mallTeamLeaders);
+ public abstract MallTeamLeader adminDtoToEntity(AdminLeaderAddDto adminLeaderAddDto);
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/AdminLeaderAddDto.java b/src/main/java/cc/mrbird/febs/mall/dto/AdminLeaderAddDto.java
new file mode 100644
index 0000000..10d8054
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/mall/dto/AdminLeaderAddDto.java
@@ -0,0 +1,40 @@
+package cc.mrbird.febs.mall.dto;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "AdminLeaderAddDto", description = "接收参数类")
+public class AdminLeaderAddDto {
+
+ //用户ID
+ private Long memberId;
+ //申请状态 1：审核通过 2：审核不通过 3：申请中 4:已取消
+ private Integer state;
+ public static final Integer STATE_YES = 1;
+ public static final Integer STATE_NO = 2;
+ public static final Integer STATE_ING = 3;
+ public static final Integer STATE_CANCEL = 4;
+ //团长姓名
+ private String name;
+ //手机号码
+// private String phone;
+ //团长特征码
+// private String uniqueCode;
+ //自提点照片
+ private String addressPic;
+ //省
+ private String province;
+ //市
+ private String city;
+ //区
+ private String township;
+ //小区名称
+ private String addressArea;
+ //详细地址
+ private String detailAddress;
+ //经度
+ private Double longitude;
+ //纬度
+ private Double latitude;
+}
diff --git a/src/main/java/cc/mrbird/febs/mall/dto/ApiApplayLeaderDto.java b/src/main/java/cc/mrbird/febs/mall/dto/ApiApplayLeaderDto.java
index e6316b2..98f786c 100644
--- a/src/main/java/cc/mrbird/febs/mall/dto/ApiApplayLeaderDto.java
+++ b/src/main/java/cc/mrbird/febs/mall/dto/ApiApplayLeaderDto.java
@@ -51,4 +51,5 @@
@NotNull(message = "纬度不能为空")
@ApiModelProperty(value = "纬度")
private Double latitude;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
index 3775ecf..a5c5710 100644
--- a/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
+++ b/src/main/java/cc/mrbird/febs/mall/entity/MallMember.java
@@ -144,4 +144,8 @@
*/
private String sessionKey;
+ //团长申请状态 1：审核通过 2：审核不通过 3：申请中
+ @TableField(exist = false)
+ private Integer leaderState;
+
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallTeamLeaderService.java b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallTeamLeaderService.java
index e0bdf54..d36172e 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/IAdminMallTeamLeaderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/IAdminMallTeamLeaderService.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.mall.dto.AdminLeaderAddDto;
import cc.mrbird.febs.mall.dto.AdminLeaderUpdateDto;
import cc.mrbird.febs.mall.entity.MallLeaderStock;
import cc.mrbird.febs.mall.entity.MallTeamLeader;
@@ -25,4 +26,6 @@
FebsResponse leaderCancel(Long id);
IPage<MallLeaderStock> leaderGoodsUpdate(QueryRequest request, MallLeaderStock mallLeaderStock);
+
+ FebsResponse addLeader(AdminLeaderAddDto adminLeaderAddDto);
}
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
index a6d007d..f697c4c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallTeamLeaderServiceImpl.java
@@ -3,9 +3,12 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.mall.conversion.MallTeamLeaderConversion;
+import cc.mrbird.febs.mall.dto.AdminLeaderAddDto;
import cc.mrbird.febs.mall.dto.AdminLeaderUpdateDto;
+import cc.mrbird.febs.mall.dto.ApiApplayLeaderDto;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
import cc.mrbird.febs.mall.entity.MallLeaderStock;
+import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallTeamLeader;
import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
import cc.mrbird.febs.mall.mapper.MallLeaderStockMapper;
@@ -23,6 +26,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +41,7 @@
private final MallLeaderStockMapper mallLeaderStockMapper;
private final MallGoodsMapper mallGoodsMapper;
+ private final MallMemberMapper mallMemberMapper;
@Override
public IPage<AdminMallTeamLeaderVo> getLeaderListInPage(MallTeamLeader mallTeamLeader, QueryRequest request) {
@@ -110,4 +115,30 @@
IPage<MallLeaderStock> mallTeamLeaders = this.baseMapper.selectleaderGoodsStockListInPage(page, mallLeaderStock);
return mallTeamLeaders;
}
+
+ @Override
+ public FebsResponse addLeader(AdminLeaderAddDto adminLeaderAddDto) {
+
+ Long memberId = adminLeaderAddDto.getMemberId();
+ MallMember mallMember = mallMemberMapper.selectById(memberId);
+ if(ObjectUtil.isEmpty(mallMember)){
+ return new FebsResponse().fail().message("刷新页面重试");
+ }
+ List<MallTeamLeader> mallTeamLeaders = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_ING);
+ if(CollUtil.isNotEmpty(mallTeamLeaders)){
+ return new FebsResponse().fail().message("正在申请中");
+ }
+ List<MallTeamLeader> mallTeamLeaderCancel = this.baseMapper.selectListByMemberIdAndState(memberId, MallTeamLeader.STATE_CANCEL);
+ if(CollUtil.isNotEmpty(mallTeamLeaderCancel)){
+ return new FebsResponse().fail().message("当前用户无法申请");
+ }
+ MallTeamLeader mallTeamLeader = MallTeamLeaderConversion.INSTANCE.adminDtoToEntity(adminLeaderAddDto);
+ mallTeamLeader.setUniqueCode(mallMember.getInviteId());
+ mallTeamLeader.setMemberId(memberId);
+ mallTeamLeader.setPhone(mallMember.getPhone());
+ mallTeamLeader.setName(mallMember.getName());
+ mallTeamLeader.setState(MallTeamLeader.STATE_YES);
+ this.baseMapper.insert(mallTeamLeader);
+ return new FebsResponse().success();
+ }
}
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index dd74bb6..e3c1dd9 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -4,11 +4,12 @@
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
- ,d.description levelName
+ ,d.description levelName,e.state leaderState
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ LEFT JOIN mall_team_leader e on e.member_id = m.id
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
diff --git a/src/main/resources/templates/febs/views/modules/leader/addLeader.html b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
new file mode 100644
index 0000000..9c1f20f
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
@@ -0,0 +1,164 @@
+<style>
+ #user-addLeader {
+ padding: 20px 25px 25px 0;
+ }
+
+ #user-addLeader .layui-treeSelect .ztree li a, .ztree li span {
+ margin: 0 0 2px 3px !important;
+ }
+ #user-addLeader #data-permission-tree-block {
+ border: 1px solid #eee;
+ border-radius: 2px;
+ padding: 3px 0;
+ }
+ #user-addLeader .layui-treeSelect .ztree li span.button.switch {
+ top: 1px;
+ left: 3px;
+ }
+ #user-addLeader img{
+ max-width:200px
+ }
+
+</style>
+<div class="layui-fluid" id="user-addLeader">
+ <form class="layui-form" action="" lay-filter="user-addLeader-form">
+ <div class="layui-form-item febs-hide">
+ <label class="layui-form-label">memberId：</label>
+ <div class="layui-input-block">
+ <input type="text" name="memberId">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">手机号码：</label>
+ <div class="layui-input-block">
+ <input type="text" name="phone" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">省：</label>
+ <div class="layui-input-block">
+ <input type="text" id="province" name="province" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">市：</label>
+ <div class="layui-input-block">
+ <input type="text" name="city" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">区：</label>
+ <div class="layui-input-block">
+ <input type="text" name="township" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">详细地址：</label>
+ <div class="layui-input-block">
+ <input type="text" name="detailAddress" lay-verify="required" autocomplete="off" class="layui-input" >
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">自提点名称：</label>
+ <div class="layui-input-block">
+ <input type="text" name="addressArea" lay-verify="required" autocomplete="off" class="layui-input" >
+ <div class="layui-form-mid layui-word-aux">小区名称(自提点名称)</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">自提点照片：</label>
+ <div class="layui-input-block">
+<!-- <img alt="头像" data-th-src="${leaderInfo.addressPic}" readonly>-->
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">地图选择：</label>
+ <div class="layui-input-block">
+ <div class="layui-fluid layui-anim febs-anim" id="febs-map-demo" lay-title="高德地图">
+ <div class="layui-row febs-container">
+ <div class="layui-card">
+ <div style="padding: .1rem;">
+ <div id="container" class="map"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-mid layui-word-aux">自提点位置</div>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">经度：</label>
+ <div class="layui-input-block">
+ <input type="text" id="longitude" name="longitude" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label febs-form-item-require">纬度：</label>
+ <div class="layui-input-block">
+ <input type="text" id="latitude" name="latitude" class="layui-input" readonly>
+ </div>
+ </div>
+ <div class="layui-form-item febs-hide">
+ <button class="layui-btn" lay-submit="" lay-filter="user-addLeader-submit" id="submit"></button>
+ </div>
+ </form>
+</div>
+
+<script data-th-inline="javascript">
+ layui.use(['febs', 'form', 'formSelects', 'treeSelect', 'eleTree'], function () {
+ var $ = layui.$,
+ febs = layui.febs,
+ layer = layui.layer,
+ form = layui.form,
+ memberId = [[${memberId}]],
+ $view = $('#user-addLeader'),
+ $viewMap = $('#febs-map-demo'),
+ _deptTree;
+
+ $viewMap.find('#container').css({"height": document.documentElement.clientHeight - 97 + 'px'});
+
+ var map = new AMap.Map("container", {
+ resizeEnable: true,
+ zoom: 14 //初始地图级别
+ });
+
+ // function currentLocationInfo() {
+ // map.getCity(function (info) {
+ // febs.alert.success('当前位置：' + info.province + '，' + info.city + '，' + info.district + '，区号：' + info.citycode);
+ // });
+ // }
+ //
+ // currentLocationInfo();
+
+ //为地图注册click事件获取鼠标点击出的经纬度坐标
+ map.on('click', function (e) {
+ febs.alert.success('经度：' + e.lnglat.getLng() + '，纬度：' + e.lnglat.getLat()+e.province);
+ $("#longitude").val(e.lnglat.getLng());
+ $("#latitude").val(e.lnglat.getLat());
+ $("#province").val(e.province);
+
+ // map.getCity(function (info) {
+ // $("#province").val(info.province);
+ // febs.alert.success('当前位置：' + info.province + '，' + info.city + '，' + info.district + '，区号：' + info.citycode);
+ // });
+ });
+ form.render();
+
+ initUserValue();
+
+ function initUserValue() {
+ form.val("user-addLeader-form", {
+ "memberId": memberId,
+ });
+ }
+
+ form.on('submit(user-addLeader-submit)', function (data) {
+ febs.post(ctx + 'admin/leader/addLeader', data.field, function () {
+ layer.closeAll();
+ febs.alert.success('操作成功');
+ $('#febs-member-list').find('#reset').click();
+ });
+ return false;
+ });
+ });
+</script>
\ No newline at end of file
diff --git a/src/main/resources/templates/febs/views/modules/leader/laderMap.html b/src/main/resources/templates/febs/views/modules/leader/laderMap.html
new file mode 100644
index 0000000..6f71b04
--- /dev/null
+++ b/src/main/resources/templates/febs/views/modules/leader/laderMap.html
@@ -0,0 +1,36 @@
+<div class="layui-fluid layui-anim febs-anim" id="febs-map-demo" lay-title="高德地图">
+ <div class="layui-row febs-container">
+ <div class="layui-card">
+ <div style="padding: .1rem;">
+ <div id="container" class="map"></div>
+ </div>
+ </div>
+ </div>
+</div>
+<script data-th-inline="javascript" type="text/javascript">
+ layui.use(['jquery', 'febs'], function () {
+ var $ = layui.jquery,
+ febs = layui.febs,
+ $viewMap = $('#febs-map-demo');
+
+ $viewMap.find('#container').css({"height": document.documentElement.clientHeight - 97 + 'px'});
+
+ var map = new AMap.Map("container", {
+ resizeEnable: true,
+ zoom: 14 //初始地图级别
+ });
+
+ function currentLocationInfo() {
+ map.getCity(function (info) {
+ febs.alert.success('当前位置：' + info.province + '，' + info.city + '，' + info.district + '，区号：' + info.citycode);
+ });
+ }
+
+ currentLocationInfo();
+
+ //为地图注册click事件获取鼠标点击出的经纬度坐标
+ map.on('click', function (e) {
+ febs.alert.success('经度：' + e.lnglat.getLng() + '，纬度：' + e.lnglat.getLat());
+ });
+ });
+</script>
\ No newline at end of file
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..643a214 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html
@@ -14,7 +14,7 @@
</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,
@@ -246,13 +258,27 @@
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{
+ 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 || d.leaderState === 3){
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{
+ 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 +381,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