From 5aab750fc37f28917caec8b66e7179329f6e7dbf Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 14 十二月 2023 11:16:18 +0800
Subject: [PATCH] 修改样式

---
 src/views/components/notice.vue  |    6 +-
 src/views/homePage.vue           |    4 
 src/views/components/laws.vue    |    6 +-
 src/views/components/details.vue |    6 +-
 src/views/components/home.vue    |  110 +++++++++++++++++-------------------
 src/views/components/publish.vue |    6 +-
 6 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/src/views/components/details.vue b/src/views/components/details.vue
index 7c82390..f38d641 100644
--- a/src/views/components/details.vue
+++ b/src/views/components/details.vue
@@ -229,12 +229,12 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-top: 170px;
+  margin-top: 160px;
 
   .header{
     width: 1200px;
     height: 60px;
-    margin: 20px 0 0;
+    margin: 15px 0 0;
     padding: 0 15px;
     border-radius: 4px;
     background: #f5f5f5;
@@ -252,7 +252,7 @@
     box-shadow: 1px 1px 3px rgba(0,0,0,.04);
     padding: 20px 15px 40px;
     background: #fff;
-    max-height: calc(100vh - 330px);
+    max-height: calc(100vh - 310px);
     overflow-y: auto;
 
     .title{
diff --git a/src/views/components/home.vue b/src/views/components/home.vue
index 9006574..e3cd338 100644
--- a/src/views/components/home.vue
+++ b/src/views/components/home.vue
@@ -11,7 +11,7 @@
         </div>
         <div class="list">
           <div v-for="item in state.noticeList" @click="openDetails('通知公告',item.id)">
-            <div><img :src="noticePng"></div>
+            <div><img src="src/assets/images/notice.png"></div>
             <div>
               <div>{{item.title}}</div>
               <span>{{(item.updateTime?item.updateTime:item.createTime).substring(0,16)}}</span>
@@ -19,24 +19,11 @@
           </div>
         </div>
       </div>
-      <div class="list-container">
-        <div class="tit">
-          <div>
-            <Platform style="width: 1em; height: 1em;margin-right: 4px" />
-            法律法规
-          </div>
-          <el-button plain @click="toMore(3)">查看更多</el-button>
-        </div>
-        <div class="list">
-          <div v-for="item in state.lawsList" @click="openDetails('法律法规',item.id)">
-            <div><img :src="lawsPng"></div>
-            <div>
-              <div>{{item.title}}</div>
-              <span>{{(item.updateTime?item.updateTime:item.createTime).substring(0,16)}}</span>
-            </div>
-          </div>
-        </div>
+
+      <div class="login-container list-container">
+        <login-form ref="loginRef"/>
       </div>
+
       <div class="list-container">
         <div class="tit">
           <div>
@@ -47,7 +34,7 @@
         </div>
         <div class="list">
           <div v-for="item in state.pubList" @click="openDetails('机构公示',item.id)">
-            <div><img :src="sectionPng"></div>
+            <div><img src="src/assets/images/section.png"></div>
             <div>
               <div>{{item.name}}</div>
               <span>{{(item.updateTime?item.updateTime:item.createTime).substring(0,16)}}</span>
@@ -55,24 +42,24 @@
           </div>
         </div>
       </div>
-      <div class="login-container">
-<!--        <div class="tit">-->
-<!--          <div>-->
-<!--            <Platform style="width: 1em; height: 1em;margin-right: 4px" />-->
-<!--            资料下载-->
-<!--          </div>-->
-<!--          <el-button plain>查看更多</el-button>-->
-<!--        </div>-->
-<!--        <div class="list">-->
-<!--          <div v-for="item in state.newList">-->
-<!--            <div><img src="src/assets/images/file.png"></div>-->
-<!--            <div>-->
-<!--              <div>{{item.title}}</div>-->
-<!--              <span>{{item.date}}</span>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-        <login-form ref="loginRef"/>
+
+      <div class="list-container">
+        <div class="tit">
+          <div>
+            <Platform style="width: 1em; height: 1em;margin-right: 4px" />
+            法律法规
+          </div>
+          <el-button plain @click="toMore(3)">查看更多</el-button>
+        </div>
+        <div class="list">
+          <div v-for="item in state.lawsList" @click="openDetails('法律法规',item.id)">
+            <div><img src="src/assets/images/laws.png"></div>
+            <div>
+              <div>{{item.title}}</div>
+              <span>{{(item.updateTime?item.updateTime:item.createTime).substring(0,16)}}</span>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
 <!--    <login-form ref="loginRef"/>-->
@@ -85,9 +72,7 @@
 import useUserStore from '@/store/modules/user'
 import LoginForm from './loginForm'
 import {ElMessage} from "element-plus";
-import noticePng from "@/assets/images/notice.png";
-import lawsPng from "@/assets/images/laws.png";
-import sectionPng from "@/assets/images/section.png";
+
 const route = useRoute()
 const router = useRouter()
 
@@ -162,40 +147,37 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-top: 170px;
+  margin-top: 160px;
 
   .main-content{
     width: 1200px;
-    margin: 20px 0 80px;
-    display: grid;
-    grid-gap: 15px;
-    grid-template-columns: repeat(2, 1fr);
-    grid-template-rows: repeat(2, 350px);
-    grid-auto-flow: row;
-    justify-content: center;
+    height: calc(100vh - 250px);
+    margin: 15px 0;
     color: #333;
-
-    .login-container{
-      border-radius: 4px;
-      box-shadow: 1px 1px 3px rgba(0,0,0,.04);
-      padding: 0 15px;
-      overflow: hidden;
-      background: url("../../assets/images/login-bg.jpg");
-    }
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
 
     .list-container{
       border-radius: 4px;
+      width: calc(50% - 7.5px);
+      height: calc(50% - 7.5px);
+      margin-bottom: 15px;
       box-shadow: 1px 1px 3px rgba(0,0,0,.04);
       padding: 0 15px;
       overflow: hidden;
       background: #fff url("../../assets/images/city-bg.png") no-repeat right bottom;
       background-size: 40% auto;
 
+      &:nth-of-type(2n+1){
+        margin-right: 15px;
+      }
+
       .tit{
         display: flex;
         align-items: center;
         justify-content: space-between;
-        padding: 10px 0;
+        height: 50px;
         border-bottom: 1px solid #ebeef5;
         &>div{
           display: flex;
@@ -207,14 +189,20 @@
       }
       .list{
         width: 100%;
-        margin-top: 10px;
+        height: calc(100% - 60px);
+        padding: 5px 0;
+        margin-top: 5px;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-around;
 
         &>div{
           width: 100%;
+          padding: 5px;
           display: flex;
           align-items: center;
           cursor: pointer;
-          padding: 5px;
+
           border-radius: 4px;
 
           &>div:first-of-type{
@@ -252,6 +240,10 @@
         }
       }
     }
+    .login-container{
+      background: url("../../assets/images/login-bg.jpg");
+    }
+
   }
 }
 </style>
diff --git a/src/views/components/laws.vue b/src/views/components/laws.vue
index a1cc6d5..e5d7187 100644
--- a/src/views/components/laws.vue
+++ b/src/views/components/laws.vue
@@ -118,7 +118,7 @@
   width: 100%;
   display: flex;
   justify-content: center;
-  margin-top: 170px;
+  margin-top: 160px;
     :deep(.el-form .el-form-item__label) {
         font-size: 16px;
     }
@@ -133,7 +133,7 @@
 
   .main-content{
     width: 1200px;
-    margin: 20px 0;
+    margin: 15px 0;
     background: #fff;
     border-radius: 4px;
     box-shadow: 1px 1px 3px rgba(0,0,0,.04);
@@ -170,7 +170,7 @@
 
     .list{
       padding: 15px 0;
-      max-height: calc(100vh - 402px);
+      height: calc(100vh - 392px);
       overflow-y: auto;
 
       &>div{
diff --git a/src/views/components/notice.vue b/src/views/components/notice.vue
index 78c1a90..e61600e 100644
--- a/src/views/components/notice.vue
+++ b/src/views/components/notice.vue
@@ -96,11 +96,11 @@
   width: 100%;
   display: flex;
   justify-content: center;
-  margin-top: 170px;
+  margin-top: 160px;
 
   .main-content{
     width: 1200px;
-    margin: 20px 0;
+    margin: 15px 0;
     background: #fff;
     border-radius: 4px;
     box-shadow: 1px 1px 3px rgba(0,0,0,.04);
@@ -109,7 +109,7 @@
 
     .list{
       padding: 15px 0;
-      max-height: calc(100vh - 350px);
+      height: calc(100vh - 330px);
       overflow-y: auto;
 
       &>div{
diff --git a/src/views/components/publish.vue b/src/views/components/publish.vue
index dc040fb..1dae045 100644
--- a/src/views/components/publish.vue
+++ b/src/views/components/publish.vue
@@ -210,7 +210,7 @@
   width: 100%;
   display: flex;
   justify-content: center;
-  margin-top: 170px;
+  margin-top: 160px;
     :deep(.el-form .el-form-item__label) {
         font-size: 16px;
     }
@@ -225,7 +225,7 @@
 
   .main-content{
     width: 1200px;
-    margin: 20px 0;
+    margin: 15px 0;
     background: #fff;
     border-radius: 4px;
     box-shadow: 1px 1px 3px rgba(0,0,0,.04);
@@ -262,7 +262,7 @@
 
     .list{
       padding: 15px 0;
-      max-height: calc(100vh - 402px);
+      height: calc(100vh - 392px);
       overflow-y: auto;
 
       &>div{
diff --git a/src/views/homePage.vue b/src/views/homePage.vue
index 0418459..39afb47 100644
--- a/src/views/homePage.vue
+++ b/src/views/homePage.vue
@@ -199,13 +199,13 @@
 
     .nav{
       width: 100%;
-      height: 80px;
+      height: 70px;
       position: fixed;
       top: 90px;
       left: 0;
       .nav-cont{
         width: 1200px;
-        height: 80px;
+        height: 70px;
         margin: 0 auto;
         display: flex;
         align-items: center;

--
Gitblit v1.9.2