update

hksystem/build/env.js

@@ -1 +1 @@
-export default "production";
+export default "development";

hksystem/src/components/login/index.vue

@@ -44,6 +44,11 @@ export default {
                 if (res.data.status === 0) {
                     Cookies.set('user', this.username);
                     Cookies.set('token', res.data.token);
+                    if (res.data.role == "admin") {
+                        Cookies.set("access", 1);
+                    } else {
+                        Cookies.set("access", 0);
+                    }
                     this.axios.defaults.headers.common['Authorization'] = "Bearer " + res.data.token;
                     this.show = false;
                 }

hksystem/src/router/index.js

@@ -38,7 +38,7 @@ router.beforeEach((to, from, next) => {
         } else {
             const curRouterObj = Util.getRouterObjByName([otherRouter, ...appRouter], to.name);
             if (curRouterObj && curRouterObj.access !== undefined) { // 需要判断权限的路由
-                if (curRouterObj.access === parseInt(Cookies.get('access'))) {
+                if (Util.oneOf(parseInt(Cookies.get('access')), curRouterObj.access)) {
                     Util.toDefaultPage([otherRouter, ...appRouter], to.name, router, next); // 如果在地址栏输入的是一级菜单则默认打开其第一个二级菜单的页面
                 } else {
                     next({

hksystem/src/router/router.js

@@ -77,6 +77,7 @@ export const appRouter = [{
                 path: 'housekeeper',
                 title: '通用服务订单',
                 name: 'order_housekeeper',
+                access: [0, 1],
                 component: resolve => {
                     require(['@/views/housekeeper/index.vue'], resolve);
                 }
@@ -85,6 +86,7 @@ export const appRouter = [{
                 path: 'matron',
                 title: '月嫂订单',
                 name: 'order_matron',
+                access: [1],
                 component: resolve => {
                     require(['@/views/matron/index.vue'], resolve);
                 }
@@ -93,6 +95,7 @@ export const appRouter = [{
                 path: 'product',
                 title: '母婴产品订单',
                 name: 'order_product',
+                access: [0, 1],
                 component: resolve => {
                     require(['@/views/product-order/index.vue'], resolve);
                 }
@@ -106,6 +109,7 @@ export const appRouter = [{
         icon: 'bag',
         name: 'product',
         title: '母婴产品管理',
+        access: [1],
         component: Main,
         children: [{
                 path: 'classify',
@@ -131,6 +135,7 @@ export const appRouter = [{
         name: 'service',
         title: '分类管理',
         component: Main,
+        access: [1],
         children: [{
             path: 'index',
             title: '分类管理',
@@ -145,6 +150,7 @@ export const appRouter = [{
         icon: 'social-usd',
         name: 'reward',
         title: '打赏金额',
+        access: [1],
         component: Main,
         children: [{
             path: 'index',
@@ -160,6 +166,7 @@ export const appRouter = [{
         icon: 'ios-person',
         name: 'introduce',
         title: '企业介绍',
+        access: [1],
         component: Main,
         children: [{
             path: 'index',
@@ -175,6 +182,7 @@ export const appRouter = [{
         icon: 'home',
         name: 'image',
         title: '首页介绍和图片配置',
+        access: [1],
         component: Main,
         children: [{
             path: 'index',
@@ -242,42 +250,28 @@ export const appRouter = [{
     // }
 ];
 
-// var other = [{
-//         path: '/banner',
-//         icon: 'images',
-//         name: 'banner',
-//         title: 'banner轮播图',
-//         component: Main,
-//         children: [{
-//             path: 'index',
-//             title: 'banner轮播图',
-//             name: 'banner_index',
-//             component: resolve => {
-//                 require(['@/views/banner/banner.vue'], resolve);
-//             }
-//         }]
-//     },
-//     {
-//         path: '/homework',
-//         icon: 'images',
-//         name: 'homework',
-//         title: '家政详情',
-//         component: Main,
-//         children: [{
-//             path: 'index',
-//             title: '家政详情',
-//             name: 'homework_index',
-//             component: resolve => {
-//                 require(['@/views/homework/homework.vue'], resolve);
-//             }
-//         }]
-//     }
-// ];
+var other = [{
+        path: '/banner',
+        icon: 'images',
+        name: 'banner',
+        title: 'banner轮播图',
+        component: Main,
+        children: [{
+            path: 'index',
+            title: 'banner轮播图',
+            name: 'banner_index',
+            component: resolve => {
+                require(['@/views/banner/banner.vue'], resolve);
+            }
+        }]
+    }
+];
 
 // 所有上面定义的路由都要写在下面的routers里
 export const routers = [
     loginRouter,
     otherRouter,
+    ...other,
     locking,
     ...appRouter,
     page500,

hksystem/src/views/banner/banner.less

@@ -27,4 +27,44 @@
             height: 200px;
         }
     }
+}
+.upload-list {
+    display: inline-block;
+    height: 60px;
+}
+.admin-upload-list{
+    display: inline-block;
+    width: 60px;
+    height: 60px;
+    text-align: center;
+    line-height: 60px;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    overflow: hidden;
+    background: #fff;
+    position: relative;
+    box-shadow: 0 1px 1px rgba(0,0,0,.2);
+    margin-right: 4px;
+}
+.admin-upload-list img{
+    width: 100%;
+    height: 100%;
+}
+.admin-upload-list-cover{
+    display: none;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background: rgba(0,0,0,.6);
+}
+.admin-upload-list:hover .admin-upload-list-cover{
+    display: block;
+}
+.admin-upload-list-cover i{
+    color: #fff;
+    font-size: 20px;
+    cursor: pointer;
+    margin: 0 2px;
 }

hksystem/src/views/banner/banner.vue

@@ -31,14 +31,7 @@
                                 <Icon type="camera" size="20"></Icon>
                             </div>
                         </Upload>
-                        <Modal title="查看图片" v-model="visible">
-                            <img :src="'https://o5wwk8baw.qnssl.com/' + imgName + '/large'" v-if="visible" style="width: 100%">
-                        </Modal>
-                    </Card>
-                </Col>
-                <Col span="16" class="padding-left-10">
-                    <Card>
-                        <div class="height-460px">
+                        <div class="upload-list">
                             <div class="admin-upload-list" v-for="item in uploadList" :key="item.url">
                                 <template v-if="item.status === 'finished'">
                                     <img :src="item.url">
@@ -52,6 +45,10 @@
                                 </template>
                             </div>
                         </div>
+                        
+                        <Modal title="查看图片" v-model="visible">
+                            <img :src="'https://o5wwk8baw.qnssl.com/' + imgName + '/large'" v-if="visible" style="width: 100%">
+                        </Modal>
                     </Card>
                 </Col>
             </div>

hksystem/src/views/login.vue

@@ -71,6 +71,11 @@ export default {
                         if (res.data.status === 0) {
                             Cookies.set('user', this.form.userName);
                             Cookies.set('token', res.data.token);
+                            if (res.data.role == "admin") {
+                                Cookies.set("access", 1);
+                            } else {
+                                Cookies.set("access", 0);
+                            }
                             this.axios.defaults.headers.common['Authorization'] = "Bearer " + res.data.token;
                             this.$router.push({
                                 name: 'home_index'