From ccbd86bc5f747b748b5bde257a789d748b8cefbb Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Thu, 11 Sep 2025 17:41:35 +0800
Subject: [PATCH] ``` refactor(service): 在设置活动类别名称前增加非空检查在AdminHappyActivityServiceImpl.java中，对happyActivity的categoryId进行了非空检查，并且确认categoryMap中包含该categoryId后，再设置其categoryName。这样可以避免因为空值或不存在的键导致的潜在异常。 ```
---
src/main/resources/templates/febs/views/modules/leader/addLeader.html | 70 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/leader/addLeader.html b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
index d220728..618d1f8 100644
--- a/src/main/resources/templates/febs/views/modules/leader/addLeader.html
+++ b/src/main/resources/templates/febs/views/modules/leader/addLeader.html
@@ -22,38 +22,40 @@
</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 class="layui-form-item">
+ <label class="layui-form-label">用户选择：</label>
+ <div class="layui-input-inline">
+ <select name="memberId" class="leader-add-memberId">
+ <option value="">请选择</option>
+ </select>
</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="uniqueCode" lay-verify="required" placeholder="" autocomplete="off" 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" name="name" lay-verify="required" placeholder="" autocomplete="off" class="layui-input" readonly>
+ <input type="text" name="name" lay-verify="required" placeholder="" 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="phone" lay-verify="required" placeholder="" autocomplete="off" class="layui-input" readonly>
+ <input type="text" name="phone" lay-verify="required" placeholder="" 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="uniqueCode" lay-verify="required" placeholder="" autocomplete="off" 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" name="bonusPercent"
- lay-verify="text" autocomplete="off" class="layui-input" >
- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</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" name="bonusPercent"-->
+<!-- lay-verify="text" autocomplete="off" class="layui-input" >-->
+<!-- <div class="layui-form-mid layui-word-aux">请输入0到1之间的小数,团长收益百分比如0.15表示15%</div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label febs-form-item-require">自提点名称：</label>
<div class="layui-input-block">
@@ -84,7 +86,7 @@
<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-fluid layui-anim febs-anim" id="febs-map-demo-add" lay-title="高德地图">
<div class="layui-row febs-container">
<div class="layui-card">
<div style="padding: .1rem;">
@@ -120,10 +122,9 @@
febs = layui.febs,
layer = layui.layer,
form = layui.form,
- mallMember = [[${mallMember}]],
upload = layui.upload,
$view = $('#user-addLeader'),
- $viewMap = $('#febs-map-demo'),
+ $viewMap = $('#febs-map-demo-add'),
_deptTree;
$viewMap.find('#container').css({"height": document.documentElement.clientHeight - 97 + 'px'});
@@ -135,7 +136,7 @@
//为地图注册click事件获取鼠标点击出的经纬度坐标
map.on('click', function (e) {
- febs.alert.success('经度：' + e.lnglat.getLng() + '，纬度：' + e.lnglat.getLat()+e.province);
+ febs.alert.success('经度：' + e.lnglat.getLng() + '，纬度：' + e.lnglat.getLat());
$("#longitude").val(e.lnglat.getLng());
$("#latitude").val(e.lnglat.getLat());
@@ -176,22 +177,23 @@
}
});
- initUserValue();
-
- function initUserValue() {
- form.val("user-addLeader-form", {
- "memberId": mallMember.id,
- "name": mallMember.name,
- "phone": mallMember.phone,
- "uniqueCode": mallMember.inviteId,
+ //(下拉框)
+ $.get(ctx + 'admin/leader/leader/tree', function (data) {
+ for (var k in data)
+ {
+ $(".leader-add-memberId").append("<option value='" + data[k].id + "'>" + data[k].name + "</option>");
+ }
+ layui.use('form', function () {
+ var form = layui.form;
+ form.render();
});
- }
+ });
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();
+ $('#febs-leader').find('#query').click();
});
return false;
});
--
Gitblit v1.9.1