Merge branch 'hurx'

src/views/home/index-dataDiy.vue

@@ -166,19 +166,19 @@
           <JDUserPanel :userInfo="userInfo" />
           <div class="purchase-classroom">
             <div class="classroom-header">
-              <span class="classroom-title">采购课堂</span>
+              <span class="classroom-title">企业公告</span>
               <span class="classroom-more"></span>
             </div>
-            <div class="classroom-content" @click="onPath('/solve/real?id=' + announcement.id)">
+            <div class="classroom-content" @click="onPath('/enterprise/messageNotice')">
               <div class="classroom-time">
                 <span class="c-year">{{ announcement.yearAndWeek?.yearField }}</span>
                 <span class="c-week">{{ announcement.yearAndWeek?.weekField }}</span>
               </div>
               <div class="classroom-info">
-                <p class="c-desc">{{ announcement.announcementTitle }}</p>
+                <p class="c-desc">{{ announcement.title }}</p>
               </div>
               <div class="classroom-cover">
-                <img :src="announcement.coverImage" alt="课程封面" />
+                <img :src="announcement.coverUrl" alt="公告封面" />
               </div>
             </div>
           </div>
@@ -213,7 +213,7 @@ import workbench6 from '@/assets/images/layout/workbench6.png';
 import workbench7 from '@/assets/images/layout/workbench7.png';
 import { cartStore } from '@/store/modules/cart';
 import { getWorkbenchMenuList } from '@/api/pc/system/index';
-import { getAnnouncementList } from '@/api/pc/system/announcement';
+import { getNewNotice } from '@/api/home/index-enterprise';
 const announcement = ref<any>({});
 const cartStoreData = cartStore();
 const cartCount = computed(() => cartStoreData.cartCount);
@@ -360,12 +360,10 @@ getInfo().then((res) => {
   }
 });
 
-getAnnouncementList({ pageNum: 1, pageSize: 1, isShow: 1 }).then((res) => {
+getNewNotice({}).then((res) => {
   if (res.code == 200) {
-    if (res.rows.length > 0) {
-      announcement.value = res.rows[0];
-      announcement.value.yearAndWeek = getYearAndWeek(announcement.value.createTime);
-    }
+    announcement.value = res.data || {};
+    announcement.value.yearAndWeek = getYearAndWeek(announcement.value.createTime);
   }
 });
 

src/views/home/jdcomponents/JDUserPanel.vue

@@ -90,7 +90,7 @@
         <div class="c-h flex-between">
           <span class="class-title">企业公告</span>
         </div>
-        <div class="class-card flex-between">
+        <div class="class-card flex-between" @click="onPath('/enterprise/messageNotice')">
           <div class="class-left-info">
             <span class="week-tag">{{ formatWeek(noticeData.createTime) || '' }}</span>
             <p class="class-desc">{{ noticeData.title || '' }}</p>