qh лет назад: 2
Родитель
Сommit
f63cfef66f

+ 6 - 3
package.json

@@ -64,9 +64,9 @@
     "compression-webpack-plugin": "^3.1.0"
   },
   "eslintConfig": {
-    "root": true,
+    "root": false,
     "env": {
-      "node": true
+      "node": false
     },
     "extends": [
       "plugin:vue/strongly-recommended",
@@ -99,7 +99,10 @@
       "vue/html-closing-bracket-newline": 0,
       "vue/no-parsing-error": 0,
       "no-tabs": 0,
-      "indent": ["off", 2],
+      "indent": [
+        "off",
+        2
+      ],
       "no-console": 0,
       "space-before-function-paren": 0
     }

+ 15 - 0
src/components/layouts/HotelSelect.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>
+        {{ index }}
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            index: 1
+        }
+    }
+}
+</script>

+ 2 - 1
src/components/layouts/index.js

@@ -4,5 +4,6 @@ import BasicLayout from '@/components/layouts/BasicLayout'
 import RouteView from '@/components/layouts/RouteView'
 import PageView from '@/components/layouts/PageView'
 import TabLayout from '@/components/layouts/TabLayout'
+import HotelSelect from '@/components/layouts/HotelSelect'
 
-export { UserLayout, BasicLayout, BlankLayout, RouteView, PageView, TabLayout }
+export { UserLayout, BasicLayout, BlankLayout, RouteView, PageView, TabLayout, HotelSelect}

+ 5 - 3
src/config/index.js

@@ -2,9 +2,11 @@
 import Vue from 'vue'
 //设置全局API_BASE_URL
 Vue.prototype.API_BASE_URL = window._CONFIG.VUE_APP_API_BASE_URL?window._CONFIG.VUE_APP_API_BASE_URL:process.env.VUE_APP_API_BASE_URL
-window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
+// window._CONFIG['domianURL'] = Vue.prototype.API_BASE_URL
+var domainPrefix = '/jeecg-boot'
+window._CONFIG['domianURL'] = '/jeecg-boot'
 //单点登录地址
 window._CONFIG['casPrefixUrl'] = window._CONFIG.VUE_APP_CAS_BASE_URL?window._CONFIG.VUE_APP_CAS_BASE_URL:process.env.VUE_APP_CAS_BASE_URL
 window._CONFIG['onlinePreviewDomainURL'] =  window._CONFIG.VUE_APP_ONLINE_BASE_URL?window._CONFIG.VUE_APP_ONLINE_BASE_URL:process.env.VUE_APP_ONLINE_BASE_URL
-window._CONFIG['staticDomainURL'] = Vue.prototype.API_BASE_URL + '/sys/common/static'
-window._CONFIG['pdfDomainURL'] = Vue.prototype.API_BASE_URL+ '/sys/common/pdf/pdfPreviewIframe'
+window._CONFIG['staticDomainURL'] = domainPrefix + '/sys/common/static'
+window._CONFIG['pdfDomainURL'] = domainPrefix + '/sys/common/pdf/pdfPreviewIframe'

+ 10 - 3
src/config/router.config.js

@@ -1,13 +1,20 @@
-import { UserLayout, TabLayout, RouteView, BlankLayout, PageView } from '@/components/layouts'
+import { UserLayout, TabLayout, RouteView, BlankLayout, PageView, HotelSelect } from '@/components/layouts'
 
 /**
  * 走菜单,走权限控制
  * @type {[null,null]}
  */
 export const asyncRouterMap = [
-
   {
-    path: '/',
+    path: '/entey/select_hotel',
+    name: 'hotelEntry',
+    component: HotelSelect,
+    meta: { title: '选择酒店' },
+    redirect: '/entey/select_hotel',
+    children: []
+  },
+  {
+    path: '/home',
     name: 'dashboard',
     component: TabLayout,
     meta: { title: '首页' },

+ 1 - 1
src/utils/request.js

@@ -108,7 +108,7 @@ service.interceptors.request.use(config => {
   if (token) {
     config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }
-
+  config.headers[ 'Auth' ] = "XPLSOspYuisBnjKcYQZmGpq"
   // update-begin--author:sunjianlei---date:20200723---for 如果当前在low-app环境,并且携带了appId,就向Header里传递appId
   const $route = router.currentRoute
   if ($route && $route.name && $route.name.startsWith('low-app') && $route.params.appId) {

+ 5 - 2
src/views/user/Login.vue

@@ -127,8 +127,11 @@ export default {
       },
       //登录成功
       loginSuccess () {
-        this.$router.push({ path: "/dashboard/analysis" }).catch(()=>{
-          console.log('登录跳转首页出错,这个错误从哪里来的')
+        alert('登录跳转')
+        this.$router.push({ path: "/entey/select_hotel" }).catch((error)=>{
+          debugger
+          console.log('登录跳转首页出错,这个错误从哪里来的:'+error)
+
         })
         this.$notification.success({
           message: '欢迎',

+ 5 - 5
src/views/user/LoginSelectTenant.vue

@@ -96,11 +96,11 @@ export default {
         let multi_depart = loginResult.multi_depart
         //0:无部门 1:一个部门 2:多个部门
         if(multi_depart==0){
-          this.$notification.warn({
-            message: '提示',
-            description: `您尚未归属部门,请确认账号信息`,
-            duration:3
-          });
+          // this.$notification.warn({
+          //   message: '提示',
+          //   description: `您尚未归属部门,请确认账号信息`,
+          //   duration:3
+          // });
           this.isMultiDepart = false
         }else if(multi_depart==2){
           this.visible=true