Merge branch 'master' of http://139.159.239.83:9093/civil/civil-front

src/views/home.vue

@@ -6,7 +6,11 @@
       class="background-image"
       class="background-image"
     />
     />
     <div class="flex-container">
     <div class="flex-container">
-      <img src="./../assets/images/img/标题.png" alt="" class="flex-container-tetli">
+      <img
+        src="./../assets/images/img/标题.png"
+        alt=""
+        class="flex-container-tetli"
+      />
       <!-- <img src="./../assets/images/标题左边素材.png" alt="" class="about" />
       <!-- <img src="./../assets/images/标题左边素材.png" alt="" class="about" />
       <div class="title-text">
       <div class="title-text">
         民政数据分析系统
         民政数据分析系统
@@ -18,14 +22,20 @@
       <img src="./../assets/images/方向箭头.png" alt="" />
       <img src="./../assets/images/方向箭头.png" alt="" />
     </div> -->
     </div> -->
     <img class="qrCode" src="./../assets/images/img/二维码.png" alt="" />
     <img class="qrCode" src="./../assets/images/img/二维码.png" alt="" />
-    <div class="downloadInfo">安卓板app下载
-      <br>
-      请使用浏览器扫码下载</div>
+    <div class="downloadInfo">
+      安卓板app下载
+      <br />
+      请使用浏览器扫码下载
+    </div>
     <!-- <el-popover placement="bottom" width="140" trigger="hover">
     <!-- <el-popover placement="bottom" width="140" trigger="hover">
       <img class="qrCode" src="./../assets/images/App.png" alt="" />
       <img class="qrCode" src="./../assets/images/App.png" alt="" />
       <div class="downloadInfo">请使用浏览器下载</div>
       <div class="downloadInfo">请使用浏览器下载</div>
       <el-button slot="reference" class="elBottom">App下载</el-button>
       <el-button slot="reference" class="elBottom">App下载</el-button>
     </el-popover> -->
     </el-popover> -->
+    <br />
+    <br />
+    <br />
+   
 
 
     <div class="Jump-box">
     <div class="Jump-box">
       <div class="Jump" v-for="(item, index) in num" :key="index">
       <div class="Jump" v-for="(item, index) in num" :key="index">
@@ -96,7 +106,6 @@ export default {
           TapId: "5",
           TapId: "5",
           icon: require("@/assets/images/img/殡葬.png"),
           icon: require("@/assets/images/img/殡葬.png"),
         },
         },
-     
       ],
       ],
     };
     };
   },
   },
@@ -116,18 +125,17 @@ export default {
   text-align: center;
   text-align: center;
   font-size: 16px;
   font-size: 16px;
   background-color: rgba(0, 0, 0, 0.2);
   background-color: rgba(0, 0, 0, 0.2);
-  }
+}
 .dataList-img {
 .dataList-img {
   width: 50px;
   width: 50px;
   margin: 20px 22px;
   margin: 20px 22px;
 }
 }
 h2 {
 h2 {
-
   color: #00f9fd;
   color: #00f9fd;
   text-align: center;
   text-align: center;
 }
 }
-.content:hover{
- box-shadow:0px 0px 20px  #00f9fd;
+.content:hover {
+  box-shadow: 0px 0px 20px #00f9fd;
 }
 }
 .content {
 .content {
   width: 100px;
   width: 100px;
@@ -161,13 +169,12 @@ h2 {
   width: 100%;
   width: 100%;
   height: 86vh;
   height: 86vh;
 }
 }
-.flex-container-tetli{
+.flex-container-tetli {
   width: 100%;
   width: 100%;
 }
 }
 .flex-container {
 .flex-container {
   display: flex;
   display: flex;
   width: 100%;
   width: 100%;
-  height: 165px;
   margin: auto;
   margin: auto;
 }
 }
 .title-text {
 .title-text {
@@ -203,7 +210,7 @@ h2 {
   right: 20px;
   right: 20px;
   font-size: 16px;
   font-size: 16px;
   color: #888;
   color: #888;
-  background-color: #041B44;
+  background-color: #041b44;
   border: none;
   border: none;
 }
 }
 
 

src/views/unified/entrance.vue

@@ -162,18 +162,19 @@ export default {
 }
 }
 .background-image {
 .background-image {
   width: 100%;
   width: 100%;
-  height: 160vh;
-  position: absolute;
+  position: fixed;
   z-index: -1;
   z-index: -1;
 }
 }
 .footerTxt {
 .footerTxt {
   height: 50px;
   height: 50px;
+  margin-top: 40px;
+  background-color: rgba(0, 0, 0, 0.2);
   color: #fff;
   color: #fff;
   width: 100%;
   width: 100%;
   text-align: center;
   text-align: center;
   font-size: 16px;
   font-size: 16px;
   line-height: 50px;
   line-height: 50px;
-  background-color: #012F57;
+  // background-color: #012F57;
 }
 }
 .switchMa {
 .switchMa {
   margin: 0 10px;
   margin: 0 10px;
@@ -197,7 +198,7 @@ export default {
 .page {
 .page {
   position: relative;
   position: relative;
   width: 100%;
   width: 100%;
-  height: 110vh;
+  height: 100vh;
   // background-color: #0b0f4e;
   // background-color: #0b0f4e;
 }
 }