📦 按要求修改

server/api/ecms/channel/nav.ts

@@ -8,6 +8,8 @@ export default defineEventHandler<EventHandlerRequest, Promise<IResponse<IChanne
     return createSuccessResponse(await DB.table('pr_cms_channel')
             .where('status', 'normal')
             .where('isnav', 1)
+            .orderBy('weigh', 'desc')
+            .orderBy('id', 'asc')
             .select('*')
             .get());
   } catch (error) {

server/api/ecms/channel/sitemap.ts

@@ -16,6 +16,7 @@ export default defineEventHandler<EventHandlerRequest, Promise<IResponse<(IChann
     const navs = await DB.table('pr_cms_channel')
       .where('status', 'normal')
       .where('isnav', 1)
+      .orderBy('weigh', 'desc')
       .select('*')
       .get()
 
@@ -23,6 +24,7 @@ export default defineEventHandler<EventHandlerRequest, Promise<IResponse<(IChann
       const childs = await DB.table('pr_cms_channel')
         .where('status', 'normal')
         .where('parent_id', nav.id)
+        .orderBy('weigh', 'desc')
         .select('*')
         .get();
       result.push({

src/assets/scss/main.scss

@@ -583,7 +583,7 @@ nav.main-nav {
 }
 .featured-grid {
   display: grid;
-  grid-template-columns: repeat(3, 1fr);
+  grid-template-columns: repeat(4, 1fr);
   gap: 20px;
 }
 .featured-card {

src/components/Footer.vue

@@ -2,9 +2,7 @@
   <!-- 底部 -->
   <footer>
     <div class="container">
-      <div class="row d-flex flex-row justify-content-between">
-        <div class="col d-none d-lg-block col-lg-4">
-        </div>
+      <div class="row d-flex flex-row justify-content-center">
         <div class="col col-sm-12 col-md-6 col-lg-4">
           <div class="footer-select">
             <select name="related-links-superior" id="related-links-superior" @change="handleLinkChange">
@@ -48,9 +46,6 @@
             <p>联系电话: {{ footerInfo.contactPhone }} | 工作电话: {{ footerInfo.workPhone }}</p>
           </div>
         </div>
-        <div class="col col-sm-12 col-md-6 col-lg-4 position-relative d-flex justify-content-end">
-          <img src="@/assets/images/juzhen.jpg" alt="新媒体矩阵" class="media-matrix">
-        </div>
       </div>
     </div>
   </footer>

src/pages/index.vue

@@ -56,6 +56,16 @@
                 <Pagination />
               </template>
             </Carousel>
+
+            <!-- 学习强国 -->
+            <div class="d-flex flex-row justify-content-between">
+              <a href="http://cpc.people.com.cn/GB/67481/448544/index.html" class="w-50">
+                <img src="https://wlj.xm.gov.cn/ztzl/202211/W020221213510920336898.jpg" class="mt-3" style="width: 100%; height:130px;object-fit:cover;" /> 
+              </a>
+              <a href="https://www.12371.cn/special/xxzd/" class="w-50">
+                <img src="@/assets/images/xuexi.png" class="mt-3" style="width: 100%; height:130px;object-fit:cover;" /> 
+              </a>
+            </div>
           </div>
 
           <div class="d-flex flex-column col col-sm-12 col-md-6 col-lg-6 notices-list">
@@ -91,22 +101,37 @@
                 </div>
               </SimplePageContentLoader>
             </div>
-
-            <!-- 学习强国 -->
-            <div class="d-flex flex-row justify-content-between">
-              <a href="http://cpc.people.com.cn/GB/67481/448544/index.html" class="w-50">
-                <img src="https://wlj.xm.gov.cn/ztzl/202211/W020221213510920336898.jpg" class="mt-3" style="width: 100%; height:130px;object-fit:cover;" /> 
-              </a>
-              <a href="https://www.12371.cn/special/xxzd/" class="w-50">
-                <img src="@/assets/images/xuexi.png" class="mt-3" style="width: 100%; height:130px;object-fit:cover;" /> 
-              </a>
-            </div>
           </div>
         </div>
 
         <!-- 工作动态和党建工作 -->
         <div class="row mt-lg-3 mt-md-2 mt-sm-2">
 
+
+          <div class="col col-sm-12 col-md-4 col-lg-3 d-flex flex-column">
+            
+            <Carousel v-bind="carouselConfig">
+              <Slide 
+                v-for="(item, key) in carousel2Data.content.value"
+                :key="key"
+                class="featured-image bg-secondary"
+                :style="{ 'background-image': `url(${item.image})`, 'background-size': 'cover' }"
+              >
+                <img 
+                  :src="item.image" style="width: 100%; height: 100%; object-fit: contain;"
+                  @click="handleImageClick(item)"
+                >
+              </Slide>
+              <template #addons>
+                <Navigation />
+                <Pagination />
+              </template>
+            </Carousel>
+
+            <div class="main-box mt-lg-3 mt-md-2 mt-sm-2 flex-fill">
+
+            </div>
+          </div>
           <div class="col col-sm-12 col-md-8 col-lg-9">
             <!-- 工作动态 -->
             <div class="main-box">
@@ -144,6 +169,12 @@
                 </SimplePageContentLoader>
               </div>
             </div>
+          </div>
+        </div>
+
+        <!-- 精彩推荐 -->
+        <div class="row mt-lg-3 mt-md-2 mt-sm-2">
+          <div class="col col-12">
             <!-- 精彩推荐 -->
             <div class="main-box mt-lg-3 mt-md-2 mt-sm-2">
               <div class="section-title">
@@ -162,31 +193,6 @@
               </div>
             </div>
           </div>
-
-          <div class="col col-sm-12 col-md-4 col-lg-3 d-flex flex-column">
-            
-            <Carousel v-bind="carouselConfig">
-              <Slide 
-                v-for="(item, key) in carousel2Data.content.value"
-                :key="key"
-                class="featured-image bg-secondary"
-                :style="{ 'background-image': `url(${item.image})`, 'background-size': 'cover' }"
-              >
-                <img 
-                  :src="item.image" style="width: 100%; height: 100%; object-fit: contain;"
-                  @click="handleImageClick(item)"
-                >
-              </Slide>
-              <template #addons>
-                <Navigation />
-                <Pagination />
-              </template>
-            </Carousel>
-
-            <div class="main-box mt-lg-3 mt-md-2 mt-sm-2 flex-fill">
-
-            </div>
-          </div>
         </div>
 
         <hr class="main-hr" />
@@ -296,7 +302,7 @@ const hot = await useSSrSimpleDataLoader('hot', async () => {
 });
 // 精彩推荐数据
 const featured = await useSSrSimpleDataLoader('featured', async () => {
-  const res = await $fetch(`/api/ecms/article/byChannelName?channelName=鹭岛文脉&pageSize=9`);
+  const res = await $fetch(`/api/ecms/article/byChannelName?channelName=鹭岛文脉&pageSize=12`);
   if (!res.status)
     throw new Error(res.message);
   return res.data;