瀏覽代碼

用户权限

liu 6 年之前
父節點
當前提交
2ac0f4aee4
共有 31 個檔案被更改,包括 67 行新增35 行删除
  1. 0
    0
      hksystem/dist/dist/0.a3b31c3be26451555e24.chunk.js
  2. 0
    0
      hksystem/dist/dist/1.a3b31c3be26451555e24.chunk.js
  3. 0
    0
      hksystem/dist/dist/10.a3b31c3be26451555e24.chunk.js
  4. 0
    0
      hksystem/dist/dist/11.a3b31c3be26451555e24.chunk.js
  5. 0
    0
      hksystem/dist/dist/12.a3b31c3be26451555e24.chunk.js
  6. 0
    0
      hksystem/dist/dist/13.a3b31c3be26451555e24.chunk.js
  7. 0
    0
      hksystem/dist/dist/14.a3b31c3be26451555e24.chunk.js
  8. 0
    0
      hksystem/dist/dist/2.a3b31c3be26451555e24.chunk.js
  9. 0
    1
      hksystem/dist/dist/3.74a76af640ad03d1ce71.chunk.js
  10. 1
    0
      hksystem/dist/dist/3.a3b31c3be26451555e24.chunk.js
  11. 0
    1
      hksystem/dist/dist/4.74a76af640ad03d1ce71.chunk.js
  12. 1
    0
      hksystem/dist/dist/4.a3b31c3be26451555e24.chunk.js
  13. 0
    0
      hksystem/dist/dist/5.a3b31c3be26451555e24.chunk.js
  14. 0
    1
      hksystem/dist/dist/6.74a76af640ad03d1ce71.chunk.js
  15. 1
    0
      hksystem/dist/dist/6.a3b31c3be26451555e24.chunk.js
  16. 0
    1
      hksystem/dist/dist/7.74a76af640ad03d1ce71.chunk.js
  17. 1
    0
      hksystem/dist/dist/7.a3b31c3be26451555e24.chunk.js
  18. 0
    0
      hksystem/dist/dist/8.a3b31c3be26451555e24.chunk.js
  19. 0
    1
      hksystem/dist/dist/9.74a76af640ad03d1ce71.chunk.js
  20. 1
    0
      hksystem/dist/dist/9.a3b31c3be26451555e24.chunk.js
  21. 0
    6
      hksystem/dist/dist/main.74a76af640ad03d1ce71.js
  22. 0
    0
      hksystem/dist/dist/main.a3b31c3be26451555e24.css
  23. 6
    0
      hksystem/dist/dist/main.a3b31c3be26451555e24.js
  24. 1
    1
      hksystem/dist/dist/vender-base.a3b31c3be26451555e24.js
  25. 0
    0
      hksystem/dist/dist/vender-exten.a3b31c3be26451555e24.js
  26. 4
    4
      hksystem/dist/index.html
  27. 15
    6
      hksystem/src/components/login/index.vue
  28. 4
    3
      hksystem/src/router/router.js
  29. 4
    3
      hksystem/src/store/modules/app.js
  30. 21
    5
      hksystem/src/views/login.vue
  31. 7
    2
      hksystem/src/views/main-components/shrinkable-menu/components/sidebarMenu.vue

hksystem/dist/dist/0.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/0.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/1.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/1.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/10.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/10.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/11.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/11.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/12.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/12.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/13.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/13.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/14.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/14.a3b31c3be26451555e24.chunk.js 查看文件


hksystem/dist/dist/2.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/2.a3b31c3be26451555e24.chunk.js 查看文件


+ 0
- 1
hksystem/dist/dist/3.74a76af640ad03d1ce71.chunk.js
文件差異過大導致無法顯示
查看文件


+ 1
- 0
hksystem/dist/dist/3.a3b31c3be26451555e24.chunk.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
hksystem/dist/dist/4.74a76af640ad03d1ce71.chunk.js
文件差異過大導致無法顯示
查看文件


+ 1
- 0
hksystem/dist/dist/4.a3b31c3be26451555e24.chunk.js
文件差異過大導致無法顯示
查看文件


hksystem/dist/dist/5.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/5.a3b31c3be26451555e24.chunk.js 查看文件


+ 0
- 1
hksystem/dist/dist/6.74a76af640ad03d1ce71.chunk.js
文件差異過大導致無法顯示
查看文件


+ 1
- 0
hksystem/dist/dist/6.a3b31c3be26451555e24.chunk.js
文件差異過大導致無法顯示
查看文件


+ 0
- 1
hksystem/dist/dist/7.74a76af640ad03d1ce71.chunk.js
文件差異過大導致無法顯示
查看文件


+ 1
- 0
hksystem/dist/dist/7.a3b31c3be26451555e24.chunk.js
文件差異過大導致無法顯示
查看文件


hksystem/dist/dist/8.74a76af640ad03d1ce71.chunk.js → hksystem/dist/dist/8.a3b31c3be26451555e24.chunk.js 查看文件


+ 0
- 1
hksystem/dist/dist/9.74a76af640ad03d1ce71.chunk.js 查看文件

@@ -1 +0,0 @@
1
-webpackJsonp([9],{237:function(e,t,s){s(257),s(258);var r=s(1)(s(259),s(260),null,null);e.exports=r.exports},257:function(e,t){},258:function(e,t){},259:function(e,t,s){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var o=s(6),a=r(o),n=s(14);r(n);t.default={data:function(){return{message:"",form:{userName:"",password:""},rules:{userName:[{required:!0,message:"账号不能为空",trigger:"blur"}],password:[{required:!0,message:"密码不能为空",trigger:"blur"}]}}},methods:{handleSubmit:function(){var e=this;this.$refs.loginForm.validate(function(t){t&&e.axios.post("login",{name:e.form.userName,password:e.form.password}).then(function(t){0===t.data.status?(a.default.set("user",e.form.userName),a.default.set("token",t.data.token),"admin"==t.data.role?a.default.set("access",1):a.default.set("access",0),e.axios.defaults.headers.common.Authorization="Bearer "+t.data.token,e.$router.push({name:"home_index"})):e.message=t.data.message})})}}}},260:function(e,t){e.exports={render:function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("div",{staticClass:"login",on:{keydown:function(t){return"button"in t||!e._k(t.keyCode,"enter",13,t.key,"Enter")?e.handleSubmit(t):null}}},[s("div",{staticClass:"login-con"},[s("Card",{attrs:{bordered:!1}},[s("p",{attrs:{slot:"title"},slot:"title"},[s("Icon",{attrs:{type:"log-in"}}),e._v("\n                欢迎登录\n            ")],1),e._v(" "),s("div",{staticClass:"form-con"},[s("Form",{ref:"loginForm",attrs:{model:e.form,rules:e.rules}},[s("FormItem",{attrs:{prop:"userName"}},[s("Input",{attrs:{placeholder:"请输入用户名"},model:{value:e.form.userName,callback:function(t){e.$set(e.form,"userName",t)},expression:"form.userName"}},[s("span",{attrs:{slot:"prepend"},slot:"prepend"},[s("Icon",{attrs:{size:16,type:"person"}})],1)])],1),e._v(" "),s("FormItem",{attrs:{prop:"password"}},[s("Input",{attrs:{type:"password",placeholder:"请输入密码"},model:{value:e.form.password,callback:function(t){e.$set(e.form,"password",t)},expression:"form.password"}},[s("span",{attrs:{slot:"prepend"},slot:"prepend"},[s("Icon",{attrs:{size:14,type:"locked"}})],1)])],1),e._v(" "),s("FormItem",[s("Button",{attrs:{type:"primary",long:""},on:{click:e.handleSubmit}},[e._v("登录")]),e._v(" "),s("p",{staticStyle:{color:"#f00","text-align":"center"}},[e._v(e._s(e.message))])],1)],1)],1)])],1)])},staticRenderFns:[]}}});

+ 1
- 0
hksystem/dist/dist/9.a3b31c3be26451555e24.chunk.js 查看文件

@@ -0,0 +1 @@
1
+webpackJsonp([9],{237:function(e,t,r){r(257),r(258);var s=r(1)(r(259),r(260),null,null);e.exports=s.exports},257:function(e,t){},258:function(e,t){},259:function(e,t,r){"use strict";function s(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0});var o=r(6),a=s(o),n=r(14);s(n);t.default={data:function(){return{message:"",form:{userName:"",password:""},rules:{userName:[{required:!0,message:"账号不能为空",trigger:"blur"}],password:[{required:!0,message:"密码不能为空",trigger:"blur"}]}}},methods:{handleSubmit:function(){var e=this;this.$refs.loginForm.validate(function(t){t&&e.axios.post("login",{name:e.form.userName,password:e.form.password}).then(function(t){if(0===t.data.status){a.default.set("user",e.form.userName),a.default.set("token",t.data.token);var r=1,s="home_index";switch(t.data.role){case"admin":r=1,s="order_housekeeper";break;case"tongyong":r=2,s="order_housekeeper";break;case"yuesao":s="order_matron",r=3;break;case"muying":r=4,s="order_product"}a.default.set("access",r),e.axios.defaults.headers.common.Authorization="Bearer "+t.data.token,e.$router.push({name:s})}else e.message=t.data.message})})}}}},260:function(e,t){e.exports={render:function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("div",{staticClass:"login",on:{keydown:function(t){return"button"in t||!e._k(t.keyCode,"enter",13,t.key,"Enter")?e.handleSubmit(t):null}}},[r("div",{staticClass:"login-con"},[r("Card",{attrs:{bordered:!1}},[r("p",{attrs:{slot:"title"},slot:"title"},[r("Icon",{attrs:{type:"log-in"}}),e._v("\n                欢迎登录\n            ")],1),e._v(" "),r("div",{staticClass:"form-con"},[r("Form",{ref:"loginForm",attrs:{model:e.form,rules:e.rules}},[r("FormItem",{attrs:{prop:"userName"}},[r("Input",{attrs:{placeholder:"请输入用户名"},model:{value:e.form.userName,callback:function(t){e.$set(e.form,"userName",t)},expression:"form.userName"}},[r("span",{attrs:{slot:"prepend"},slot:"prepend"},[r("Icon",{attrs:{size:16,type:"person"}})],1)])],1),e._v(" "),r("FormItem",{attrs:{prop:"password"}},[r("Input",{attrs:{type:"password",placeholder:"请输入密码"},model:{value:e.form.password,callback:function(t){e.$set(e.form,"password",t)},expression:"form.password"}},[r("span",{attrs:{slot:"prepend"},slot:"prepend"},[r("Icon",{attrs:{size:14,type:"locked"}})],1)])],1),e._v(" "),r("FormItem",[r("Button",{attrs:{type:"primary",long:""},on:{click:e.handleSubmit}},[e._v("登录")]),e._v(" "),r("p",{staticStyle:{color:"#f00","text-align":"center"}},[e._v(e._s(e.message))])],1)],1)],1)])],1)])},staticRenderFns:[]}}});

+ 0
- 6
hksystem/dist/dist/main.74a76af640ad03d1ce71.js
文件差異過大導致無法顯示
查看文件


hksystem/dist/dist/main.74a76af640ad03d1ce71.css → hksystem/dist/dist/main.a3b31c3be26451555e24.css 查看文件


+ 6
- 0
hksystem/dist/dist/main.a3b31c3be26451555e24.js
文件差異過大導致無法顯示
查看文件


hksystem/dist/dist/vender-base.a3b31c3be26451555e24.js
文件差異過大導致無法顯示
查看文件


hksystem/dist/dist/vender-exten.74a76af640ad03d1ce71.js → hksystem/dist/dist/vender-exten.a3b31c3be26451555e24.js 查看文件


+ 4
- 4
hksystem/dist/index.html 查看文件

@@ -5,7 +5,7 @@
5 5
     <title>家政后台</title>
6 6
     <meta charset="UTF-8">
7 7
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,user-scalable=0">
8
-    <link rel="stylesheet" href="/dist/main.74a76af640ad03d1ce71.css">
8
+    <link rel="stylesheet" href="/dist/main.a3b31c3be26451555e24.css">
9 9
     <link rel="stylesheet" name="theme" href="">
10 10
     <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
11 11
 </head>
@@ -13,9 +13,9 @@
13 13
 <body>
14 14
     <div id="app"></div>
15 15
     <div class="lock-screen-back" id="lock_screen_back"></div>
16
-    <script type="text/javascript" src="/dist/vender-base.74a76af640ad03d1ce71.js"></script>
17
-    <script type="text/javascript" src="/dist/vender-exten.74a76af640ad03d1ce71.js"></script>
18
-    <script type="text/javascript" src="/dist/main.74a76af640ad03d1ce71.js"></script>
16
+    <script type="text/javascript" src="/dist/vender-base.a3b31c3be26451555e24.js"></script>
17
+    <script type="text/javascript" src="/dist/vender-exten.a3b31c3be26451555e24.js"></script>
18
+    <script type="text/javascript" src="/dist/main.a3b31c3be26451555e24.js"></script>
19 19
 </body>
20 20
 
21 21
 </html>

+ 15
- 6
hksystem/src/components/login/index.vue 查看文件

@@ -42,13 +42,22 @@ export default {
42 42
                 password: this.password
43 43
             }).then((res) => {
44 44
                 if (res.data.status === 0) {
45
-                    Cookies.set('user', this.username);
46
-                    Cookies.set('token', res.data.token);
47
-                    if (res.data.role == "admin") {
48
-                        Cookies.set("access", 1);
49
-                    } else {
50
-                        Cookies.set("access", 0);
45
+                    let role = 1;
46
+                    switch (res.data.role) {
47
+                        case 'admin':
48
+                            role = 1;
49
+                            break;
50
+                        case 'tongyong':
51
+                            role = 2;
52
+                            break;
53
+                        case 'yuesao':
54
+                            role = 3;
55
+                            break;
56
+                        case 'muying':
57
+                            role = 4;
58
+                            break;
51 59
                     }
60
+                    Cookies.set("access", role);
52 61
                     this.axios.defaults.headers.common['Authorization'] = "Bearer " + res.data.token;
53 62
                     this.show = false;
54 63
                 }

+ 4
- 3
hksystem/src/router/router.js 查看文件

@@ -72,12 +72,13 @@ export const appRouter = [{
72 72
         icon: 'clipboard',
73 73
         name: 'order',
74 74
         title: '订单管理',
75
+        access: [1, 2, 3, 4],
75 76
         component: Main,
76 77
         children: [{
77 78
                 path: 'housekeeper',
78 79
                 title: '通用服务订单',
79 80
                 name: 'order_housekeeper',
80
-                access: [0, 1],
81
+                access: [1, 2],
81 82
                 component: resolve => {
82 83
                     require(['@/views/housekeeper/index.vue'], resolve);
83 84
                 }
@@ -86,7 +87,7 @@ export const appRouter = [{
86 87
                 path: 'matron',
87 88
                 title: '月嫂订单',
88 89
                 name: 'order_matron',
89
-                access: [1],
90
+                access: [1, 3],
90 91
                 component: resolve => {
91 92
                     require(['@/views/matron/index.vue'], resolve);
92 93
                 }
@@ -95,7 +96,7 @@ export const appRouter = [{
95 96
                 path: 'product',
96 97
                 title: '母婴产品订单',
97 98
                 name: 'order_product',
98
-                access: [0, 1],
99
+                access: [1, 4],
99 100
                 component: resolve => {
100 101
                     require(['@/views/product-order/index.vue'], resolve);
101 102
                 }

+ 4
- 3
hksystem/src/store/modules/app.js 查看文件

@@ -2,6 +2,7 @@ import {otherRouter, appRouter} from '@/router/router';
2 2
 import Util from '@/libs/util';
3 3
 import Cookies from 'js-cookie';
4 4
 import Vue from 'vue';
5
+// import { util } from 'node-forge';
5 6
 
6 7
 const app = {
7 8
     state: {
@@ -50,11 +51,11 @@ const app = {
50 51
                             let childrenArr = [];
51 52
                             childrenArr = item.children.filter(child => {
52 53
                                 if (child.access !== undefined) {
53
-                                    if (child.access === accessCode) {
54
-                                        return child;
54
+                                    if (Util.oneOf(accessCode, child.access)) {
55
+                                        return true;
55 56
                                     }
56 57
                                 } else {
57
-                                    return child;
58
+                                    return true;
58 59
                                 }
59 60
                             });
60 61
                             menuList[len - 1].children = childrenArr;

+ 21
- 5
hksystem/src/views/login.vue 查看文件

@@ -73,14 +73,30 @@ export default {
73 73
                         if (res.data.status === 0) {
74 74
                             Cookies.set('user', this.form.userName);
75 75
                             Cookies.set('token', res.data.token);
76
-                            if (res.data.role == "admin") {
77
-                                Cookies.set("access", 1);
78
-                            } else {
79
-                                Cookies.set("access", 0);
76
+                            let role = 1;
77
+                            let home = 'home_index';
78
+                            switch (res.data.role) {
79
+                                case 'admin':
80
+                                    role = 1;
81
+                                    home = "order_housekeeper";
82
+                                    break;
83
+                                case 'tongyong':
84
+                                    role = 2;
85
+                                    home = "order_housekeeper";
86
+                                    break;
87
+                                case 'yuesao':
88
+                                    home = "order_matron";
89
+                                    role = 3;
90
+                                    break;
91
+                                case 'muying':
92
+                                    role = 4;
93
+                                    home = "order_product";
94
+                                    break;
80 95
                             }
96
+                            Cookies.set("access", role);
81 97
                             this.axios.defaults.headers.common['Authorization'] = "Bearer " + res.data.token;
82 98
                             this.$router.push({
83
-                                name: 'home_index'
99
+                                name: home
84 100
                             });
85 101
                         } else {
86 102
                             this.message = res.data.message;

+ 7
- 2
hksystem/src/views/main-components/shrinkable-menu/components/sidebarMenu.vue 查看文件

@@ -5,12 +5,12 @@
5 5
 <template>
6 6
     <Menu ref="sideMenu" :active-name="$route.name" :open-names="openNames" :theme="menuTheme" width="auto" @on-select="changeMenu">
7 7
         <template v-for="item in menuList">
8
-            <MenuItem v-if="item.children.length<=1" :name="item.children[0].name" :key="'menuitem' + item.name">
8
+            <MenuItem v-if="item.children.length<1" :name="item.children[0].name" :key="'menuitem' + item.name">
9 9
                 <Icon :type="item.icon" :size="iconSize" :key="'menuicon' + item.name"></Icon>
10 10
                 <span class="layout-text" :key="'title' + item.name">{{ itemTitle(item) }}</span>
11 11
             </MenuItem>
12 12
 
13
-            <Submenu v-if="item.children.length > 1" :name="item.name" :key="item.name">
13
+            <Submenu v-if="item.children.length >= 1" :name="item.name" :key="item.name">
14 14
                 <template slot="title">
15 15
                     <Icon :type="item.icon" :size="iconSize"></Icon>
16 16
                     <span class="layout-text">{{ itemTitle(item) }}</span>
@@ -40,6 +40,11 @@ export default {
40 40
             type: Array
41 41
         }
42 42
     },
43
+    watch: {
44
+        menuList() {
45
+            console.log(this.menuList);
46
+        }
47
+    },
43 48
     methods: {
44 49
         changeMenu (active) {
45 50
             this.$emit('on-change', active);

Loading…
取消
儲存