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

src/views/home.vue

@@ -107,12 +107,16 @@ export default {
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .footerTxt {
 .footerTxt {
-  margin-top: 100px;
+  position: fixed;
+  bottom: 0;
   color: #fff;
   color: #fff;
   width: 100%;
   width: 100%;
+  line-height: 50px;
+  height: 50px;
   text-align: center;
   text-align: center;
   font-size: 16px;
   font-size: 16px;
-}
+  background-color: rgba(0, 0, 0, 0.2);
+  }
 .dataList-img {
 .dataList-img {
   width: 50px;
   width: 50px;
   margin: 20px 22px;
   margin: 20px 22px;
@@ -187,8 +191,8 @@ h2 {
 
 
 .qrCode {
 .qrCode {
   position: fixed;
   position: fixed;
-  bottom: 60px;
-  right: 40px;
+  bottom: 130px;
+  right: 80px;
   width: 120px;
   width: 120px;
   height: 120px;
   height: 120px;
 }
 }
@@ -205,8 +209,8 @@ h2 {
 
 
 .downloadInfo {
 .downloadInfo {
   position: fixed;
   position: fixed;
-  bottom: 10px;
-  right: 30px;
+  bottom: 80px;
+  right: 70px;
   font-size: 14px;
   font-size: 14px;
   line-height: 20px;
   line-height: 20px;
   color: #fff;
   color: #fff;

src/views/unified/entrance.vue

 <template>
 <template>
   <div class="page">
   <div class="page">
     <img
     <img
-      src="./../../assets/images/3d8ced92b374abc6d74a746df73082e.png"
+     src="./../../assets/images/img/底层背景图.png"
       alt=""
       alt=""
       class="background-image"
       class="background-image"
     />
     />
     <div class="flex-container">
     <div class="flex-container">
-      <img src="./../../assets/images/标题左边素材.png" alt="" class="about" />
+       <img src="./../../assets/images/img/标题.png" alt="" class="flex-container-tetli">
+      <!-- <img src="./../../assets/images/标题左边素材.png" alt="" class="about" />
       <div class="title-text">
       <div class="title-text">
         民政数据分析系统
         民政数据分析系统
         <img
         <img
@@ -15,7 +16,7 @@
           class="underline"
           class="underline"
         />
         />
       </div>
       </div>
-      <img src="./../../assets/images/标题右边素材.png" alt="" class="about" />
+      <img src="./../../assets/images/标题右边素材.png" alt="" class="about" /> -->
       <router-link :to="{ path: '/homes' }">
       <router-link :to="{ path: '/homes' }">
         <div class="content">
         <div class="content">
           <div></div>
           <div></div>
@@ -24,8 +25,7 @@
       </router-link>
       </router-link>
     </div>
     </div>
 
 
-    <br />
-    <br />
+   
     <el-row :gutter="18">
     <el-row :gutter="18">
       <el-col :span="12" :offset="12" class="top">
       <el-col :span="12" :offset="12" class="top">
         <div
         <div
@@ -157,6 +157,9 @@ export default {
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
+.flex-container-tetli{
+  width: 100%;
+}
 .background-image {
 .background-image {
   width: 100%;
   width: 100%;
   height: 160vh;
   height: 160vh;
@@ -164,11 +167,13 @@ export default {
   z-index: -1;
   z-index: -1;
 }
 }
 .footerTxt {
 .footerTxt {
-  margin-top: 20px;
+  height: 50px;
   color: #fff;
   color: #fff;
   width: 100%;
   width: 100%;
   text-align: center;
   text-align: center;
   font-size: 16px;
   font-size: 16px;
+  line-height: 50px;
+  background-color: #012F57;
 }
 }
 .switchMa {
 .switchMa {
   margin: 0 10px;
   margin: 0 10px;
@@ -192,7 +197,7 @@ export default {
 .page {
 .page {
   position: relative;
   position: relative;
   width: 100%;
   width: 100%;
-  height: 1120px;
+  height: 110vh;
   // background-color: #0b0f4e;
   // background-color: #0b0f4e;
 }
 }
 
 
@@ -235,9 +240,8 @@ export default {
 }
 }
 .flex-container {
 .flex-container {
   display: flex;
   display: flex;
-  width: 1300px;
-  height: 110px;
-  margin: auto;
+  width: 100%;
+  margin: 0 auto;
 }
 }
 .title-text {
 .title-text {
   width: 380px;
   width: 380px;