From f5727c361cffcef22349269687176357a9e790c2 Mon Sep 17 00:00:00 2001
From: fwb <fwb>
Date: Mon, 9 Sep 2024 17:36:06 +0800
Subject: [PATCH] =?UTF-8?q?'=E6=9B=B4=E6=96=B0'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/news.js                          |  2 ++
 src/views/message/components/sendMessage.vue  |  2 +-
 src/views/message/index.vue                   |  2 +-
 .../news/components/newsContentManage.vue     | 26 ++++++++++---------
 src/views/news/index.vue                      |  7 +++--
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/api/user/news.js b/src/api/user/news.js
index 634d1f3..5c8a527 100644
--- a/src/api/user/news.js
+++ b/src/api/user/news.js
@@ -32,10 +32,12 @@ export function queryEssay(category_id) {
     return request.get(`/api/cms-essay/query?category_id=${category_id}`);
 }
 //添加新闻文章
+
 // export function addEssay(params){
 //     const str = parseParams(params)
 //     return request.post(`/api/cms-essay/add${str}`)
 // }
+
 export function addEssay(params) {
     return request.post(`/api/cms-essay/add`, params);
 }
diff --git a/src/views/message/components/sendMessage.vue b/src/views/message/components/sendMessage.vue
index b81c36b..6ea0502 100644
--- a/src/views/message/components/sendMessage.vue
+++ b/src/views/message/components/sendMessage.vue
@@ -23,7 +23,7 @@
           <div class="message-content" @click="handleClick(item)">
             <h2 class="message-title">{{item.title}}</h2>
             <div class="message-details">
-              <div>收件人:<span class="sender" v-for="o in item.receiveUsers" :key="o.id">{{o.receiverName}}</span></div>
+              <div>收件人:<span class="sender" v-for="receive in item.receiveUsers" :key="receive.id">{{receive.receiverName}}</span></div>
               <span class="read-status">阅读人数：{{item.readUserNum}}</span>
             </div>
             <div class="message-time">发送时间：{{item.sendTime}}</div>
diff --git a/src/views/message/index.vue b/src/views/message/index.vue
index 35bb051..45334ba 100644
--- a/src/views/message/index.vue
+++ b/src/views/message/index.vue
@@ -160,7 +160,7 @@ const deleteMessage = async (id: any) => {
 }
 //一键已读
 const readMessage = async (id:any) =>{
-  console.log(id,userStore.data.id,'dddddd')
+  // console.log(id,userStore.data.id,'dddddd')
   await readMessagesBatch({
     messageIds:id,
     userId:userStore.data.id
diff --git a/src/views/news/components/newsContentManage.vue b/src/views/news/components/newsContentManage.vue
index 012a7c6..ccc836b 100644
--- a/src/views/news/components/newsContentManage.vue
+++ b/src/views/news/components/newsContentManage.vue
@@ -47,7 +47,7 @@
         <el-card class="container">
           <template #header>
             <div class="card-header">
-              <span>栏目添加新闻信息</span>
+              <span>添加当前栏目新闻信息</span>
             </div>
           </template>
           <!--  栏目内添加新闻-->
@@ -60,7 +60,7 @@
             </el-form-item>
             <el-form-item label="文章内容" label-width="120px">
               <textarea style="width: 100%;
-                               height:320px;
+                               height:375px;
                                border: 2px solid #d3d3d3;"
                         v-model="newsForm.content"
               ></textarea>
@@ -75,9 +75,9 @@
             <!--      <el-form-item label="发布时间" label-width="140px">-->
             <!--        <el-input v-model="newsForm.publishTime" autocomplete="off"  type="date"/>-->
             <!--      </el-form-item>-->
-            <el-form-item label="浏览次数" label-width="120px">
-              <el-input v-model="newsForm.readingNumber" autocomplete="off" />
-            </el-form-item>
+<!--            <el-form-item label="浏览次数" label-width="120px">-->
+<!--              <el-input v-model="newsForm.readingNumber" autocomplete="off" />-->
+<!--            </el-form-item>-->
             <el-form-item label="发布状态" label-width="120px">
               <el-input v-model="newsForm.status" placeholder="1:已发布 2:未发布" autocomplete="off" />
             </el-form-item>
@@ -88,7 +88,8 @@
             <!--        <el-input v-model="newsForm.updateTime" autocomplete="off"  type="date"/>-->
             <!--      </el-form-item>-->
             <el-form-item label="当前用户id" label-width="120px">
-              <el-input v-model="newsForm.userId" autocomplete="off" readonly disabled/>
+<!--              <el-input v-model="newsForm.userId" autocomplete="off" readonly disabled/>-->
+              <el-input v-model="newsForm.userId" autocomplete="off" readonly/>
             </el-form-item>
           </el-form>
           <template #footer>
@@ -166,7 +167,7 @@
         <el-input v-model="nowTimeNewsData.categoryId" autocomplete="off" readonly disabled/>
       </el-form-item>
       <el-form-item label="文章内容" label-width="140px">
-        <textarea style="width: 100%;height: 300px" v-model="nowTimeNewsData.content"></textarea>
+        <textarea style="width: 100%;height: 450px;border: 1px solid #d3d3d3;" v-model="nowTimeNewsData.content"></textarea>
         <!-- <el-input class="brief_text" type="textarea" /> -->
       </el-form-item>
       <!--      <el-form-item label="文章文件" label-width="140px">-->
@@ -181,9 +182,9 @@
       <!--      <el-form-item label="发布时间" label-width="140px">-->
       <!--        <el-input v-model="nowTimeNewsData.publishTime" autocomplete="off"  type="date"/>-->
       <!--      </el-form-item>-->
-      <el-form-item label="浏览次数" label-width="140px">
-        <el-input v-model="nowTimeNewsData.readingNumber" autocomplete="off" />
-      </el-form-item>
+<!--      <el-form-item label="浏览次数" label-width="140px">-->
+<!--        <el-input v-model="nowTimeNewsData.readingNumber" autocomplete="off" />-->
+<!--      </el-form-item>-->
       <el-form-item label="发布状态" label-width="140px">
         <el-input v-model="nowTimeNewsData.status" placeholder="1:已发布 2:未发布" autocomplete="off" />
       </el-form-item>
@@ -256,7 +257,7 @@ const addNewsButton = (item)=>{
   nowCategoryName.value = item.categoryName
 }
 const nowTimeNewsData = ref({})
-
+console.log(userStore.data,'当前用户数据')
 //新闻详细信息获取
 const newViews = (listObject)=> {
   nowTimeNewsData.value = { ...listObject }
@@ -380,6 +381,7 @@ const newsForm = ref({
   title:'',
   updateTime:'',
   userId:userStore.data.id,
+  nickName:userStore.data.nickName
 })
 //新闻文章添加
 const addNewsContentConfirm = async (id)=>{
@@ -408,7 +410,7 @@ const aboutContent = async (essay_id)=>{
   aboutContentDrawer.value = true
   const responseEssay = await queryEssayById('1')
   aboutEssay.value = responseEssay.data
-  console.log(aboutEssay.value,'关于我们文章')
+  // console.log(aboutEssay.value,'关于我们文章')
 }
 //关于我们修改提交
 const editConfirm =async ()=>{
diff --git a/src/views/news/index.vue b/src/views/news/index.vue
index 69f2086..750a3c5 100644
--- a/src/views/news/index.vue
+++ b/src/views/news/index.vue
@@ -15,7 +15,7 @@
               <template #dropdown>
                 <el-dropdown-menu>
                     <ul>
-                      <li class="flex-container" @click="newViews(listObject)" v-for="listObject in essay" style="margin-bottom: 15px">
+                      <li class="flex-container" @click="newViews(listObject)" v-for="listObject in essay">
                         <el-dropdown-item>
                         <el-tag type="info" size="large" style="height: 30px;font-size: 15px">
                           <p >{{listObject.title}}</p>
@@ -41,7 +41,7 @@
             <el-card shadow="hover">
               <div class="news-flex-container">
                 <p>发布人：{{ nowTimeNewsData.userId }}</p>
-                <p>阅读数量：{{ nowTimeNewsData.readingNumber }}</p>
+<!--                <p>阅读数量：{{ nowTimeNewsData.readingNumber }}</p>-->
                 <p>发布日期：{{ nowTimeNewsData.publishTime }}</p>
                 <p>更新时间：{{nowTimeNewsData.updateTime}}</p>
               </div>
@@ -74,7 +74,6 @@ const column  =ref([])
 const CategoryList = async () => {
   const res = await queryCategory()
   column.value = res.data
-  console.log('栏目数组长度：',column.value.length)
   // 初始化时加载第一个栏目的第一条新闻
   if (column.value.length > 0) {
     await EssayList(column.value[0].id);
@@ -88,7 +87,7 @@ onMounted(() => {
 })
 const essay = ref([])
 const nowTimeNewsData = ref({})
-
+console.log(nowTimeNewsData,'dsdsd')
 //新闻文章查询
 const EssayList = async (id)=>{
   const response = await queryEssay(id)