Merge branch 'dev' of https://git.oa00.com/xiaowen/LittleBeeSaas into dev

3 years ago · 9824a73bfc
parent 54923e7499 85bc1c80e2
commit 9824a73bfc
7 changed files with 39 additions and 88 deletions
--- a/src/assets/images/logo.png
+++ b/src/assets/images/logo.png
--- a/src/router/basic.js
+++ b/src/router/basic.js
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-24 14:45:04
- * @LastEditTime: 2021-11-24 14:58:38
+ * @LastEditTime: 2021-11-24 15:27:01
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: /LittleBeeSaas/src/router/basic.js
@ -51,6 +51,7 @@ export default [
        title: "考勤管理",
        icon: 'profile',
        hide: false,
+        redirect: '/attendance/record',
        component: resolve => require(['@/views/Attendance'], resolve),
        meta: {title: '考勤管理'},
        children: [
--- a/src/router/index.js
+++ b/src/router/index.js
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-11-18 17:30:38
- * @LastEditTime: 2021-11-24 14:59:12
+ * @LastEditTime: 2021-11-24 17:43:23
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: /ansu-business/src/router/index.js
@ -16,7 +16,6 @@ Router.prototype.push = function push(location) {
 Vue.use(Router);

 import Layout from "@/views/Layout"
-// import test from "./test" 
 import basic from "./basic" // 基础功能
 // import payment from "./payment" // 缴费管理
 // import smartMall from "./smartMall" // 智慧商城 
--- a/src/router/test.js
+++ b/src/router/test.js
@ -1,58 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-11-24 14:43:24
- * @LastEditTime: 2021-11-24 14:43:25
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /LittleBeeSaas/src/router/test.js
- */
-
-export default [
-    {
-        path: '/forecastShipping',
-        name: "ForecastShipping",
-        title: "预报寄件",
-        hide: false,
-        icon: 'container',
-        component: resolve => require(['@/views/ForecastShipping'], resolve),
-        meta: {title: '预报寄件'}
-    },
-    {
-        path: '/waybill',
-        name: "Waybill",
-        title: "运单管理",
-        icon: 'database',
-        hide: false,
-        component: resolve => require(['@/views/Waybill'], resolve),
-        meta: {title: '运单管理'}
-    },
-    {
-        path: '/billing',
-        name: "Billing",
-        title: "账单管理",
-        icon: 'profile',
-        hide: false,
-        component: resolve => require(['@/views/Billing'], resolve),
-        meta: {title: '账单管理'},
-        children: [
-            {
-                path: '/billing/_details',
-                name: "Billing_details",
-                title: "账单管理-详情",
-                icon: 'profile', 
-                hide: true,
-                component: resolve => require(['@/views/Billing/_details'], resolve),
-                meta: {title: '账单管理-详情'},
-            }
-        ]
-    },
-    {
-        path: '/mySettings',
-        name: "MySettings",
-        title: "我的设置",
-        hide: false,
-        icon: 'setting',
-        component: resolve => require(['@/views/MySettings'], resolve),
-        meta: {title: '我的设置'}
-    }
-]
--- a/src/styles/antd.less
+++ b/src/styles/antd.less
@ -16,6 +16,9 @@
 .ant-menu-inline {
    border-right: 1px solid transparent !important;
 }
+.ant-menu-inline-collapsed {
+    border-right: 1px solid transparent !important;
+}
 .ant-menu-inline > .ant-menu-item {
    color: #fff;
 }
@ -31,3 +34,28 @@
 .ant-menu-submenu-inline > .ant-menu-submenu-title .ant-menu-submenu-arrow::after {
    background-image: linear-gradient(to right, rgba(247, 249, 251, 1), rgba(247, 249, 251, 1)) !important;
 }
+.ant-menu-inline-collapsed > .ant-menu-submenu > .ant-menu-submenu-title {
+    color: #fff !important;
+}
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected .anticon {
+    color: #1990fe !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-item {
+    color: #fff !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-item .anticon {
+    color: #fff !important;
+}
+.ant-menu-inline-collapsed > .ant-menu-submenu-selected {
+    color: #1990fe !important;
+}
+.ant-menu-vertical > .ant-menu-item {
+    color: #fff !important;
+}
+.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected {
+    color: #1990fe !important;
+}
+
+.ant-menu-inline-collapsed .ant-menu-submenu-selected .ant-menu-submenu-title{
+    color: #1990fe !important;
+}
--- a/src/views/Layout/index.vue
+++ b/src/views/Layout/index.vue
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-18 17:27:08
- * @LastEditTime: 2021-11-24 10:22:05
+ * @LastEditTime: 2021-11-24 15:34:41
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: /ansu-business/src/views/Layout/index.vue
@ -9,7 +9,7 @@
 <template>
    <a-layout id="components-layout-demo-custom-trigger">
        <a-layout-sider v-model="collapsed" :trigger="null" collapsible>
-            <div class="logo"><img class="m1" src="../../assets/images/logo.png" /><span class="s1" v-if="!collapsed">安速货运</span></div>
+            <div class="logo"><img class="m1" src="../../assets/images/logo.png" /><span class="s1" v-if="!collapsed">小蜜蜂SaaS</span></div>
            <yMenu :csd="collapsed"></yMenu>
        </a-layout-sider>
        <a-layout>
@ -81,7 +81,7 @@ export default {
    },
    methods: {
        handlerBread(row) {
-            let path = row.fullPath || "/";
+            let path = row.path || "/";
            this.$router.push(path);
        },
        handlerTags(n) {
@ -108,10 +108,14 @@ export default {
    justify-content: center;
    align-items: center;
    .m1 {
-        width: 74px;
+       height: 24px;
+       background: #fff;
+       padding: 3px;
+       border-radius: 2px;
    }
    .s1 {
        display: block;
+        color: #d6d6d6;
        font-size: 16px;
        margin-left: 10px;
        font-weight: 500;
--- a/src/views/MySettings/index.vue
+++ b/src/views/MySettings/index.vue
@ -1,23 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-11-22 15:56:04
- * @LastEditTime: 2021-11-22 17:13:55
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: /ansu-business/src/views/Waybill/index.vue
-->
-<template>
-    <div>
-        2222
-    </div>
-</template>
-
-<script>
-export default {
-    name: "MySettings"
-}
-</script>
-
-<style lang="less" scoped>
-
-</style>