Merge branch 'master' into shibei_master

src/js/dai/request.js

@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           // Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };

src/js/dai/request2.js

@@ -38,6 +38,14 @@ const request = curry(
         if (res.data.code > 8000 && res.data.code < 10000) {
           Message.error(res.data.msg);
         }
+        if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+          // 10005 token为空  10006登陆超时 10007别处登录
+          console.log("登录失效");
+          Message.error(res.data.msg);
+          return next({
+            name: "login",
+          });
+        }
 
         reslove(retData);
       };

src/router/index.js

@@ -179,7 +179,7 @@ const router = new Router({
 router.beforeEach((to, from, next) => {
   // 添加动态(菜单)路由
   // 已添加或者当前路由为页面路由, 可直接访问
-  if(to.name==='caiji'){
+  if (to.name === "caiji") {
     return next();
   }
   if (
@@ -359,11 +359,13 @@ router.beforeEach((to, from, next) => {
   http
     .get("/gov/access/menu/nav")
     .then(({ data: res }) => {
-      if (res.code !== 0) {
-        // Vue.prototype.$message.error(res.msg)
-        // return next({
-        //   name: "login",
-        // });
+      if (res.code == 10005 || res.code == 10006 || res.code == 10007) {
+        // 10005 token为空  10006登陆超时 10007别处登录
+        console.log("登录失效");
+        Vue.prototype.$message.error(res.msg);
+        return next({
+          name: "login",
+        });
       }
       window.SITE_CONFIG["menuList"] = res.data;
       fnAddDynamicMenuRoutes(window.SITE_CONFIG["menuList"]);

src/views/pages/caiji.vue

@@ -316,7 +316,7 @@ export default {
     this.shequId = this.$route.params.id
     this.customerId = this.$route.query.customerId
     this.shequName = this.$route.query.name
-    document.title = this.shequName
+    document.title = this.shequName + '信息管理平台'
   },
   mounted () {
 
@@ -324,13 +324,17 @@ export default {
     let envShow = process.env.VUE_APP_NODE_ENV
     console.log('环境', envShow)
 
-    let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9',]
+    let internalShequId = ['1202807601961984002', '6e511da6816e53af4cda952365a26eb9', 'b058eb82d65d922fec9dc84f0348fc6a', '630c3c2dd1cd7a4d198c8558bce88324']
     // let internalShequId = ['1202807601961984002',]
     // if (envShow === 'dev' || envShow === 'prod:sit') { // 开发环境
-    //   internalShequId = null
+    //   internalShequId = '6e511da6816e53af4cda952365a26eb9'
     // } else if (envShow === 'prod:uat') { // 体验
     //   internalShequId = '6e511da6816e53af4cda952365a26eb9'
     // } else if (envShow === 'prod') { // 生产
+    //     微笑崂山下的小寨子社区：b058eb82d65d922fec9dc84f0348fc6a
+    // 亿联街道下的亿联社区：630c3c2dd1cd7a4d198c8558bce88324
+    //   internalShequId = '1202807601961984002'
+    // } else if (envShow === 'shibei_prod') { // 生产
     //   internalShequId = '1202807601961984002'
     // }