From dd7db9810d7ef562e3fafee19f5e38a7fde2a5df Mon Sep 17 00:00:00 2001
From: jianweie code <jianweie@live.com>
Date: Thu, 16 May 2024 10:15:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E6=96=87=E7=AB=A0=E5=90=8E=E5=8F=B0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=99=90=E5=88=B6=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E6=95=B0=E6=8D=AE=E5=87=BA=E5=8F=A3=E5=8F=8A=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue    | 2 +-
 .../wwwroot/views/content/article/articles/create.html      | 4 ++--
 .../wwwroot/views/content/article/articles/edit.html        | 4 ++--
 CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
index abc3896d..b3d30d8f 100644
--- a/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
+++ b/CoreCms.Net.Uni-App/CoreShop/pages/article/list/list.vue
@@ -18,7 +18,7 @@
         <view class="coreshop-bg-white coreshop-margin-10">
             <view class="coreshop-flex coreshop-solid-bottom coreshop-justify-between coreshop-flex-nowrap coreshop-padding-top-10 coreshop-padding-bottom-10 coreshop-padding-left-10 coreshop-padding-right-10" v-for="item in list" :key="item.id" @click="goArticleDetail(item.id)">
                 <view class="coreshop-flex coreshop-flex-nowrap">
-                    <u--image width="25px" height="25px" :src="item.coverImage" mode="aspectFill" :showLoading="true"></u--image>
+                    <u--image width="25px" height="25px" :src="item.coverImage? item.coverImage : '/static/images/common/empty.png'" mode="aspectFill" :showLoading="true"></u--image>
                     <view class="u-line-2 coreshop-padding-left-5 coreshop-font-14">{{item.title}}</view>
                 </view>
                 <view class="coreshop-text-gray coreshop-text-right coreshop-justify-end">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
index 227adbfd..b9cfd578 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/create.html
@@ -36,7 +36,7 @@
                 <div class="layui-form-item">
                     <label for="coverImage" class="layui-form-label">封面图</label>
                     <div class="layui-input-inline layui-inline-10">
-                        <input name="coverImage" id="coverImage" lay-verType="tips" lay-verify="required" class="layui-input" placeholder="请上传封面图" lay-reqText="请上传封面图" />
+                        <input name="coverImage" id="coverImage" lay-verType="tips" class="layui-input" placeholder="请上传封面图" lay-reqText="请上传封面图" />
                     </div>
                     <div class="layui-input-inline">
                         <img class="coreshop-upload-img" id="viewImgBoxcoverImage" src="{{ layui.setter.noImagePicUrl }}">
@@ -63,7 +63,7 @@
                     </div>
                     <label for="isPub" class="layui-form-label">是否发布</label>
                     <div class="layui-input-inline layui-inline-2">
-                        <input type="checkbox" lay-filter="switch" name="isPub" id="isPub" lay-skin="switch" lay-text="开启|关闭">
+                        <input type="checkbox" lay-filter="switch" name="isPub" id="isPub" lay-skin="switch" lay-text="开启|关闭" checked="checked">
                     </div>
                     <label for="isDel" class="layui-form-label">是否删除</label>
                     <div class="layui-input-inline layui-inline-2">
diff --git a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
index 5c2f9638..615d773a 100644
--- a/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
+++ b/CoreCms.Net.Web.Admin/wwwroot/views/content/article/articles/edit.html
@@ -37,7 +37,7 @@
                 <div class="layui-form-item">
                     <label for="coverImage" class="layui-form-label">封面图</label>
                     <div class="layui-input-inline layui-inline-10">
-                        <input name="coverImage" id="coverImage" lay-verType="tips" lay-verify="required" class="layui-input" value="{{d.data.model.coverImage || '' }}" placeholder="请上传封面图" lay-reqText="请上传封面图" />
+                        <input name="coverImage" id="coverImage" lay-verType="tips" class="layui-input" value="{{d.data.model.coverImage || '' }}" placeholder="请上传封面图" lay-reqText="请上传封面图" />
                     </div>
 
                     <div class="layui-input-inline">
@@ -115,7 +115,7 @@
                     }
                 });
                 editor.setData(d.data.model.contentBody);
-               
+
                 //封面图图片上传
                 $('#upBtncoverImage').click(function () {
                     cropperImg.cropImg({
diff --git a/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs b/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs
index a2764630..e385f990 100644
--- a/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs
+++ b/CoreCms.Net.Web.WebApi/Controllers/ArticleController.cs
@@ -114,12 +114,12 @@ namespace CoreCms.Net.Web.WebApi.Controllers
                 var where = PredicateBuilder.True<CoreCmsArticle>();
                 if (entity.id > 0)
                 {
-                    where = where.And(p => p.isDel == false && p.typeId == entity.id);
+                    where = where.And(p => p.isDel == false && p.typeId == entity.id && p.isPub == true);
                 }
                 else
                 {
                     var typeId = articleType.FirstOrDefault()!.id;
-                    where = where.And(p => p.isDel == false && p.typeId == typeId);
+                    where = where.And(p => p.isDel == false && p.typeId == typeId && p.isPub == true);
                 }
                 var list = await _articleServices.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, entity.page, entity.limit);
                 jm.data = new
@@ -168,7 +168,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
             jm.data = model;
             return jm;
 
-        } 
+        }
         #endregion
     }
 }