diff --git a/app.vue b/app.vue index ab557d3..afd60ea 100644 --- a/app.vue +++ b/app.vue @@ -76,4 +76,16 @@ select{ appearance:none; } +.mouse_img { + position: absolute; + bottom: 30px; + right: 60px; + width: 150px; +} +@media (max-width: 1440px) { + .mouse_img { + width: 100px; + right: 15px; + } +} diff --git a/components/AppAbout.vue b/components/AppAbout.vue index 582ad78..3c677f3 100644 --- a/components/AppAbout.vue +++ b/components/AppAbout.vue @@ -1,163 +1,215 @@ +} + +@media (max-width: 1440px) { + .top_search { + width: 920px; + margin-left: 373px; + + } + .News_box{ + width: 1032px; + margin-left: 270px; + } + .rig_box{ + width: 700px; + } +} + \ No newline at end of file diff --git a/components/AppContactUs.vue b/components/AppContactUs.vue index 2aaee4f..2b62ee4 100644 --- a/components/AppContactUs.vue +++ b/components/AppContactUs.vue @@ -7,7 +7,7 @@
-
+
-
+
团团留言板
@@ -30,11 +30,11 @@ placeholder="输入您的姓名" /> 电话 邮箱
@@ -52,23 +52,23 @@
精选留言
-
+
- 问题： - {{ item.question }} + 问题： + {{ item.question }}
- 描述： + 描述： {{ item.message + style="font-weight: 400;font-size: 14px;color: #999999;width:85% ;">{{ item.message }}
- 回复： + 回复： {{ item.answer + style="font-weight: 400;font-size: 14px;color: #999999;width:85% ;">{{ item.answer }}
@@ -76,7 +76,7 @@
- + -
+
@@ -174,11 +174,12 @@ const submitForm = () => { /* pc端样式 */ .rightcon { - width:100%; - height:100%; - background-image: url('/img/messageb.png'); + width: 100%; + height: 100%; + background-image: url('/img/index/rightcons.png'); background-size: 100% 100%; - + overflow-y: auto; + overflow-x: hidden; .fiximg { img { margin-bottom: 20px; @@ -191,6 +192,8 @@ const submitForm = () => { height: 70px; justify-content: space-between; align-items: center; + margin-left: 415px; + width: 1200px; } .inputform { @@ -231,7 +234,6 @@ const submitForm = () => { //------------------------------------------ .liuyanba { - width: 1200px; /* height: 22px; */ margin: 0 auto; font-family: Microsoft YaHei UI; @@ -319,7 +321,7 @@ const submitForm = () => { display: flex; justify-content: center; align-items: center; - margin-top: 20px; + margin: 50px 0px 40px 0px; .re_tit { font-family: Microsoft YaHei; @@ -337,12 +339,12 @@ const submitForm = () => { } .re_list { - width: 585px; + width: 50%; height: 243px; margin-top: 20px; background: #FFFFFF; border-radius: 8px; - + .re_list_tit { font-family: Microsoft YaHei; font-weight: bold; @@ -350,4 +352,31 @@ const submitForm = () => { color: #FFA234; } } + +.left-msg { + width: 1300px; + margin: 0 auto; +} + +@media (max-width: 1440px) { + .left-msg { + width: 1018px; + margin: 0; + margin-left: 270px; + } + #myTextarea{ + width: 752px; + } + .contactInputs{ + width: 210px; + } + .inputforms { + display: flex; + justify-content: start!important; + align-items: center; + } + .contactForm .inputforms span{ + width: 41px; + } +} diff --git a/components/AppFooter.vue b/components/AppFooter.vue index 91850f0..9838b73 100644 --- a/components/AppFooter.vue +++ b/components/AppFooter.vue @@ -3,7 +3,7 @@
-
+
中央人民政府
@@ -107,7 +107,7 @@
-

bilibili官方账号

+

bilibili官方

@@ -225,4 +225,27 @@ const selectValue = ref(false); border: 1px solid #EEEEEE; cursor: pointer; } + +.db-flex { + display: flex; + justify-content: space-between; + align-items: center; + gap: 30px; +} + +@media (max-width: 1440px) { + .group_30 { + width: 1000px; + } + + .db-flex { + gap: 10px; + } + .b1{ + width: 180px; + } + .image_29{ + margin-right: 0px; + } +} diff --git a/components/AppHeader.vue b/components/AppHeader.vue index dfdf50d..deff1ba 100644 --- a/components/AppHeader.vue +++ b/components/AppHeader.vue @@ -18,12 +18,12 @@
- + 青春洛阳
- + 服务青年
diff --git a/components/AppHome.vue b/components/AppHome.vue index 655a9ab..7be6652 100644 --- a/components/AppHome.vue +++ b/components/AppHome.vue @@ -48,7 +48,7 @@
- {{ item.title }} + {{ item.title }}
{{ item.release_time_text.slice(5, 10) }} @@ -62,14 +62,13 @@
-
-
-
-
-
{{ item.name }}
- -
+
+
+
+
{{ item.name }}
+
@@ -79,15 +78,15 @@
-
-
+
+
- 习近平：推进中国式现代化要继续把制造业搞好 + {{ item.title }}
- 06-25 + {{ + item.release_time_text.slice(5, 10) }}
-
+
-
+
通知公告
@@ -112,11 +111,11 @@
-
+
- {{ item.title }} + {{ item.title }}
{{ item.release_time_text.slice(5, 10) }} @@ -134,24 +133,25 @@
-
+
- +
- +
- +
- +
- +
- +
@@ -285,7 +285,7 @@ -
+
@@ -305,6 +305,7 @@ const inputSearch = ref(''); const xsImg = ref([]); const listType = ref([]); +const listIndex = ref(0); const detailId = ref(null); const emit = defineEmits(['toSwpe']) @@ -394,24 +395,27 @@ const getNewstypeList = async () => { let ptggid = null, jcdtid = null, qclyid = null, mtjjid = null; // 分类id const res = await $api.get('/api/home.news/cate?home=1') var list = res.data.data.list; + listIndex.value = list[0].id; listType.value = list; list.map((item: any) => { if (item.name == '平台公告') { ptggid = item.id; } - if (item.name == '基层动态') { - jcdtid = item.id; - } + // if (item.name == '基层动态') { + // jcdtid = item.id; + // } - if (item.name == '青春洛阳') { - qclyid = item.id; - } - if (item.name == '媒体聚焦') { - mtjjid = item.id; - } + // if (item.name == '青春洛阳') { + // qclyid = item.id; + // } + // if (item.name == '媒体聚焦') { + // mtjjid = item.id; + // } }); + //去除平台公告 + listType.value = listType.value.filter((item: any) => item.name != '平台公告'); console.log(listType.value); - + changeListIndex(listIndex.value); // xsId.value = listType.value[0].id; //逐梦新声列表 //万众瞩目列表 // const ress = await $api.get(`/api/home.news/index?cate_id=${xsId.value}&page=1&limit=4`) @@ -446,6 +450,11 @@ onMounted(() => { getxsImg(); getNewstypeList(); }) +const changeListIndex = async (id: number) => { + listIndex.value = id; + const ress2 = await $api.get(`/api/home.news/index?cate_id=${id}&page=1&limit=7`) + jcList.value = ress2.data.data.list; +} diff --git a/components/AppLuoYang.vue b/components/AppLuoYang.vue index e3eb9f0..773a181 100644 --- a/components/AppLuoYang.vue +++ b/components/AppLuoYang.vue @@ -1,7 +1,327 @@ + + + diff --git a/components/AppMessage.vue b/components/AppMessage.vue index 4502292..3bcdd3a 100644 --- a/components/AppMessage.vue +++ b/components/AppMessage.vue @@ -1,124 +1,150 @@ diff --git a/components/AppNews.vue b/components/AppNews.vue index da02a05..b0a58f2 100644 --- a/components/AppNews.vue +++ b/components/AppNews.vue @@ -1,85 +1,89 @@ @@ -151,238 +155,285 @@ const getNewstypeList = async () => { /* pc端样式 */ - .rightcon{ - width:100%; - height:100%; - background-image: url('/img/xwdt.png'); - background-size: 100% 100%; - .fiximg{ - img{ - margin-bottom: 20px; +.rightcon { + width: 100%; + height: 100%; + background-image: url('/img/index/rightcons.png'); + background-size: 100% 100%; + overflow-y: auto; + + .fiximg { + img { + margin-bottom: 20px; + } + } +} + +.top_search { + margin-top: 50px; + height: 70px; + justify-content: space-between; + align-items: center; + margin-left: 415px; + width: 1200px; +} + +.inputform { + position: relative; + width: 340px; +} + +.contactInput { + width: 337px; + height: 50px; + background: #FFFFFF; + border-radius: 8px; + border: 1px solid #DEE4E8; + padding-left: 15px; +} + +.contactInput::placeholder { + color: #999999; +} + +.contactInput:focus { + outline: none; +} + +.search_rinput { + width: 68px; + height: 50px; + background: #338CDE; + border-radius: 0px 8px 8px 0px; + position: absolute; + top: 0; + right: 0; + display: flex; + justify-content: center; + align-items: center; +} + +.News_box { + display: flex; + justify-content: space-between; + width: 1300px; + margin: 0 auto; + + .lef_box { + width: 260px; + height: 100%; + margin-top: 40px; + margin-left: 100px; + + .lef_boxitem1 { + width: 260px; + height: 64px; + background: linear-gradient(0deg, #338CDE 0%, #3D92E0 100%); + display: flex; + align-items: center; + justify-content: center; + + // cursor: pointer; + .lef_boxitem1_title { + width: 88px; + // height: 22px; + font-family: Microsoft YaHei UI; + font-weight: bold; + font-size: 22px; + color: #FFFEFE; + } + + .lef_boxitem1_shu { + width: 4px; + height: 25px; + background: #FFFFFF; + margin-right: 20px; + } + } + + .lef_boxitem2 { + width: 260px; + height: 64px; + background: #FFFFFF; + color: #323232; + display: flex; + align-items: center; + margin-top: 10px; + cursor: pointer; + + .lef_boxitem2_title { + width: 100%; + // height: 19px; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 20px; + text-align: center; + } + + &:hover { + background: linear-gradient(0deg, rgba(51, 140, 222, 0.12) 0%, rgba(61, 146, 224, 0.12) 100%); + color: #3A91DF; + + } + + &.active { + background: linear-gradient(0deg, rgba(51, 140, 222, 0.12) 0%, rgba(61, 146, 224, 0.12) 100%); + color: #3A91DF; } } } - .top_search{ - margin-top: 50px; - height: 70px; - justify-content: space-between; - align-items: center; - } - .inputform { - position: relative; - width: 340px; - margin-right: 319px; - } - .contactInput { - width: 337px; - height: 50px; - background: #FFFFFF; - border-radius: 8px; - border: 1px solid #DEE4E8; - padding-left: 15px; - } - .contactInput::placeholder { - color: #999999; - } + .rig_box { + width: 921px; - .contactInput:focus { - outline: none; - } - .search_rinput{ - width: 68px; - height: 50px; - background: #E6E6E6; - border-radius: 0px 8px 8px 0px; - position: absolute; - top: 0; - right: 0; - display: flex; - justify-content: center; - align-items: center; - } - .News_box{ - display: flex; - justify-content: space-between; - width: 1300px; - margin: 0 auto; + .re_box { + width: 100%; + margin: 0 auto; + margin-top: 40px; + // padding-left: 60px; + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + align-content: flex-start; + gap: 10px; - .lef_box{ - width: 260px; - height: 100%; - margin-top:40px; - margin-left: 100px; - .lef_boxitem1{ - width: 260px; - height: 64px; - background: linear-gradient(0deg, #338CDE 0%, #3D92E0 100%); - display: flex; - align-items: center; - justify-content: center; - // cursor: pointer; - .lef_boxitem1_title{ - width: 88px; - // height: 22px; - font-family: Microsoft YaHei UI; - font-weight: bold; - font-size: 22px; - color: #FFFEFE; - } - .lef_boxitem1_shu{ - width: 4px; - height: 25px; - background: #FFFFFF; - margin-right: 20px; - } - } - .lef_boxitem2{ - width: 260px; - height: 64px; + .re_box_item { + width: 100%; + height: 90px; background: #FFFFFF; - color: #323232; + border: 1px solid #EEF7FF; + padding: 20px; + box-sizing: border-box; display: flex; + justify-content: space-between; align-items: center; - margin-top:10px ; - cursor: pointer; - .lef_boxitem2_title{ - width: 100%; - // height: 19px; + + .re_title { + // width: 640px; font-family: Microsoft YaHei; font-weight: 400; - font-size: 20px; - text-align: center; - } - &:hover{ - background: linear-gradient(0deg, rgba(51, 140, 222, 0.12) 0%, rgba(61, 146, 224, 0.12) 100%); - color: #3A91DF; - - } - &.active{ - background: linear-gradient(0deg, rgba(51, 140, 222, 0.12) 0%, rgba(61, 146, 224, 0.12) 100%); - color: #3A91DF; - } - } - } + font-size: 18px; + color: #323232; + display: flex; + align-items: center; - .rig_box{ - width: 921px; - .re_box{ - width: 100%; - height: 680px; - margin: 0 auto; - margin-top:40px; - // padding-left: 60px; - display: flex; - flex-wrap: wrap; - justify-content: flex-start; - align-content: flex-start; - gap: 10px; - .re_box_item{ - width: 100%; - height: 90px; - background: #FFFFFF; - border: 1px solid #EEF7FF; - padding: 20px; - box-sizing: border-box; + .dian { + width: 10px; + height: 10px; + background: #3B90DF; + border-radius: 50%; + margin-right: 15px; + } + } + + .re_date { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 14px; + color: #368BDB; display: flex; justify-content: space-between; align-items: center; - .re_title{ - // width: 640px; - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 18px; - color: #323232; - display: flex; - align-items: center; - .dian{ - width: 10px; - height: 10px; - background: #3B90DF; - border-radius: 50%; - margin-right: 15px; - } + + .shu { + background: #EEEEEE; + width: 1px; + height: 50px; + margin-right: 20px; } - .re_date{ - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 14px; - color: #368BDB; + + .right_tex { display: flex; - justify-content: space-between; - align-items: center; - .shu{ - background: #EEEEEE; - width: 1px;height: 50px; - margin-right: 20px; + flex-direction: column; + width: 80px; + text-align: center; + + .span1 { + width: 100%; + font-family: Microsoft YaHei; + font-weight: 600; + font-size: 22px; + color: #378EDF; } - .right_tex{ - display: flex; - flex-direction: column; - width: 80px; - text-align: center; - .span1{ - width: 100%; - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 22px; - color: #378EDF; - } - .span2{ - width: 100%; - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 16px; - color: #378EDF; - } - } - } - &:hover{ - background-image: url('/img/message/listbg.png'); - background-size: 100% 100%; - cursor: pointer; - .re_date{ - .shu{ - background: #FFFFFF; - } + + .span2 { + width: 100%; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #378EDF; } } } - } - .pages_tsw{ - :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; - } + &:hover { + background-image: url('/img/listbg.png'); + background-size: 100% 100%; + cursor: pointer; - :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: '页' + .re_date { + .shu { + background: #FFFFFF; + } + } } } } + + } +} + +.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; + margin-left: 373px; + + } + + .News_box { + width: 1032px; + margin-left: 270px; + } + + .rig_box { + width: 650px !important; + } +} diff --git a/components/AppRegiment.vue b/components/AppRegiment.vue index 2af65e0..8cabdcc 100644 --- a/components/AppRegiment.vue +++ b/components/AppRegiment.vue @@ -1,133 +1,213 @@ @@ -137,173 +217,192 @@ const hmScroll = () => { /* pc端样式 */ - .rightcon{ - width:100%; - height:100%; - background-image: url('/img/twbk.png'); - background-size: 100% 100%; - overflow-y: auto; - .fiximg{ - .imgs{ - width: 63px; - margin-bottom: 20px; - } +.rightcon { + width: 100%; + height: 100%; + background-image: url('/img/index/rightcons.png'); + background-size: 100% 100%; + overflow-y: auto; + + .fiximg { + img { + margin-bottom: 20px; } } - .top_search{ - margin-top: 50px; - height: 70px; +} + +.top_search { + margin-top: 50px; + height: 70px; + justify-content: space-between; + align-items: center; + margin-left: 415px; + width: 1200px; +} + +.inputform { + position: relative; + width: 340px; +} + +.contactInput { + width: 337px; + height: 50px; + background: #FFFFFF; + border-radius: 8px; + border: 1px solid #DEE4E8; + padding-left: 15px; +} + +.contactInput::placeholder { + color: #999999; +} + +.contactInput:focus { + outline: none; +} + +.search_rinput { + width: 68px; + height: 50px; + background: #338CDE; + border-radius: 0px 8px 8px 0px; + position: absolute; + top: 0; + right: 0; + display: flex; + justify-content: center; + align-items: center; +} + +.News_box { + width: 1300px; + margin: 0 auto; + + .lef_box { + height: 100%; + margin-top: 40px; + margin-left: 100px; + + } +} + +.le1 { + color: #338CDE; + font-family: PingFang SC; + font-size: 22px; + font-weight: 800; + width: 261px; + height: 65px; + line-height: 65px; + text-align: center; + margin-bottom: 20px; + cursor: pointer; + border: 1px solid #338CDE; + background-image: url('/img/ly_listbg.png'); + background-size: 100% 100%; +} + +.le2 { + color: #323232; + font-family: PingFang SC; + font-size: 22px; + font-weight: 400; + width: 261px; + height: 65px; + background-color: #ffffff; + line-height: 65px; + text-align: center; + margin-bottom: 20px; + cursor: pointer; + border: 1px solid transparent; +} + +.le2:hover { + border: 1px solid #338CDE; +} + +.ly_list { + width: 298px; + height: 298px; + background-color: #ffffff; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; + position: relative; +} + +.re_box_item { + width: 100%; + padding: 15px; + box-sizing: border-box; + display: flex; + justify-content: space-between; + align-items: center; + + .re_title { + width: 100%; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #323232; + display: flex; + align-items: center; justify-content: space-between; - align-items: center; - } - .inputform { - position: relative; - width: 340px; - margin-right: 319px; - } - .contactInput { - width: 337px; - height: 50px; - background: #FFFFFF; - border-radius: 8px; - border: 1px solid #DEE4E8; - padding-left: 15px; + cursor: pointer; + + .dian { + width: 10px; + height: 10px; + background: #3B90DF; + border-radius: 50%; + margin-right: 15px; + } } - .contactInput::placeholder { - color: #999999; + // &:hover{ + // background-image: url('/img/index/listhmbg.png'); + // background-size: 100% 100%; + // cursor: pointer; + // .slices_rol{ + // width: 10px; + // height: 88px; + // background: #FAA828; + // position: absolute; + // right: 0; + // } + // } + +} + +.rm-span { + width: 550px; +} +.gw-span{ + width: 350px; +} +@media (max-width: 1440px) { + .top_search { + width: 920px; + margin-left: 373px; + } - .contactInput:focus { - outline: none; + .News_box { + width: 1032px; + margin-left: 270px; } - .search_rinput{ - width: 68px; - height: 50px; - background: #E6E6E6; - border-radius: 0px 8px 8px 0px; - position: absolute; - top: 0; - right: 0; - display: flex; - justify-content: center; - align-items: center; - } - .re_top{ - width: 100%; - height: 40px; - display: flex; - justify-content: center; - align-items: center; - margin-top: 20px; - .re_tit{ - font-family: Microsoft YaHei; - font-weight: bold; - font-size: 36px; - color: #4E3C3C; - margin: 0 30px; - } - .re_col{ - width: 78px; - height: 3px; - background: #348CDD; - } - } - .re_box{ - width: 1280px; - // height: 600px; - margin: 0 auto; - margin-top:40px; - padding-left: 80px; - display: flex; - flex-wrap: wrap; /* 允许换行 */ - justify-content: flex-start; /* 项目左对齐 */ - // align-items: flex-start; - align-content: flex-start; - gap: 20px; - .re_box_item{ - width: 32%; - // height: 190px; - background: #FFFFFF; - border: 1px solid #EEF7FF; - padding: 20px; - box-sizing: border-box; - cursor: pointer; - .re_title{ - // width: 100%; - font-family: Microsoft YaHei; - font-weight: bold; - font-size: 18px; - color: #323232; - - } - .re_text{ - height: 62px; - margin-top: 15px; - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 14px; - color: #999999; - } - .re_date{ - margin-top: 15px; - font-family: Microsoft YaHei; - font-weight: 400; - font-size: 14px; - color: #368BDB; - display: flex; - justify-content: space-between; - align-items: center; - .re_more{ - display: flex; - align-items: center; - .re_more_img{ - padding-left: 10px; - // width: 7px; - height: 10px; - } - } - } - - } - &:after { - content: ""; - width: 100%; - height: 0; - margin-top: -20px; - } - } - .pages_tsw{ - :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: '页' - } - } + .rig_box { + width: 700px; } + + .rm-span { + width: 450px; + } + .gw-span{ + width:280px; +} +} diff --git a/pages/index.vue b/pages/index.vue index 290f78e..838dec9 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -36,13 +36,14 @@ - - - - + + + + + -
+
@@ -137,7 +138,7 @@ const { locale } = useI18n(); const openUrl = () => { window.open(`/messageBoard/`) } -const rightValue = ref('34px'); +const rightValue = ref('100px'); const updateRight = () => { if (rightValue.value == '34px') { rightValue.value = '-94px'; @@ -157,18 +158,20 @@ const onSwiperNews = (swiper: any) => { // isMeassage.value = false; // console.log(newsSwiper); swiper_exp.value = swiper.realIndex; - if (swiper.realIndex == 1 || swiper.realIndex == 5) { - newsSwiper.mousewheel.disable(); - newsSwiper.allowTouchMove = true;// 开启拖动 - } + newsSwiper.mousewheel.disable(); + newsSwiper.allowTouchMove = true;// 开启拖动 + // if (swiper.realIndex == 1 || swiper.realIndex == 5 || swiper.realIndex == 2 || swiper.realIndex == 3 || swiper.realIndex == 4 || swiper.realIndex == 6) { + // newsSwiper.mousewheel.disable(); + // newsSwiper.allowTouchMove = true;// 开启拖动 + // } // else if (swiper.realIndex == 6 || swiper.realIndex == 9 || swiper.realIndex == 7 || swiper.realIndex == 8) { // newsSwiper.mousewheel.disable(); //禁止鼠标滑轮控制 // newsSwiper.allowTouchMove= false;//关闭拖动 // } - else { - newsSwiper.mousewheel.enable(); //开启鼠标滑轮控制 - newsSwiper.allowTouchMove = true;// 开启拖动 - } + // else { + // newsSwiper.mousewheel.enable(); //开启鼠标滑轮控制 + // newsSwiper.allowTouchMove = true;// 开启拖动 + // } }) } // let isMeassage = ref(false); @@ -181,7 +184,20 @@ const toswiper = (index: number) => { // if (index == 7) isAbout.value = true; // if (index == 8) isMeassage.value = true; // if (index == 9) isSearch.value = true; - newsSwiper.slideTo(index, 1000, true) + //如果是跨了一页就为0 否则为1000 + if (index > newsSwiper.realIndex) { + if (newsSwiper.realIndex + 1 != index) { + newsSwiper.slideTo(index, 0, true) + } else { + newsSwiper.slideTo(index, 1000, true) + } + } else { + if (newsSwiper.realIndex - 1 != index) { + newsSwiper.slideTo(index, 0, true) + } else { + newsSwiper.slideTo(index, 1000, true) + } + } } const swiper_exp = ref(0); @@ -190,6 +206,7 @@ const swiperOptionsNews = { delay: 11000, disableOnInteraction: false, }, + noSwipingSelector: '.no-wrap', // 指定不接管该区域的滑动事件 // autoHeight : true, direction: 'horizontal', mousewheel: { @@ -508,13 +525,14 @@ onMounted(() => { } .fiximg { - width: 80px; - height: 100%; + width: 80px; + height: 100%; transition: right 0.5s ease-in-out; position: fixed; top: 40px; align-items: center; z-index: 111; + right: 100px; .qqt { cursor: pointer; @@ -554,4 +572,10 @@ onMounted(() => { .isOldfont * { font-size: 28px !important; } + +@media screen and (max-width: 1440px) { + .fiximg { + right: 30px; + } +} diff --git a/pages/info/[id].vue b/pages/info/[id].vue index dfa43dc..45c803e 100644 --- a/pages/info/[id].vue +++ b/pages/info/[id].vue @@ -2,66 +2,83 @@
- +
-
+
- +
+
+
+
+
+ +
+
当前位置：首页 > 团务百科 > 文章详情
+
-
+
+
-
{{ title_left + ' > ' + Newsdetail.cate.name+' > ' + '正文内容'}}
+
{{ title_left + ' > ' + + Newsdetail.cate.name + ' > ' + '正文内容' }}
{{ Newsdetail.title }}
- {{Newsdetail.release_time_text}} - 来源：{{ Newsdetail.source }} + {{ Newsdetail.release_time_text }} + 来源：{{ + Newsdetail.source }}
-
+
附件： - + {{ Newsdetail.attachment.filename }}
-
+
-
{{ Newsdetail.title }}
+
{{ + Newsdetail.title }}
- {{Newsdetail.release_time_text}} - 来源：{{ Newsdetail.source }} + {{ Newsdetail.release_time_text }} + 来源：{{ + Newsdetail.source }}
- -
- - + +
+ + -
+
- {{index+1 > 10 ? index + 1 : '0'+(index+1) }} + {{ index + 1 > 10 ? index + 1 : '0' + (index + 1) }}
- {{index+1 > 10 ? index + 1 : '0'+(index+1) }} - {{index+1 > 10 ? index + 1 : '0'+(index+1) }} + {{ index + 1 > 10 ? index + 1 : + '0' + (index + 1) }} + {{ index + 1 > 10 ? index + 1 : '0' + (index + 1) }}

{{ item.title }}

@@ -76,13 +93,16 @@
-
+
- {{index+1 > 10 ? index + 1 : '0'+(index+1) }} + {{ index + 1 > 10 ? index + 1 : '0' + (index + 1) }}
- {{index+1 > 10 ? index + 1 : '0'+(index+1) }} - {{index+1 > 10 ? index + 1 : '0'+(index+1) }} + {{ index + 1 > 10 ? index + 1 : + '0' + (index + 1) }} + {{ index + 1 > 10 ? index + 1 : '0' + (index + 1) }}

{{ item.title }}

@@ -97,10 +117,10 @@
- +
- +
-
+
- +
@@ -35,8 +35,7 @@
-
- +
@@ -230,7 +229,7 @@ onMounted(() => { .rightcon { width:100%; height:100%; - background-image: url('/img/xwdt.png'); + background-image: url('/img/index/rightcons.png'); background-size: 100% 100%; overflow-y: auto; position: absolute; @@ -241,12 +240,13 @@ onMounted(() => { height: 70px; justify-content: space-between; align-items: center; + margin-left: 415px; + width: 1200px; } .inputform { position: relative; width: 340px; - margin-right: 319px; } .contactInput { @@ -269,7 +269,7 @@ onMounted(() => { .search_rinput { width: 68px; height: 50px; - background: #e6e6e6; + background: #338CDE; border-radius: 0px 8px 8px 0px; position: absolute; top: 0; @@ -448,4 +448,18 @@ onMounted(() => { width: 430px; } } +@media (max-width: 1440px) { + .top_search { + width: 920px; + margin-left: 373px; + + } + .News_box{ + width: 1032px; + margin-left: 270px; + } + .rig_box{ + width: 700px; + } +} diff --git a/public/img/1c950a7b02087bf4a6441898ec30882310dfcf0e.jpeg b/public/img/1c950a7b02087bf4a6441898ec30882310dfcf0e.jpeg deleted file mode 100644 index ea1a87f..0000000 Binary files a/public/img/1c950a7b02087bf4a6441898ec30882310dfcf0e.jpeg and /dev/null differ diff --git a/public/img/77c6a7efce1b9d168473b709ed3d6b808d546410.jpeg b/public/img/77c6a7efce1b9d168473b709ed3d6b808d546410.jpeg deleted file mode 100644 index 0d2359e..0000000 Binary files a/public/img/77c6a7efce1b9d168473b709ed3d6b808d546410.jpeg and /dev/null differ diff --git a/public/img/aboutxq.png b/public/img/aboutxq.png deleted file mode 100644 index 67b49dd..0000000 Binary files a/public/img/aboutxq.png and /dev/null differ diff --git a/public/img/b58f8c5494eef01f27df510ffd1d462abe317d27.jpeg b/public/img/b58f8c5494eef01f27df510ffd1d462abe317d27.jpeg deleted file mode 100644 index 987ea9c..0000000 Binary files a/public/img/b58f8c5494eef01f27df510ffd1d462abe317d27.jpeg and /dev/null differ diff --git a/public/img/d.png b/public/img/d.png new file mode 100644 index 0000000..217bc9f Binary files /dev/null and b/public/img/d.png differ diff --git a/public/img/d6ca7bcb0a46f21fd684b47ee8c7b46f0d33ae5a.jpeg b/public/img/d6ca7bcb0a46f21fd684b47ee8c7b46f0d33ae5a.jpeg deleted file mode 100644 index ec18f26..0000000 Binary files a/public/img/d6ca7bcb0a46f21fd684b47ee8c7b46f0d33ae5a.jpeg and /dev/null differ diff --git a/public/img/f1.png b/public/img/f1.png new file mode 100644 index 0000000..3976293 Binary files /dev/null and b/public/img/f1.png differ diff --git a/public/img/f2.png b/public/img/f2.png new file mode 100644 index 0000000..990c7fa Binary files /dev/null and b/public/img/f2.png differ diff --git a/public/img/fuwu.png b/public/img/fuwu.png new file mode 100644 index 0000000..8bb3efe Binary files /dev/null and b/public/img/fuwu.png differ diff --git a/public/img/code.png b/public/img/home/1.png similarity index 100% rename from public/img/code.png rename to public/img/home/1.png diff --git a/public/img/home/2.png b/public/img/home/2.png new file mode 100644 index 0000000..6ea3bb3 Binary files /dev/null and b/public/img/home/2.png differ diff --git a/public/img/home/3.png b/public/img/home/3.png new file mode 100644 index 0000000..39237e9 Binary files /dev/null and b/public/img/home/3.png differ diff --git a/public/img/home/4.png b/public/img/home/4.png new file mode 100644 index 0000000..daedb4c Binary files /dev/null and b/public/img/home/4.png differ diff --git a/public/img/home/5.png b/public/img/home/5.png new file mode 100644 index 0000000..6b1a1d2 Binary files /dev/null and b/public/img/home/5.png differ diff --git a/public/img/home/6.png b/public/img/home/6.png new file mode 100644 index 0000000..e70b03a Binary files /dev/null and b/public/img/home/6.png differ diff --git a/public/img/index/fly.png b/public/img/index/fly.png deleted file mode 100644 index bb273f4..0000000 Binary files a/public/img/index/fly.png and /dev/null differ diff --git a/public/img/index/gwybst.png b/public/img/index/gwybst.png deleted file mode 100644 index 6e62f5c..0000000 Binary files a/public/img/index/gwybst.png and /dev/null differ diff --git a/public/img/index/hlines.png b/public/img/index/hlines.png deleted file mode 100644 index 691a5ef..0000000 Binary files a/public/img/index/hlines.png and /dev/null differ diff --git a/public/img/index/jcdt.png b/public/img/index/jcdt.png deleted file mode 100644 index e23f193..0000000 Binary files a/public/img/index/jcdt.png and /dev/null differ diff --git a/public/img/index/mtjj.png b/public/img/index/mtjj.png deleted file mode 100644 index 32b792c..0000000 Binary files a/public/img/index/mtjj.png and /dev/null differ diff --git a/public/img/index/ptgg.png b/public/img/index/ptgg.png deleted file mode 100644 index 3c0652f..0000000 Binary files a/public/img/index/ptgg.png and /dev/null differ diff --git a/public/img/index/qcly.png b/public/img/index/qcly.png deleted file mode 100644 index 73b2fc6..0000000 Binary files a/public/img/index/qcly.png and /dev/null differ diff --git a/public/img/index/rightcon.png b/public/img/index/rightcon.png deleted file mode 100644 index 292d8eb..0000000 Binary files a/public/img/index/rightcon.png and /dev/null differ diff --git a/public/img/index/rightcons1.png b/public/img/index/rightcons1.png deleted file mode 100644 index a7d0acd..0000000 Binary files a/public/img/index/rightcons1.png and /dev/null differ diff --git a/public/img/key.png b/public/img/key.png new file mode 100644 index 0000000..ed8f2dc Binary files /dev/null and b/public/img/key.png differ diff --git a/public/img/message/listbg.png b/public/img/listbg.png similarity index 100% rename from public/img/message/listbg.png rename to public/img/listbg.png diff --git a/public/img/luoyang.png b/public/img/luoyang.png new file mode 100644 index 0000000..b31f42f Binary files /dev/null and b/public/img/luoyang.png differ diff --git a/public/img/ly_listbg.png b/public/img/ly_listbg.png new file mode 100644 index 0000000..4bd4aaa Binary files /dev/null and b/public/img/ly_listbg.png differ diff --git a/public/img/lyb.jpg b/public/img/lyb.jpg deleted file mode 100644 index a867620..0000000 Binary files a/public/img/lyb.jpg and /dev/null differ diff --git a/public/img/message/listbgxx.png b/public/img/message/listbgxx.png deleted file mode 100644 index f6eeda3..0000000 Binary files a/public/img/message/listbgxx.png and /dev/null differ diff --git a/public/img/message/xxgk.png b/public/img/message/xxgk.png deleted file mode 100644 index 0e7569a..0000000 Binary files a/public/img/message/xxgk.png and /dev/null differ diff --git a/public/img/messageb.png b/public/img/messageb.png deleted file mode 100644 index 7482c2b..0000000 Binary files a/public/img/messageb.png and /dev/null differ diff --git a/public/img/newsxq.png b/public/img/newsxq.png deleted file mode 100644 index 59dda4e..0000000 Binary files a/public/img/newsxq.png and /dev/null differ diff --git a/public/img/qiqiu.png b/public/img/qiqiu.png deleted file mode 100644 index 279d490..0000000 Binary files a/public/img/qiqiu.png and /dev/null differ diff --git a/public/img/qnyz.jpg b/public/img/qnyz.jpg deleted file mode 100644 index 444badd..0000000 Binary files a/public/img/qnyz.jpg and /dev/null differ diff --git a/public/img/tgxzj.jpg b/public/img/tgxzj.jpg deleted file mode 100644 index 734dd17..0000000 Binary files a/public/img/tgxzj.jpg and /dev/null differ diff --git a/public/img/tuan.png b/public/img/tuan.png new file mode 100644 index 0000000..00d5829 Binary files /dev/null and b/public/img/tuan.png differ diff --git a/public/img/twbk.png b/public/img/twbk.png deleted file mode 100644 index 8fe9443..0000000 Binary files a/public/img/twbk.png and /dev/null differ diff --git a/public/img/xwdt.png b/public/img/xwdt.png deleted file mode 100644 index ef19ee1..0000000 Binary files a/public/img/xwdt.png and /dev/null differ