Merge branch 'shibei_master' into 市北master

src/router/index.js

@@ -400,7 +400,7 @@ router.beforeEach((to, from, next) => {
   // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]);
 
   http
-  .get("/gov/access/menu/nav?tableName=data_menu")
+    .get("/gov/access/menu/nav?tableName=data_menu")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -426,7 +426,7 @@ router.beforeEach((to, from, next) => {
     });
 
   http
-  .get("/gov/access/menu/nav")
+    .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
       if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
         // 10005 token为空  10006登陆超时 10007别处登录
@@ -539,10 +539,10 @@ function fnAddDynamicMenuRoutes(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "/main/*",
-      redirect: {
-        path: "/main/404",
-      },
+      path: "*",
+      // redirect: {
+      //   name: "404",
+      // },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutes"] = routes;
@@ -613,10 +613,10 @@ function fnAddDynamicMenuRoutes2(menuList = [], routes = []) {
       children: routes,
     },
     {
-      path: "/main-shuju/*",
-      redirect: {
-        path: "/main-shuju/404",
-      },
+      path: "*",
+      // redirect: {
+      //   name: "404",
+      // },
     },
   ]);
   window.SITE_CONFIG["dynamicMenuRoutesShuju"] = routes;

src/views/pages/index.vue

@@ -1,39 +1,27 @@
 <template>
   <div class="g-app">
-    <div class="g-bd"
-         v-if="true">
+    <div class="g-bd" v-if="true">
       <div class="m-list">
         <div class="list">
-          <div class="item"
-               @click="handleClickItem(1)">
-            <img class="logo"
-                 src="@/assets/img/index/logo-1.png"
-                 alt="" />
-            <!-- 数字社区管理平台 -->
+          <div class="item" @click="handleClickItem(1)">
+            <img class="logo" src="@/assets/img/index/logo-1.png" alt="" />
+             <!-- 数字社区管理平台 -->
             <div class="name">党建引领基层治理互联管理平台</div>
-            <img src="@/assets/img/index/zhuangshi.png"
-                 class="tip" />
+            <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
 
-          <div class="item z-on"
-               @click="handleClickItem(2)">
-            <img class="logo"
-                 src="@/assets/img/index/logo-2.png"
-                 alt="" />
-            <!-- 数字社区可视化平台 -->
+          <div class="item z-on" @click="handleClickItem(2)">
+            <img class="logo" src="@/assets/img/index/logo-2.png" alt="" />
+             <!-- 数字社区可视化平台 -->
             <div class="name">数据分析可视化平台</div>
-            <img src="@/assets/img/index/zhuangshi.png"
-                 class="tip" />
+            <img src="@/assets/img/index/zhuangshi.png" class="tip" />
           </div>
         </div>
       </div>
       <div class="m-footer">
         <div class="login-footer">
           <p>
-            <a href="http://www.elinkchina.com.cn/"
-               target="_blank">{{
-              $t("login.copyright")
-            }}</a>
+            <a href="http://www.elinkchina.com.cn/" target="_blank">{{ $t('login.copyright') }}</a>
           </p>
         </div>
       </div>
@@ -50,7 +38,7 @@ import JSEncrypt from "jsencrypt"; //引入加密
 
 let loading; // 加载动画
 export default {
-  data () {
+  data() {
     return {
       pubKey: null, // 获取到公钥
       isShowLogin: true,
@@ -59,20 +47,11 @@ export default {
   },
   components: {},
   computed: {},
-  created () { },
-  mounted () { },
-
-  beforeRouteEnter (to, from, next) {
-    console.log(from);
-    if (from.name == "login") {
-      next();
-      location.reload();
-    }
-    next();
-  },
+  created() {},
+  mounted() {},
 
   methods: {
-    handleClickItem (k) {
+    handleClickItem(k) {
       if (k == 1) {
         this.$router.replace({ name: "main" });
       } else if (k == 2) {
@@ -81,7 +60,7 @@ export default {
     },
 
     // 平阴联动 自动登录接口
-    getAutoLogin (platformToken) {
+    getAutoLogin(platformToken) {
       this.dataForm.thirdToken = platformToken;
       this.dataForm.platform = "pyld";
       this.$http
@@ -99,7 +78,7 @@ export default {
           localStorage.setItem("token", res.data.token);
           this.$router.replace({ name: "home" });
         })
-        .catch(() => { });
+        .catch(() => {});
       // epmet-ext9.elinkservice.cn/platform-admin
     },
   },