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

src/router/index.js

@@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
-const whiteList = ['/login']// no redirect whitelist
+const whiteList = ['/homes','/entrance','/login']// no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   if (to.meta.title) {

src/router/routers.js

@@ -10,6 +10,14 @@ export const constantRouterMap = [
     component: (resolve) => require(['@/views/login'], resolve),
     hidden: true
   },
+  { path: '/homes',
+    component: (resolve) => require(['@/views/home'], resolve),
+    hidden: true
+  },
+  { path: '/entrance',
+    component: (resolve) => require(['@/views/unified/entrance'], resolve),
+    hidden: true
+  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/features/404'], resolve),

src/views/home.vue

@@ -41,49 +41,49 @@ export default {
       num: [
         {
           name: "人口专题",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "0",
           icon: require("@/assets/images/人员专题.png"),
         },
         {
           name: "机构专题",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "1",
           icon: require("@/assets/images/机构专题.png"),
         },
         {
           name: "婚姻",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "2",
           icon: require("@/assets/images/婚姻.png"),
         },
         {
           name: "社会救助",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "3",
           icon: require("@/assets/images/社会救助.png"),
         },
         {
           name: "两项补贴",
-         path: "/unifiedNanning/entrance",
+         path: "/entrance",
           TapId: "7",
           icon: require("@/assets/images/两项补贴.png"),
         },
         {
           name: "儿童福利",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "4",
           icon: require("@/assets/images/儿童福利.png"),
         },
         {
           name: "社会组织",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "6",
           icon: require("@/assets/images/社会组织.png"),
         },
         {
           name: "殡葬",
-          path: "/unifiedNanning/entrance",
+          path: "/entrance",
           TapId: "5",
           icon: require("@/assets/images/殡葬.png"),
         },

src/views/unified/entrance.vue

 <template>
   <div class="page">
+     <img
+      src="./../../assets/images/3d8ced92b374abc6d74a746df73082e.png"
+      alt=""
+      class="background-image"
+    />
     <div class="flex-container">
       <img src="./../../assets/images/标题左边素材.png" alt="" class="about" />
       <div class="title-text">
@@ -129,7 +134,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.background-image {
+  width: 100%;
+  height: 160vh;
+  position: absolute;
+  z-index: -1;
+}
 .footerTxt{
   margin-top: 20px;
   color: #fff;
@@ -158,7 +168,7 @@ export default {
 .page {
   width: 100%;
   height: 1120px;
-  background-color: #0b0f4e;
+  // background-color: #0b0f4e;
 }
 
 .top {