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/socialCircle/add.html | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/febs/views/modules/socialCircle/add.html b/src/main/resources/templates/febs/views/modules/socialCircle/add.html
index efe2d85..7e2e417 100644
--- a/src/main/resources/templates/febs/views/modules/socialCircle/add.html
+++ b/src/main/resources/templates/febs/views/modules/socialCircle/add.html
@@ -9,6 +9,34 @@
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
+ <div class="layui-row layui-col-space10 layui-form-item">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label febs-form-item-require">来源：</label>
+ <div class="layui-input-block">
+ <select name="isNormal" class="goods-type" lay-filter="goods-type-select">
+ <option value="1">普通社区内容</option>
+ <option value="2">视频号内容</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <blockquote class="layui-elem-quote blue-border febs-hide tc-set">视频号信息</blockquote>
+ <div class="layui-form-item febs-hide tc-set">
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">视频号 id:</label>
+ <div class="layui-input-block">
+ <input type="text" name="finderUserName" placeholder="请输入" autocomplete="off" class="layui-input">
+ <div class="layui-form-mid layui-word-aux">视频号 id，以“sph”开头的id，可在视频号助手获取。</div>
+ </div>
+ </div>
+ <div class="layui-col-lg6">
+ <label class="layui-form-label">视频 feedId:</label>
+ <div class="layui-input-block">
+ <input type="text" name="feedId" placeholder="请输入" autocomplete="off" class="layui-input">
+ </div>
+ </div>
+ </div>
+
<blockquote class="layui-elem-quote blue-border">基础信息</blockquote>
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
@@ -25,13 +53,20 @@
</div>
</div>
</div>
+
+
<div class="layui-row layui-col-space10 layui-form-item">
<div class="layui-col-lg6">
<label class="layui-form-label febs-form-item-require">封面：</label>
<div class="layui-input-block">
<div class="layui-upload">
<button type="button" class="layui-btn layui-btn-normal layui-btn" id="test1Max">上传</button>
- <div class="layui-form-mid layui-word-aux">上传图片规格：750*200px，视频或者音频文件大小不超过100M</div>
+ <div class="layui-form-mid layui-word-aux">
+ 上传图片、视频或者音频文件大小不超过100M。
+ 图片："bmp", "gif", "jpg", "jpeg", "png",
+ 视频格式："mp4", "avi",
+ 音频："mp3", "wav" , "ogg"。
+ </div>
</div>
</div>
</div>
@@ -205,7 +240,7 @@
elem: '#test1Max'
,url: ctx + 'admin/goods/uploadFileBase64' //改成您自己的上传接口
,accept: 'file' //普通文件
- ,size: 10240 //限制文件大小，单位 KB
+ ,size: 102400 //限制文件大小，单位 KB
,before: function(obj){
}
,done: function(res){
@@ -240,5 +275,15 @@
return false;
});
+ form.on('select(goods-type-select)', function(data){
+ $('.tc-set').each(function() {
+ if (data.value == 2) {
+ $(this).show();
+ } else {
+ $(this).hide();
+ }
+ })
+ });
+
});
</script>
--
Gitblit v1.9.1