diff --git a/components/AppFooter.vue b/components/AppFooter.vue
index 9838b73..bb4eb88 100644
--- a/components/AppFooter.vue
+++ b/components/AppFooter.vue
@@ -4,14 +4,43 @@
     <div class="text-wrapper_13 flex-row">
       <div class="fly1s" style="margin-top: 40px;">
         <div class="db-flex">
-          <div class="b1">中央人民政府</div>
+          <div class="b1" @click="openT()">中央人民政府</div>
           <div style="display: flex;">
             <div class="b1" style="padding: 0;">
-              <select style="width: 100%;height: 41px;padding-left:15px;">
-                <option value="1">省级共青团网站</option>
-                <option value="2">省级共青团网站</option>
-                <option value="3">省级共青团网站</option>
-                <option value="4">省级共青团网站</option>
+              <select @change="getSelect" style="width: 100%;height: 41px;padding-left:15px;">
+                <option value="0">省级共青团网站</option>
+                <option value="http://www.bjyouth.gov.cn/">北京</option>
+                <option value="http://www.youthtj.org.cn/">天津</option>
+                <option value="http://www.54heb.org.cn/">河北</option>
+                <option value="http://www.sxccyl.gov.cn/">山西</option>
+                <option value="http://www.nmyouth.org.cn/">内蒙古</option>
+                <option value="http://www.liaoninggqt.org.cn/">辽宁</option>
+                <option value="http://www.jl54.org/">吉林</option>
+                <option value="http://www.hljgqt.gov.cn/">黑龙江</option>
+                <option value="https://www.shyouth.net/html/1/index.html">上海</option>
+                <option value="http://www.jiangsugqt.org/">江苏</option>
+                <option value="https://www.zjgqt.org/">浙江</option>
+                <option value="http://www.ahyouth.org.cn/base/">安徽</option>
+                <option value="http://www.fjcyl.com/">福建</option>
+                <option value="http://www.jxyouth.org.cn/">江西</option>
+                <option value="http://www.sdyl.gov.cn/">山东</option>
+                <option value="http://www.hnyouth.org.cn/">河南</option>
+                <option value="http://www.hbgqt.org.cn/">湖北</option>
+                <option value="https://www.hngqt.org.cn/">湖南</option>
+                <option value="https://www.gdcyl.org/Index.html">广东</option>
+                <option value="http://www.gxgqt.org.cn/">广西</option>
+                <option value="http://www.hngqt.cn/">海南</option>
+                <option value="http://www.cqyl.org.cn/">重庆</option>
+                <option value="http://scgqt.gov.cn/home/">四川</option>
+                <option value="http://www.gzyouth.cn/">贵州</option>
+                <option value="http://www.yngqt.org.cn/">云南</option>
+                <option value="https://youth.xzdw.gov.cn/">西藏</option>
+                <option value="https://www.sxgqt.org.cn/">陕西</option>
+                <option value="https://www.gsgqt.gov.cn/">甘肃</option>
+                <option value="https://www.qhgqt.org.cn/index.html">青海</option>
+                <option value="https://www.nxgqt.org/">宁夏</option>
+                <option value="https://www.ts.cn/zxpd/zt3511/tw/index.html">新疆</option>
+                <option value="http://tw.xjbt.gov.cn/">新疆生产建设兵团</option>
               </select>
             </div>
             <div>
@@ -144,6 +173,17 @@
 
 <script lang="ts" setup>
 const selectValue = ref(false);
+const getSelect = (event: Event) => {
+  var url = event.target.value;
+  if (url == 0) {
+    return;
+  }else{
+    window.open(url);
+  }
+}
+const openT = ()=>{
+  window.open('https://www.gov.cn/');
+}
 </script>
 
 <style lang="scss" scoped>
@@ -241,10 +281,12 @@ const selectValue = ref(false);
   .db-flex {
     gap: 10px;
   }
-  .b1{
+
+  .b1 {
     width: 180px;
   }
-  .image_29{
+
+  .image_29 {
     margin-right: 0px;
   }
 }
diff --git a/components/AppHome.vue b/components/AppHome.vue
index b25016e..1dcd6fd 100644
--- a/components/AppHome.vue
+++ b/components/AppHome.vue
@@ -135,23 +135,8 @@
                     </div>
                     <div class="qn"
                         style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 15px; margin-top: 20px;">
-                        <div>
-                            <img :src="`/img/home/1.png`" alt=""></img>
-                        </div>
-                        <div>
-                            <img :src="`/img/home/2.png`" alt=""></img>
-                        </div>
-                        <div>
-                            <img :src="`/img/home/3.png`" alt=""></img>
-                        </div>
-                        <div>
-                            <img :src="`/img/home/4.png`" alt=""></img>
-                        </div>
-                        <div>
-                            <img :src="`/img/home/5.png`" alt=""></img>
-                        </div>
-                        <div>
-                            <img :src="`/img/home/6.png`" alt=""></img>
+                        <div v-for="item in fwImg" @click="openWeb(item)">
+                            <img :src="item.image" alt=""></img>
                         </div>
                     </div>
                 </div>
@@ -345,6 +330,17 @@ const toSearch = () => {
     // });
     window.open(`/search_info?type=1&keywords=${inputSearch.value}`)
 }
+
+const openWeb = (item) =>{
+    //out 外链   in内部
+    if(item.type=='out'){
+        window.open(item.url);
+    }else{
+        window.open(`/info/${item.url}?type=1`)
+    }
+    console.log(item)
+}
+
 // 查看更多
 const toMore = (index:number) => {
     emit('toSwpe', index);
@@ -441,13 +437,19 @@ const getNewstypeList = async () => {
 
 //逐梦新声轮播图
 const getxsImg = async () => {
-    const res = await $api.get('/api/index/images?page=1&limit=3')
+    const res = await $api.get('/api/index/images?page=1&limit=9&status=1')
     xsImg.value = res.data.data.list;
 }
-
+const fwImg = ref([]);
+//服务青年轮播图
+const getFwImg = async () => {
+    const res = await $api.get('/api/index/images?page=1&limit=9&status=2')
+    fwImg.value = res.data.data.list;
+}
 onMounted(() => {
     window.addEventListener('scroll', hmScroll);
     getxsImg();
+    getFwImg();
     getNewstypeList();
 })
 const changeListIndex = async (id: number) => {
diff --git a/components/AppLuoYang.vue b/components/AppLuoYang.vue
index 773a181..c7b6abf 100644
--- a/components/AppLuoYang.vue
+++ b/components/AppLuoYang.vue
@@ -40,16 +40,15 @@
                             </div>
                         </div>
                         <div style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 15px;">
-                            <div v-for="item in 9" class="ly_list" @mousemove="showCodeDo(item)"
+                            <div v-for="item in MesList" class="ly_list" @mousemove="showCodeDo(item)"
                                 @click="showCodeDo(item)">
                                 <div>
-                                    <img class="ly_list_img" :src="`/img/d.png`">
-                                    <div class="ly_list_text">
-                                        洛阳市共青团:抖音</div>
+                                    <img class="ly_list_img" :src="item.image">
+                                    <div class="ly_list_text">{{item.title }}</div>
                                 </div>
                                 <div v-if="showCode == item"
                                     style="display: flex;justify-content: center;align-items: center;position: absolute;bottom: 0;left: 0;right: 0;width: 100%;height:100%;background: rgba(0,0,0,0.5);">
-                                    <img class="ly_list_img_act" :src="`/img/dycode.jpg`">
+                                    <img class="ly_list_img_act" :src="item.qrimage">
                                 </div>
                             </div>
                         </div>
@@ -57,7 +56,17 @@
                 </div>
 
             </div>
-
+            <div class="flex flex-row justify-center pages_tsw" style="margin-top: 20px;">
+                <n-pagination v-model:page="page" :page-sizes="[9]" :item-count="total" size="medium"
+                    @update:page="getPageList" show-quick-jumper>
+                    <template #goto>
+                        到第
+                    </template>
+                    <template #prefix="{ itemCount }">
+                        共 {{ itemCount }} 条
+                    </template>
+                </n-pagination>
+            </div>
             <AppFooter></AppFooter>
             <!-- 右分享 -->
             <!-- <div style="position: absolute;top: 300px;right:36px;" class="flex flex-col fiximg">
@@ -81,7 +90,7 @@ import $api from '@/service/webRequest'
 import emitter from '@/plugins/emitter'
 const inputSearch = ref('');
 const MesList = ref([]);
-const newsListtyp = ref([{ id: 1, name: '市本级' }, { id: 2, name: '各县（区）' }, { id: 3, name: '市属高校' }, { id: 4, name: '市属企业' }, { id: 5, name: '其它' },]);
+const newsListtyp = ref([]);
 const page = ref(1);
 const total = ref(0);
 const cateid = ref(1);
@@ -90,27 +99,17 @@ const showCode = ref(0);
 const showCodeDo = (id: number) => {
     showCode.value = id;
 }
+const getPageList = async () => {
+    page.value = page.value;
+    getMesList(cateid.value);
+}
 // 信息公开
 onMounted(() => {
     //getMesList();
-    //getNewstypeList();
+    getNewstypeList();
 })
 const emit = defineEmits(['toSwpe'])
 
-//跳转详情
-const openUrl = (id: number) => {
-    window.open(`/info/${id}?type=1`)
-}
-//跳转详情
-// const gotoDetail = (id: number) => {
-//     detailId.value = {
-//         id: id,
-//         type: '1'
-//     };
-//     localStorage.setItem('detailId', JSON.stringify(detailId.value));
-//     emit('toSwpe',6)
-//     emitter.emit('detailId', detailId.value);
-// }
 //搜索
 const toSearch = () => {
     // emit('toSwpe',9);
@@ -120,28 +119,24 @@ const toSearch = () => {
     // });
     window.open(`/search_info?type=1&keywords=${inputSearch.value}`)
 }
-const getPageList = async () => {
-    page.value = page.value;
-    getMesList();
-}
 const getMesList = async (id: number) => {
     cateid.value = id;
     //cateid.value = id ? id : cateid.value;
     // page.value = pagecru ? pagecru : page.value;
-    // const res = await $api.post('/api/home.news/index',
-    //     {
-    //         cate_id: cateid.value,
-    //         limit: 9,
-    //         page: page.value,
-    //         isnews: 1
-    //     }
-    // )
-    // total.value = res.data.data.count;
-    // MesList.value = res.data.data.list;
+    const res = await $api.post('/api/home.media_matrix/index',
+        {
+            cate_id: cateid.value,
+            page: page.value,
+            limit:9
+        }
+    )
+     total.value = res.data.data.count;
+     MesList.value = res.data.data.list;
 }
 const getNewstypeList = async () => {
-    const res = await $api.get('/api/home.news/cate?isnews=1')
+    const res = await $api.get('/api/home.media_matrix/cate')
     newsListtyp.value = res.data.data.list;
+    getMesList(res.data.data.list[0].id);
 }
 </script>
 
@@ -287,6 +282,42 @@ const getNewstypeList = async () => {
     margin: 0 auto;
 }
 
+.pages_tsw {
+    padding:30px 0px 0px 270px;
+    :deep(.n-pagination .n-pagination-item:not(.n-pagination-item--disabled).n-pagination-item--active) {
+        color: #ffffff;
+        background-color: #388FDF;
+        border: 1px solid #388FDF;
+    }
+
+    :deep(.n-pagination .n-pagination-item:not(.n-pagination-item--disabled):hover.n-pagination-item--button) {
+        color: #999999;
+    }
+
+    :deep(.n-pagination .n-pagination-item:not(.n-pagination-item--disabled):hover) {
+        color: #388FDF;
+        // border: 1px solid #388FDF;
+    }
+
+    :deep(.n-pagination .n-pagination-item--active:hover) {
+        color: #ffffff !important;
+        // border: 1px solid #388FDF;
+    }
+
+    :deep(.n-pagination .n-pagination-item) {
+        border: none;
+        width: 42px;
+        height: 30px;
+        font-size: 18px;
+        background: #FFFFFF;
+    }
+
+    :deep(.n-pagination-quick-jumper) {
+        &:after {
+            content: '页'
+        }
+    }
+}
 @media (max-width: 1440px) {
     .top_search {
         width: 920px;
diff --git a/components/AppMessage.vue b/components/AppMessage.vue
index 3bcdd3a..b132ade 100644
--- a/components/AppMessage.vue
+++ b/components/AppMessage.vue
@@ -95,14 +95,14 @@ const detailId = ref(null);
 
 // 信息公开
 onMounted(() => {
-    getMesList();
-    getNewstypeList();
+   // getMesList();
+   // getNewstypeList();
 })
 const emit = defineEmits(['toSwpe'])
 
 //跳转详情
 const openUrl = (id: number) => {
-    window.open(`/info/${id}?type=1`)
+    window.open(`/info/${id}?type=2`)
 }
 //跳转详情
 // const gotoDetail = (id: number) => {
diff --git a/components/AppRegiment.vue b/components/AppRegiment.vue
index 3a56f2e..dc1a36e 100644
--- a/components/AppRegiment.vue
+++ b/components/AppRegiment.vue
@@ -25,24 +25,9 @@
                     <div style="margin-top: 25px;">
                         <div class="qn"
                             style="display: grid; grid-template-columns: repeat(3, 1fr); gap: 15px; margin-top: 20px;">
-                            <div>
-                                <img :src="`/img/home/1.png`" alt=""></img>
-                            </div>
-                            <div>
-                                <img :src="`/img/home/2.png`" alt=""></img>
-                            </div>
-                            <div>
-                                <img :src="`/img/home/3.png`" alt=""></img>
-                            </div>
-                            <div>
-                                <img :src="`/img/home/4.png`" alt=""></img>
-                            </div>
-                            <div>
-                                <img :src="`/img/home/5.png`" alt=""></img>
-                            </div>
-                            <div>
-                                <img :src="`/img/home/6.png`" alt=""></img>
-                            </div>
+                            <div style="cursor: pointer;" v-for="item in fwImg" @click="openWeb(item)">
+                            <img :src="item.image" alt=""></img>
+                        </div>
                         </div>
                     </div>
                     <div style="margin-top: 50px;">
@@ -69,17 +54,17 @@
                                     </div>
                                 </div>
                                 <div style="width: 100%;height: 1px;background-color: #EEEEEE;"></div>
-                                <div v-for="(item, index) in 7" :key="index">
-                                    <div class="re_box_item">
+                                <div v-for="(item, index) in MesList" :key="index">
+                                    <div class="re_box_item" @click="openUrl(item.id)">
                                         <div class="re_title">
                                             <div class="flex align-center">
                                                 <div class="dian"></div>
-                                                <span class="one-line-ellipsis rm-span">习近平：推进中习近平：推进中国式现代化要继续把制造业搞好国式现代化要继续把制造业搞好</span>
+                                                <span class="one-line-ellipsis rm-span">{{ item.title }}</span>
                                             </div>
-                                            <span class="one-line-ellipsis" style="color: #999999;">05-26</span>
+                                            <span class="one-line-ellipsis" style="color: #999999;">{{ item.release_time_text.slice(5, 10) }}</span>
                                         </div>
                                     </div>
-                                    <div v-if="index != 6"
+                                    <div v-if="index < MesList.length-1"
                                         style="width: 95%;height: 1px;background-color: #EEEEEE;margin: 0 auto;"></div>
                                 </div>
                             </div>
@@ -102,16 +87,16 @@
                                     </div>
                                 </div>
                                 <div style="width: 100%;height: 1px;background-color: #EEEEEE;"></div>
-                                <div v-for="(item, index) in 7" :key="index">
-                                    <div class="re_box_item">
+                                <div v-for="(item, index) in YwList" :key="index">
+                                    <div class="re_box_item" @click="openUrl(item.id)">
                                         <div class="re_title">
                                             <div class="flex align-center">
                                                 <div class="dian"></div>
-                                                <span class="one-line-ellipsis gw-span">中国共产主义青年团的性质是什么中国共产主义青年团的性质是什么?</span>
+                                                <span class="one-line-ellipsis gw-span">{{ item.title}}</span>
                                             </div>
                                         </div>
                                     </div>
-                                    <div v-if="index != 6"
+                                    <div v-if="index < YwList.length-1"
                                         style="width: 95%;height: 1px;background-color: #EEEEEE;margin: 0 auto;"></div>
                                 </div>
                             </div>
@@ -145,7 +130,7 @@ import $api from '@/service/webRequest'
 import emitter from '@/plugins/emitter'
 const inputSearch = ref('');
 const MesList = ref([]);
-const newsListtyp = ref([{ id: 1, name: '市本级' }, { id: 2, name: '各县（区）' }, { id: 3, name: '市属高校' }, { id: 4, name: '市属企业' }, { id: 5, name: '其它' },]);
+const newsListtyp = ref([]);
 const page = ref(1);
 const total = ref(0);
 const cateid = ref(1);
@@ -156,9 +141,26 @@ const showCodeDo = (id: number) => {
 }
 // 信息公开
 onMounted(() => {
-    //getMesList();
+    getFwImg();
+    getMesList();
+    getYwList();
     //getNewstypeList();
 })
+const fwImg = ref([]);
+//服务青年轮播图
+const getFwImg = async () => {
+    const res = await $api.get('/api/index/images?page=1&limit=9&status=2')
+    fwImg.value = res.data.data.list;
+}
+const openWeb = (item) =>{
+    //out 外链   in内部
+    if(item.type=='out'){
+        window.open(item.url);
+    }else{
+        window.open(`/info/${item.url}?type=1`)
+    }
+    console.log(item)
+}
 const emit = defineEmits(['toSwpe'])
 
 const toMore = () => {
@@ -167,7 +169,7 @@ const toMore = () => {
 
 //跳转详情
 const openUrl = (id: number) => {
-    window.open(`/info/${id}?type=1`)
+    window.open(`/info/${id}?type=3`)
 }
 //跳转详情
 // const gotoDetail = (id: number) => {
@@ -188,24 +190,26 @@ const toSearch = () => {
     // });
     window.open(`/search_info?type=1&keywords=${inputSearch.value}`)
 }
-const getPageList = async () => {
-    page.value = page.value;
-    getMesList();
+const getMesList = async () => {
+    const res = await $api.post('/api/home.encyclopedia/index',
+        {
+            cate_id:'102',
+            limit: 7,
+            page: 1,
+        }
+    )
+     MesList.value = res.data.data.list;
 }
-const getMesList = async (id: number) => {
-    cateid.value = id;
-    //cateid.value = id ? id : cateid.value;
-    // page.value = pagecru ? pagecru : page.value;
-    // const res = await $api.post('/api/home.news/index',
-    //     {
-    //         cate_id: cateid.value,
-    //         limit: 9,
-    //         page: page.value,
-    //         isnews: 1
-    //     }
-    // )
-    // total.value = res.data.data.count;
-    // MesList.value = res.data.data.list;
+const YwList =ref([]);
+const getYwList  = async () => {
+    const res = await $api.post('/api/home.encyclopedia/index',
+        {
+            cate_id:'103',
+            limit: 7,
+            page: 1,
+        }
+    )
+    YwList.value = res.data.data.list;
 }
 const getNewstypeList = async () => {
     const res = await $api.get('/api/home.news/cate?isnews=1')
diff --git a/pages/info/[id].vue b/pages/info/[id].vue
index 45c803e..dc024cc 100644
--- a/pages/info/[id].vue
+++ b/pages/info/[id].vue
@@ -22,8 +22,14 @@
                     <div>
                         <img :src="`/img/key.png`" style="width: 22px;height: 22px;">
                     </div>
-                    <div style="font-size: 18px;color: #323232;margin-left: 10px;">当前位置：首页 > 团务百科 > <span
-                            style="color: #3B90DF;">文章详情</span></div>
+                    <div v-if="Newsdetail != null" style="font-size: 18px;color: #323232;margin-left: 10px;">
+                        <div class='re_mian'>
+                            <span>{{ title_left }}</span>
+                            <span> > </span>
+                            <span v-if="Newsdetail.cate != null">{{ Newsdetail.cate.name }}</span>
+                            <span v-if="Newsdetail.cate != null"> > </span>
+                            <span style="color: rgb(59, 144, 223);">文章详情</span></div>
+                    </div>
                 </div>
             </div>
             <div class="News_box  h-auto">
@@ -32,8 +38,8 @@
 
                     <div class="re_box">
                         <div class="re_box_item" v-if="Newsdetail != null && Newsdetail.type == 1">
-                            <div class='re_mian' v-if="Newsdetail.cate != null">{{ title_left + ' > ' +
-                                Newsdetail.cate.name + ' > ' + '正文内容' }} </div>
+                            <!-- <div class='re_mian' v-if="Newsdetail.cate != null">{{ title_left + ' > ' +
+                                Newsdetail.cate.name + ' > ' + '正文内容' }} </div> -->
                             <div class="re_title">{{ Newsdetail.title }}</div>
                             <div class='flex justify-between re_rouse'>
                                 <span>{{ Newsdetail.release_time_text }}</span>
@@ -379,7 +385,6 @@ onMounted(() => {
                     font-weight: 500;
                     font-size: 28px;
                     color: #393939;
-                    margin-top: 10px;
                 }
 
                 .re_content {
diff --git a/pages/messageBoard/index.vue b/pages/messageBoard/index.vue
index 360c7d9..17791b4 100644
--- a/pages/messageBoard/index.vue
+++ b/pages/messageBoard/index.vue
@@ -64,7 +64,7 @@
 
             </div>
             <div class="flex flex-row justify-center pages_tsw" style="margin-top: 20px;">
-                <n-pagination v-model:page="page" :page-sizes="[7]" :item-count="total" size="medium"
+                <n-pagination v-model:page="page" :page-sizes="[9]" :item-count="total" size="medium"
                     @update:page="getPageList" show-quick-jumper>
                     <template #goto>
                         到第
@@ -101,19 +101,19 @@ const MesList = ref([]);
 const newsListtyp = ref([]);
 const page = ref(1);
 const total = ref(0);
-const cateid = ref(null);
+const cateid = ref(0);
 const detailId = ref(null);
 
 // 信息公开
 onMounted(() => {
-    getMesList();
+    //getMesList();
     getNewstypeList();
 })
 const emit = defineEmits(['toSwpe'])
 
 //跳转详情
 const openUrl = (id: number) => {
-    window.open(`/info/${id}?type=1`)
+    window.open(`/info/${id}?type=3`)
 }
 //跳转详情
 // const gotoDetail = (id: number) => {
@@ -136,12 +136,12 @@ const toSearch = () => {
 }
 const getPageList = async () => {
     page.value = page.value;
-    getMesList();
+    getMesList(cateid.value);
 }
-const getMesList = async (id: number, pagecru: number) => {
-    cateid.value = id ? id : cateid.value;
-    page.value = pagecru ? pagecru : page.value;
-    const res = await $api.post('/api/home.news/index',
+const getMesList = async (id: number) => {
+    cateid.value = id;
+    //page.value = pagecru ? pagecru : page.value;
+    const res = await $api.post('/api/home.encyclopedia/index',
         {
             cate_id: cateid.value,
             limit: 9,
@@ -153,8 +153,9 @@ const getMesList = async (id: number, pagecru: number) => {
     MesList.value = res.data.data.list;
 }
 const getNewstypeList = async () => {
-    const res = await $api.get('/api/home.news/cate?isnews=1')
+    const res = await $api.get('/api/home.encyclopedia/cate')
     newsListtyp.value = res.data.data.list;
+    getMesList(res.data.data.list[0].id);
 }
 </script>
 
diff --git a/public/img/d.png b/public/img/d.png
deleted file mode 100644
index 217bc9f..0000000
Binary files a/public/img/d.png and /dev/null differ
diff --git a/public/img/home/1.png b/public/img/home/1.png
deleted file mode 100644
index c068ab2..0000000
Binary files a/public/img/home/1.png and /dev/null differ
diff --git a/public/img/home/2.png b/public/img/home/2.png
deleted file mode 100644
index 6ea3bb3..0000000
Binary files a/public/img/home/2.png and /dev/null differ
diff --git a/public/img/home/3.png b/public/img/home/3.png
deleted file mode 100644
index 39237e9..0000000
Binary files a/public/img/home/3.png and /dev/null differ
diff --git a/public/img/home/4.png b/public/img/home/4.png
deleted file mode 100644
index daedb4c..0000000
Binary files a/public/img/home/4.png and /dev/null differ
diff --git a/public/img/home/5.png b/public/img/home/5.png
deleted file mode 100644
index 6b1a1d2..0000000
Binary files a/public/img/home/5.png and /dev/null differ
diff --git a/public/img/home/6.png b/public/img/home/6.png
deleted file mode 100644
index e70b03a..0000000
Binary files a/public/img/home/6.png and /dev/null differ