Merge branch 'master' of https://git.yunzer.cn/yunzerwebsite/yunzer

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,7 +127,6 @@ 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),
@@ -136,7 +136,7 @@ class ResourcesController extends BaseController
             $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' => []]);
@@ -154,7 +154,11 @@ class ResourcesController extends BaseController
             View::assign([
                 'categories' => $categories
             ]);
+
             return View::fetch();
+        } catch (\Exception $e) {
+            Log::record('添加资源页面加载', 0, $e->getMessage(), '资源管理');
+            $this->error('页面加载失败：' . $e->getMessage());
         }
     }
 
@@ -218,9 +222,9 @@ class ResourcesController extends BaseController
         if (!empty($resource['images'])) {
             $domain = request()->domain();
             $images = explode(',', $resource['images']);
-            $images = array_map(function ($image) use ($domain) {
-                return $domain . $image;
-            }, $images);
+            // $images = array_map(function ($image) use ($domain) {
+            //     return $domain . $image;
+            // }, $images);
             $resource['images'] = implode(',', $images);
         }
 

app/admin/view/resources/edit.php

@@ -788,8 +788,8 @@
     }
 
     .delete-image {
-        background: #dc3545;
-        color: white;
+        /* background: #dc3545; */
+        /* color: white; */
         border: none;
         border-radius: 4px;
         padding: 8px 12px;
@@ -803,7 +803,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 auto;
+        margin: 20px 0;
         margin-bottom: 60px;
     }