wangtao il y a 2 ans
Parent
commit
b340cf664d
3 fichiers modifiés avec 23 ajouts et 23 suppressions
  1. 1 1
      .env.production
  2. 20 20
      public/index.html
  3. 2 2
      src/views/login.vue

+ 1 - 1
.env.production

@@ -4,7 +4,7 @@ ENV = 'production'
 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
 # VUE_APP_BASE_API  = 'http://47.99.156.213:1537'
 #VUE_APP_BASE_API  = 'http://114.55.24.6:8086'
-VUE_APP_BASE_API  = 'http://172.16.120.49/yktapi/'
+VUE_APP_BASE_API  = '/yktapi'
 # 如果接口是 http 形式, wss 需要改为 ws
 #VUE_APP_WS_API = 'ws://47.99.156.213:1537'
 #VUE_APP_WS_API = 'ws://114.55.24.6:8086'

+ 20 - 20
public/index.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="/favicon.png">
+    <link rel="icon" href="/yktweb/favicon.png">
     <title>
         <%= webpackConfig.name %>
     </title>
@@ -20,14 +20,14 @@
         padding: 0px;
         /* background-color: #7171C6; */
     }
-
+    
     .chromeframe {
         margin: 0.2em 0;
         background: #ccc;
         color: #000;
         padding: 0.2em 0;
     }
-
+    
     #loader-wrapper {
         position: fixed;
         top: 0;
@@ -36,7 +36,7 @@
         height: 100%;
         z-index: 999999;
     }
-
+    
     #loader {
         display: block;
         position: relative;
@@ -55,7 +55,7 @@
         animation: spin 2s linear infinite;
         z-index: 1001;
     }
-
+    
     #loader:before {
         content: "";
         position: absolute;
@@ -72,7 +72,7 @@
         -ms-animation: spin 3s linear infinite;
         animation: spin 3s linear infinite;
     }
-
+    
     #loader:after {
         content: "";
         position: absolute;
@@ -89,7 +89,7 @@
         -webkit-animation: spin 1.5s linear infinite;
         animation: spin 1.5s linear infinite;
     }
-
+    
     @-webkit-keyframes spin {
         0% {
             -webkit-transform: rotate(0deg);
@@ -102,7 +102,7 @@
             transform: rotate(360deg);
         }
     }
-
+    
     @keyframes spin {
         0% {
             -webkit-transform: rotate(0deg);
@@ -115,7 +115,7 @@
             transform: rotate(360deg);
         }
     }
-
+    
     #loader-wrapper .loader-section {
         position: fixed;
         top: 0;
@@ -127,15 +127,15 @@
         -ms-transform: translateX(0);
         transform: translateX(0);
     }
-
+    
     #loader-wrapper .loader-section.section-left {
         left: 0;
     }
-
+    
     #loader-wrapper .loader-section.section-right {
         right: 0;
     }
-
+    
     .loaded #loader-wrapper .loader-section.section-left {
         -webkit-transform: translateX(-100%);
         -ms-transform: translateX(-100%);
@@ -143,7 +143,7 @@
         -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
         transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
     }
-
+    
     .loaded #loader-wrapper .loader-section.section-right {
         -webkit-transform: translateX(100%);
         -ms-transform: translateX(100%);
@@ -151,13 +151,13 @@
         -webkit-transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
         transition: all 0.7s 0.3s cubic-bezier(0.645, 0.045, 0.355, 1.000);
     }
-
+    
     .loaded #loader {
         opacity: 0;
         -webkit-transition: all 0.3s ease-out;
         transition: all 0.3s ease-out;
     }
-
+    
     .loaded #loader-wrapper {
         visibility: hidden;
         -webkit-transform: translateY(-100%);
@@ -166,15 +166,15 @@
         -webkit-transition: all 0.3s 1s ease-out;
         transition: all 0.3s 1s ease-out;
     }
-
+    
     .no-js #loader-wrapper {
         display: none;
     }
-
+    
     .no-js h1 {
         color: #222222;
     }
-
+    
     #loader-wrapper .load_title {
         font-family: 'Open Sans';
         color: #FFF;
@@ -187,7 +187,7 @@
         opacity: 1;
         line-height: 30px;
     }
-
+    
     #loader-wrapper .load_title span {
         font-weight: normal;
         font-style: italic;
@@ -207,4 +207,4 @@
             <div class="load_title">正在加载系统资源,请耐心等待</div>
         </div>
     </div>
-</body>
+</body>

+ 2 - 2
src/views/login.vue

@@ -203,14 +203,14 @@ export default {
       this.$store.dispatch('LoginERP', data).then((res) => {
         this.$router.push({ path: '/dashboard' }).catch(() => {})
       }).catch((err) => {
-        location.href = '/dashboard'
+        location.href = '/yktweb/#/'
       })
     },
     handleLoginSaaS(data) { // SaaS登录
       this.$store.dispatch('Login', data).then((res) => {
         this.$router.push({ path: '/dashboard' })
       }).catch((err) => {
-        location.href = ''
+        location.href = '/yktweb/#/'
       })
     }
   }