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 | 107 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 67 insertions(+), 40 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 20e6213..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,42 +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-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="memberId">
+ <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" >
+ <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" id="province" name="province" placeholder="" 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" 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="township" 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="detailAddress" 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="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">
@@ -68,7 +66,6 @@
<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>-->
<button type="button" class="layui-btn" id="imageUpload" style="background-color: #009688; margin-bottom: 2px">图片上传</button>
<blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
<div class=" layui-upload-list view-images" id="addressPicImage">
@@ -80,9 +77,16 @@
</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="detailAddress" name="detailAddress" 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">
- <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;">
@@ -118,10 +122,9 @@
febs = layui.febs,
layer = layui.layer,
form = layui.form,
- memberId = [[${memberId}]],
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'});
@@ -133,10 +136,30 @@
//为地图注册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());
+
+ //这边是数组
+ var lnglatXY=[e.lnglat.getLng(),e.lnglat.getLat()];
+ regeocoder(lnglatXY);
});
+ //坐标-地址
+ function regeocoder(lnglatXY) { //逆地理编码
+ var geocoder = new AMap.Geocoder({
+ radius: 1000,
+ extensions: "all"
+ });
+ geocoder.getAddress(lnglatXY, function(status, result) {
+ if (status === 'complete' && result.info === 'OK') {
+ geocoder_CallBack(result);
+ }
+ });
+ }
+ function geocoder_CallBack(data) {
+ var address = data.regeocode.formattedAddress; //返回地址描述
+ document.getElementById("detailAddress").value=address;
+ }
form.render();
upload.render({
@@ -154,19 +177,23 @@
}
});
- initUserValue();
-
- function initUserValue() {
- form.val("user-addLeader-form", {
- "memberId": memberId,
+ //(下拉框)
+ $.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