更新资源模块

app/admin/controller/ResourcesController.php

@@ -119,6 +119,7 @@ class ResourcesController extends BaseController
             $data = [
                 'title' => input('post.title'),
                 'cate' => input('post.cate'),
+                'desc' => input('post.desc'),
                 'icon' => input('post.icon'),
                 'images' => input('post.images'),
                 'url' => input('post.url'),
@@ -126,30 +127,43 @@ class ResourcesController extends BaseController
                 'code' => input('post.code'),
                 'zipcode' => input('post.zipcode'),
                 'uploader' => input('post.uploader'),
-                'desc' => input('post.desc'),
                 'content' => input('post.content'),
                 'number' => input('post.number'),
                 'status' => input('post.status', 1),
-
                 'create_time' => time()
             ];
 
             $insert = Resource::insert($data);
             if (empty($insert)) {
                 Log::record('添加资源', 0, '添加资源失败', '资源管理');
-                return json(['code' => 1, 'msg' => '添加失败', 'data' => []]);
+                $this->error('添加失败');
             }
             Log::record('添加资源', 1, '', '资源管理');
-            return json(['code' => 0, 'msg' => '添加成功', 'data' => []]);
+            return View::fetch('lists');
-        } else {
+        }
+
+        try {
+            // 获取资源列表
             $lists = Resource::where('delete_time', null)
                 ->where('status', '<>', 3)
                 ->select()
                 ->toArray();
+
+            // 确保变量存在且不为空
+            if (!isset($lists) || empty($lists)) {
+                $lists = [];
+            }
+
+            // 传递数据到视图
             View::assign([
-                'lists' => $lists
+                'lists' => $lists,
+                'categories' => [] // 添加空的分类数组
             ]);
+
             return View::fetch();
+        } catch (\Exception $e) {
+            Log::record('添加资源页面加载', 0, $e->getMessage(), '资源管理');
+            $this->error('页面加载失败：' . $e->getMessage());
         }
     }
 
@@ -213,9 +227,9 @@ class ResourcesController extends BaseController
         if (!empty($resource['images'])) {
             $domain = request()->domain();
             $images = explode(',', $resource['images']);
-            $images = array_map(function ($image) use ($domain) {
+            // $images = array_map(function ($image) use ($domain) {
-                return $domain . $image;
+            //     return $domain . $image;
-            }, $images);
+            // }, $images);
             $resource['images'] = implode(',', $images);
         }
 

app/admin/view/resources/add.php

@@ -14,7 +14,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">资源名称</label>
             <div class="layui-input-block">
-                <input type="text" name="title" required lay-verify="required" placeholder="请输入资源名称" autocomplete="off"
+                <input type="text" name="title" placeholder="请输入资源名称" autocomplete="off"
                     class="layui-input" lay-affix="clear">
             </div>
         </div>
@@ -22,7 +22,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">分类</label>
             <div class="layui-input-block">
-                <select name="cate" lay-verify="required" lay-filter="cate">
+                <select name="cate" lay-filter="cate">
                     <option value="">请选择分类</option>
                 </select>
             </div>
@@ -31,8 +31,8 @@
         <div class="layui-form-item">
             <label class="layui-form-label">资源编号</label>
             <div class="layui-input-block">
-                <input type="text" name="number" required lay-verify="required" placeholder="选取分类后系统自动生成"
+                <input type="text" name="number" placeholder="选取分类后系统自动生成"
-                    autocomplete="off" class="layui-input" lay-affix="clear" disabled>
+                    autocomplete="off" class="layui-input" lay-affix="clear" readonly>
             </div>
         </div>
 
@@ -46,7 +46,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">上传者</label>
             <div class="layui-input-block">
-                <input type="text" name="uploader" required lay-verify="required" placeholder="请输入上传者"
+                <input type="text" name="uploader" placeholder="请输入上传者"
                     autocomplete="off" class="layui-input" lay-affix="clear" value="{$aUser['name']}">
             </div>
         </div>
@@ -75,7 +75,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">资源文件</label>
             <div class="layui-input-block">
-                <input type="text" name="fileurl" required placeholder="本地资源地址" autocomplete="off" class="layui-input"
+                <input type="text" name="fileurl" placeholder="本地资源地址" autocomplete="off" class="layui-input"
                     value="" style="margin-bottom: 10px;" lay-affix="clear">
                 <div class="layui-upload-drag" style="display: block;" id="ID-upload-demo-drag">
                     <i class="layui-icon layui-icon-upload"></i>
@@ -100,7 +100,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">资源链接</label>
             <div class="layui-input-block">
-                <input type="text" name="url" required placeholder="百度网盘、115网盘、蓝奏云等" autocomplete="off"
+                <input type="text" name="url"  placeholder="百度网盘、115网盘、蓝奏云等" autocomplete="off"
                     class="layui-input" lay-affix="clear">
             </div>
         </div>
@@ -108,7 +108,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">分享码</label>
             <div class="layui-input-block">
-                <input type="text" name="code" required placeholder="请输入分享码" autocomplete="off" class="layui-input"
+                <input type="text" name="code"  placeholder="请输入分享码" autocomplete="off" class="layui-input"
                     lay-affix="clear">
             </div>
         </div>
@@ -116,7 +116,7 @@
         <div class="layui-form-item">
             <label class="layui-form-label">解压密码</label>
             <div class="layui-input-block">
-                <input type="text" name="zipcode" required placeholder="请输入解压密码" autocomplete="off" class="layui-input"
+                <input type="text" name="zipcode"  placeholder="请输入解压密码" autocomplete="off" class="layui-input"
                     lay-affix="clear">
             </div>
         </div>
@@ -131,19 +131,17 @@
         <div class="layui-form-item">
             <label class="layui-form-label">图片上传</label>
             <div class="layui-input-block">
-                <div class="layui-upload">
+                <div class="image-upload-container">
-                    <button type="button" class="layui-btn" id="imageUpload">多图片上传</button>
+                    <button type="button" class="btn btn-primary" id="imageUpload">
-                    <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
+                        <i class="fas fa-upload"></i> 多图片上传
-                        预览图：
+                    </button>
-                        <div class="layui-upload-list" id="imagePreview" style="display: flex; flex-direction: column;">
+                    <div class="image-preview-container" id="imagePreview">
-                        </div>
+                    </div>
-                    </blockquote>
+                    <div class="upload-progress" id="imageProgress" style="display: none;">
+                        <div class="progress-bar" role="progressbar" style="width: 0%"></div>
+                    </div>
+                    <input type="hidden" name="images" id="images" value="">
                 </div>
-                <div class="layui-progress layui-progress-big" lay-showPercent="yes" lay-filter="image-progress"
-                    style="margin-top: 10px;">
-                    <div class="layui-progress-bar" lay-percent=""></div>
-                </div>
-                <input type="hidden" name="images" id="images" value="">
             </div>
         </div>
 
@@ -432,11 +430,29 @@
                 return false;
             }
             var loadIndex = layer.load(2);
-            data.field.content = content;
+            
+            // 使用 FormData 提交数据
+            var formData = new FormData();
+            formData.append('title', $('input[name="title"]').val());
+            formData.append('cate', $('select[name="cate"]').val());
+            formData.append('number', $('input[name="number"]').val());
+            formData.append('desc', $('textarea[name="desc"]').val());
+            formData.append('uploader', $('input[name="uploader"]').val());
+            formData.append('icon', $('input[name="icon"]').val());
+            formData.append('images', $('input[name="images"]').val());
+            formData.append('url', $('input[name="url"]').val());
+            formData.append('fileurl', $('input[name="fileurl"]').val());
+            formData.append('code', $('input[name="code"]').val());
+            formData.append('zipcode', $('input[name="zipcode"]').val());
+            formData.append('sort', $('input[name="sort"]').val());
+            formData.append('content', content);
+
             $.ajax({
                 url: '{:url("resources/add")}',
                 type: 'POST',
-                data: data.field,
+                data: formData,
+                processData: false,
+                contentType: false,
                 success: function (res) {
                     layer.close(loadIndex);
                     if (res.code == 0) {
@@ -447,6 +463,10 @@
                     } else {
                         layer.msg(res.msg, { icon: 2 });
                     }
+                },
+                error: function () {
+                    layer.close(loadIndex);
+                    layer.msg('提交失败，请重试', { icon: 2 });
                 }
             });
             return false;
@@ -549,4 +569,220 @@
     function goBack() {
         window.location.href = '{:url("resources/lists")}';
     }
+</script>
+
+<style>
+    .image-upload-container {
+        margin: 20px 0;
+    }
+
+    .image-preview-container {
+        display: grid;
+        grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
+        gap: 15px;
+        margin-top: 15px;
+    }
+
+    .image-preview-item {
+        position: relative;
+        border-radius: 8px;
+        overflow: hidden;
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+    }
+
+    .image-preview-item img {
+        width: 100%;
+        height: 150px;
+        object-fit: cover;
+        display: block;
+    }
+
+    .image-preview-overlay {
+        position: absolute;
+        top: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.5);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        opacity: 0;
+        transition: opacity 0.3s;
+        z-index: 1;
+    }
+
+    .image-preview-item:hover .image-preview-overlay {
+        opacity: 1;
+    }
+
+    .image-filename {
+        margin: 5px 0;
+        font-size: 0.9em;
+        text-align: center;
+        word-break: break-all;
+    }
+
+    .upload-progress {
+        margin-top: 10px;
+        height: 4px;
+        background: #f0f0f0;
+        border-radius: 2px;
+        overflow: hidden;
+    }
+
+    .progress-bar {
+        height: 100%;
+        background: #007bff;
+        transition: width 0.3s ease;
+    }
+
+    .btn {
+        padding: 8px 16px;
+        border: none;
+        border-radius: 4px;
+        cursor: pointer;
+        font-size: 14px;
+        transition: all 0.3s;
+    }
+
+    .btn-primary {
+        background: #007bff;
+        color: white;
+    }
+
+    .btn-primary:hover {
+        background: #0056b3;
+    }
+
+    .btn-danger {
+        background: #dc3545;
+        color: white;
+    }
+
+    .btn-danger:hover {
+        background: #c82333;
+    }
+
+    .btn-sm {
+        padding: 4px 8px;
+        font-size: 12px;
+    }
+
+    .delete-image {
+        border: none;
+        border-radius: 4px;
+        padding: 8px 12px;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transition: background-color 0.3s;
+        z-index: 2;
+    }
+
+    .delete-image i {
+        font-size: 40px;
+        margin-right: 4px;
+    }
+</style>
+
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        const imageUpload = document.getElementById('imageUpload');
+        const imagePreview = document.getElementById('imagePreview');
+        const imageProgress = document.getElementById('imageProgress');
+        const progressBar = imageProgress.querySelector('.progress-bar');
+        const imagesInput = document.getElementById('images');
+
+        // 处理图片上传
+        imageUpload.addEventListener('click', function () {
+            const input = document.createElement('input');
+            input.type = 'file';
+            input.multiple = true;
+            input.accept = 'image/*';
+
+            input.onchange = function (e) {
+                const files = e.target.files;
+                if (files.length === 0) return;
+
+                imageProgress.style.display = 'block';
+                let uploadedCount = 0;
+
+                Array.from(files).forEach(file => {
+                    const formData = new FormData();
+                    formData.append('file', file);
+
+                    fetch('{:url("index/upload_img")}', {
+                        method: 'POST',
+                        body: formData
+                    })
+                        .then(response => response.json())
+                        .then(res => {
+                            if (res.code === 0) {
+                                addImagePreview(res.data);
+                                updateImagesInput();
+                            } else {
+                                alert('上传失败：' + res.msg);
+                            }
+                        })
+                        .catch(error => {
+                            console.error('上传错误:', error);
+                            alert('上传出错');
+                        })
+                        .finally(() => {
+                            uploadedCount++;
+                            const progress = (uploadedCount / files.length) * 100;
+                            progressBar.style.width = progress + '%';
+
+                            if (uploadedCount === files.length) {
+                                setTimeout(() => {
+                                    imageProgress.style.display = 'none';
+                                    progressBar.style.width = '0%';
+                                }, 500);
+                            }
+                        });
+                });
+            };
+
+            input.click();
+            // 清除 input 的值，防止重复触发
+            input.value = '';
+        });
+
+        // 添加图片预览
+        function addImagePreview(imageUrl) {
+            const div = document.createElement('div');
+            div.className = 'image-preview-item';
+            div.dataset.src = imageUrl;
+
+            div.innerHTML = `
+                <img src="${imageUrl}" alt="已上传图片">
+                <div class="image-preview-overlay">
+                    <button type="button" class="btn btn-danger btn-sm delete-image">
+                        <i class="layui-icon layui-icon-delete"></i>
+                    </button>
+                </div>
+                <p class="image-filename">${imageUrl.split('/').pop()}</p>
+            `;
+
+            imagePreview.appendChild(div);
+        }
+
+        // 更新隐藏输入框的值
+        function updateImagesInput() {
+            const images = Array.from(imagePreview.querySelectorAll('.image-preview-item'))
+                .map(item => item.dataset.src);
+            imagesInput.value = images.join(',');
+        }
+
+        // 删除图片
+        imagePreview.addEventListener('click', function (e) {
+            if (e.target.closest('.delete-image')) {
+                const item = e.target.closest('.image-preview-item');
+                item.remove();
+                updateImagesInput();
+            }
+        });
+    });
 </script>

app/admin/view/resources/edit.php

@@ -107,48 +107,6 @@
             </div>
         </div>
 
-        <div class="layui-form-item">
-            <label class="layui-form-label">图片上传</label>
-            <div class="layui-input-block">
-                <div class="image-upload-container">
-                    <button type="button" class="btn btn-primary" id="imageUpload">
-                        <i class="fas fa-upload"></i> 多图片上传
-                    </button>
-                    <div class="image-preview-container" id="imagePreview">
-                        {if condition="isset($resource.images) && !empty($resource.images)"}
-                        {if condition="strpos($resource.images, ',') !== false"}
-                        {volist name="resource.images|explode=',',true" id="image"}
-                        <div class="image-preview-item" data-src="{$image}">
-                            <img src="{$image}" alt="已上传图片">
-                            <div class="image-preview-overlay">
-                                <button type="button" class="delete-image">
-                                    <i class="fas fa-trash"></i>
-                                </button>
-                            </div>
-                            <p class="image-filename">{$image|basename}</p>
-                        </div>
-                        {/volist}
-                        {else}
-                        <div class="image-preview-item" data-src="{$resource.images}">
-                            <img src="{$resource.images}" alt="已上传图片">
-                            <div class="image-preview-overlay">
-                                <button type="button" class="delete-image">
-                                    <i class="fas fa-trash"></i>
-                                </button>
-                            </div>
-                            <p class="image-filename">{$resource.images|basename}</p>
-                        </div>
-                        {/if}
-                        {/if}
-                    </div>
-                    <div class="upload-progress" id="imageProgress" style="display: none;">
-                        <div class="progress-bar" role="progressbar" style="width: 0%"></div>
-                    </div>
-                    <input type="hidden" name="images" id="images" value="{$resource.images|default=''}">
-                </div>
-            </div>
-        </div>
-
         <div class="layui-form-item">
             <label class="layui-form-label">分享码</label>
             <div class="layui-input-block">
@@ -173,6 +131,42 @@
             </div>
         </div>
 
+        <div class="layui-form-item">
+            <label class="layui-form-label">图片上传</label>
+            <div class="layui-input-block">
+                <div class="image-upload-container">
+                    <button type="button" class="btn btn-primary" id="imageUpload">
+                        <i class="fas fa-upload"></i> 多图片上传
+                    </button>
+                    <div class="image-preview-container" id="imagePreview">
+                        {if condition="isset($resource.images) && !empty($resource.images)"}
+                        {php}
+                            $images = is_array($resource['images']) ? $resource['images'] : explode(',', $resource['images']);
+                            if(empty($images[0])) {
+                                $images = [$resource['images']];
+                            }
+                        {/php}
+                        {volist name="images" id="image"}
+                        <div class="image-preview-item" data-src="{$image}">
+                            <img src="{$image}" alt="已上传图片">
+                            <div class="image-preview-overlay">
+                                <button type="button" class="delete-image">
+                                <i class="layui-icon layui-icon-delete"></i> 
+                                </button>
+                            </div>
+                            <p class="image-filename">{$image|basename}</p>
+                        </div>
+                        {/volist}
+                        {/if}
+                    </div>
+                    <div class="upload-progress" id="imageProgress" style="display: none;">
+                        <div class="progress-bar" role="progressbar" style="width: 0%"></div>
+                    </div>
+                    <input type="hidden" name="images" id="images" value="{$resource.images|default=''}">
+                </div>
+            </div>
+        </div>
+
         <div class="layui-form-item layui-form-text">
             <label class="layui-form-label">内容</label>
             <div class="layui-input-block">
@@ -777,8 +771,8 @@
     }
 
     .delete-image {
-        background: #dc3545;
+        /* background: #dc3545; */
-        color: white;
+        /* color: white; */
         border: none;
         border-radius: 4px;
         padding: 8px 12px;
@@ -792,7 +786,7 @@
     }
 
     .delete-image i {
-        font-size: 14px;
+        font-size: 40px;
         margin-right: 4px;
         /* 添加图标右边距 */
     }

app/index/view/program/detail.php

@@ -734,8 +734,7 @@
 
     .disclaimers {
         color: #b1b1b1;
-        width: 80%;
+        margin: 20px 0;
-        margin: 20px auto;
         margin-bottom: 60px;
     }