登录页面修改

build/webpack.dev.conf.js

@@ -27,6 +27,10 @@ const devWebpackConfig = merge(baseWebpackConfig, {
 
   // these devServer options should be customized in /config/index.js
   devServer: {
+    //解决内网穿透
+    historyApiFallback: true,
+    allowedHosts: "all",
+
     historyApiFallback: true,
     hot: true,
     compress: true,

config/index.js

@@ -17,23 +17,22 @@ module.exports = {
               '^/api/m1/xm': '/xm'
             }
       },
-      /**
-      '/api/m1/sys': {
-        target: 'http://localhost:7015',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/api/m1/sys': '/sys'
-        }
-      },
+      // '/api/m1/sys': {
+      //   target: 'http://localhost:7015',
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     '^/api/m1/sys': '/sys'
+      //   }
+      // },
+
+      // '/api/m1/pay': {
+      //   target: 'http://localhost:7125',
+      //   changeOrigin: true,
+      //   pathRewrite: {
+      //     '^/api/m1/pay': '/pay'
+      //   }
+      // },
       
-      '/api/m1/pay': {
-        target: 'http://localhost:7125',
-        changeOrigin: true,
-        pathRewrite: {
-          '^/api/m1/pay': '/pay'
-        }
-      },
-      **/
       /**
     	'/api/m1/workflow': {
             target: 'http://localhost:7080',

src/common/config.js

@@ -89,7 +89,7 @@ export default {
     return '/im/im'
   },
   getPayBasePath:function() {
-    return '/pay/pay'
+    return '/tpa/pay'
   }
 
 

src/components/ModulesMenu/allMenus.vue

@@ -47,6 +47,7 @@
 import { mapGetters } from 'vuex';
 import {getAllMenuModule, getBuyMenuModule} from '@/api/mdp/sys/modules'
 import {modulesOfIcon} from "./modulesOfIcon.js";
+import {modulesOfRouter} from "./modulesOfRouter.js";
 
 export default {
     props: ['value'],
@@ -115,7 +116,24 @@ export default {
             this.selectMenus = tempArr;
         },
  
-        selectItem() {},
+        selectItem(item) {
+            if(item.isBuy) {
+                //路由跳转
+                console.log(modulesOfRouter, "modulesOfRouter");
+                let name = "";
+                modulesOfRouter.forEach(e => {
+                    if(e.id == item.id) {
+                        name = e.router;
+                    }
+                })
+                if(name != "") {
+                    this.$router.push({name: name})
+                }
+                this.visible = false;
+            }
+        },
+
+
         goBuy(item) {
             this.visible = false;
             //前往购买页面

src/components/ModulesMenu/modulesOfRouter.js

@@ -0,0 +1,102 @@
+export const modulesOfRouter = [
+    {
+        id: 'mall',
+        router: ''
+    },
+    {
+        id: 'mall-marketing',
+        router: ''
+    },  
+    {
+        id: 'mdp-arc',
+        router: ''
+    },  
+    {
+        id: 'mdp-sys',
+        router: ''
+    },  
+    {
+        id: 'oa-asset',
+        router: ''
+    },  
+    {
+        id: 'oa-attendance',
+        router: ''
+    },  
+    {
+        id: 'oa-car',
+        router: '',
+    },  
+    {
+        id: 'oa-contract',
+        router: ''
+    },  
+    {
+        id: 'oa-customer',
+        router: ''
+    },  
+    {
+        id: 'oa-file',
+        router: ''
+    },  
+    {
+        id: 'oa-finance',
+        router: ''
+    },  
+    {
+        id: 'oa-meeting',
+        router: ''
+    },  
+    {
+        id: 'oa-office',
+        router: ''
+    },  
+    {
+        id: 'oa-performance',
+        router: ''
+    },  
+    {
+        id: 'oa-schedule',
+        router: ''
+    },  
+    {
+        id: 'oa-seal',
+        router: '',
+    },  
+    {
+        id: 'oa-supervision',
+        router: ''
+    },  
+    {
+        id: 'xm-analysis',
+        router: 'reportIndex',
+    },  
+    {
+        id: 'xm-development',
+        router: ''
+    },
+    {
+        id: 'xm-pipeline',
+        router: ''
+    },
+    {
+        id: 'xm-product',
+        router: 'XmProductAllMng'
+    },
+    {
+        id: 'xm-project',
+        router: 'xmProjectAllMng'
+    },
+    {
+        id: 'xm-test',
+        router: 'XmQuestionAdd'
+    },
+    {
+        id: 'xm-workload',
+        router: 'XmTaskWorkloadInfoMy',
+    },
+    {
+        id: 'xm-crowd',
+        router: '',
+    }
+]

src/router/routes_xm.js

@@ -98,7 +98,6 @@ export default {
       },
       
       children: [
-
         { path: 'reportIndex', component: _import('xm/rpt/reportIndex'), name: 'reportIndex', meta: { title: '效能分析',  icon: 'chart' }}, 
       ]
     },

src/views/login/index.scss

@@ -34,23 +34,24 @@
             position: absolute;
             display: flex;
             align-items: center;
-            top: 6px;
-            right: 60px;
+            top: 10px;
+            right: 40px;
             font-size: 30px;
             color: #1D1D1D;
             font-weight: bold;
             img {
-                width: 64px;
-                height: 64px;
+                width: 58px;
+                height: 58px;
+                margin-right: 10px;
             }
         }
         .login_box {
             width: 418px;
-            height: 482px;
+            height: 472px;
             border: 1px solid #F1F1F1;
             box-shadow: 1px 7px 25px 2px rgba(22, 22, 93, 0.04);
             border-radius: 5px 5px 5px 5px;
-            margin-top: 10px;
+            margin-top: 40px;
             .login_box_content {
                 padding: 28px 30px 16px 30px;
                 .top {
@@ -100,7 +101,7 @@
                     font-size: 14px;
                 }
                 .login {
-                    margin-top: 50px;
+                    margin-top: 40px;
                     width: 100%;
                     background-color: #FE9A00;
                     height: 42px;
@@ -124,7 +125,7 @@
             }
             
             .bottom {
-                margin-top: 30px;
+                margin-top: 40px;
                 width: 100%;
                 display: flex;
                 flex-direction: column;

src/views/login/index.vue

@@ -5,7 +5,7 @@
             </div>
             <div class="right">
                 <div class="logo">
-                    <img src="@/assets/image/logo1.png">
+                    <img src="@/assets/image/logo_cicle.png">
                     <span>唛盟</span>
                 </div>
                 <div class="login_box">