shipeng 4 сар өмнө
parent
commit
a6e391ddcf

+ 1 - 1
.env.development

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 伟大转折后台管理系统(开发)
+VUE_APP_TITLE = 伟大转折窗口售票系统(开发)
 
 # 开发环境配置
 ENV = 'development'

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 伟大转折后台管理系统
+VUE_APP_TITLE = 伟大转折窗口售票系统
 
 # 生产环境配置
 ENV = 'production'

+ 2 - 1
src/api/login.js

@@ -9,7 +9,8 @@ export function login(username, password, code, uuid) {
     uuid
   }
   return request({
-    url: '/system/auth/login',
+    // url: '/system/auth/login',
+    url: '/system/auth/ticketSale/login',
     headers: {
       isToken: false
     },

+ 2 - 1
src/layout/components/Navbar.vue

@@ -109,7 +109,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          location.href = '/window/ticket';
         })
       }).catch(() => {});
     }

+ 12 - 5
src/router/index.js

@@ -64,13 +64,20 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
-    redirect: 'index',
+    redirect: '/window/ticket',
+    hidden: true,
     children: [
+      // {
+      //   path: 'index',
+      //   component: (resolve) => require(['@/views/index'], resolve),
+      //   name: 'Index',
+      //   meta: { title: '首页', icon: 'dashboard', affix: true }
+      // },
       {
-        path: 'index',
-        component: (resolve) => require(['@/views/index'], resolve),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        path: '/window/ticket',
+        component: (resolve) => require(['@/views/windowTicketSales/ticket'], resolve),
+        name: 'Ticket',
+        meta: { title: '售票', icon: 'dashboard', affix: true }
       }
     ]
   },

+ 4 - 2
src/utils/request.js

@@ -93,7 +93,8 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            // location.href = '/index';
+            location.href = '/window/ticket';
           })
       }).catch(() => {
         isRelogin.show = false;
@@ -106,7 +107,8 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('你的账号在其他设备登录,请重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/index';
+            // location.href = '/index';
+            location.href = '/window/ticket';
           })
       }).catch(() => {
         isRelogin.show = false;

+ 4 - 2
src/views/login.vue

@@ -157,8 +157,10 @@ export default {
             Cookies.remove('rememberMe');
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
+            // this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            console.log(this.redirect,'this.redirect');
+            this.$router.push({ path: this.redirect || "/window/ticket" }).catch(()=>{});
+          }).catch(() => {window
             this.loading = false;
             if (this.captchaEnabled) {
               this.getCode();