Merge branch 'dev'

Author: lianghx-319

README.md

@@ -10,6 +10,7 @@
 ## Table of Contents
 
 - [Introduction](#introduction)
+- [Demo](#demo)
 - [Features](#features)
 - [Links](#links)
 - [Usage](#usage)
@@ -46,6 +47,22 @@ Create an enterprise nuxt app in seconds.
 
 [⬆ Back to Top](#table-of-contents)
 
+## [Demo](https://femessage.github.io/create-nuxt-app/)
+
+### Nuxt-Admin
+
+- 租户id admin
+- 帐号   admin
+- 密码   abcd1234
+
+**run local dev server**
+
+```sh
+# white a .env file in root
+API_SERVER=https://mockapi.eolinker.com/IeZWjzy87c204a1f7030b2a17b00f3776ce0a07a5030a1b
+APP_ID=1204701543597604893
+```
+
 ## Usage
 
 Make sure you have [npx](https://www.npmjs.com/package/npx) installed (`npx` is shipped by default since [npm](https://www.npmjs.com/get-npm) `5.2.0`)

template/framework-admin/components/sidebar.vue

@@ -68,31 +68,31 @@ export default {
   flex-direction: column;
   justify-content: space-between;
 
-  .el-menu {
+  > .el-menu {
     box-sizing: border-box;
     padding-top: 12px;
     flex: 1;
     border: none;
     height: calc(100vh - @--footer-height - @--header-height);
     width: 100% !important;
+  }
 
-    .el-menu-item {
-      &:hover {
-        color: @menu-active-text-color !important;
-        background-color: transparent !important;
-      }
-
-      &.is-active {
-        background-color: @--color-primary !important;
-      }
+  .el-menu-item {
+    &:hover {
+      color: @menu-active-text-color !important;
+      background-color: transparent !important;
     }
 
-    [class*='icon'] {
-      font-size: 14px;
-      margin-right: 5px;
+    &.is-active {
+      background-color: @--color-primary !important;
     }
   }
 
+  [class*='icon'] {
+    font-size: 14px;
+    margin-right: 5px;
+  }
+
   .fix-btn-wrap {
     height: @--footer-height;
 

template/framework-admin/store/index.js

@@ -5,7 +5,7 @@ const cookieConfig = {
   get domain() {
     const {hostname} = location
     // 本地环境
-    if (/^(127\.0\.0\.1|localhost)|(netlify\.com)$/.test(hostname))
+    if (!(/deepexi\.(com|top)$/.test(hostname)))
       return hostname
     // 线上环境
     const s = hostname.indexOf('.')
@@ -17,12 +17,19 @@ const cookieConfig = {
   },
 }
 
-const createMenuItem = ({name = '', id = '', pathUrl = '/', iconUrl}) => {
+const createMenuItem = ({
+  name = '',
+  id = '',
+  pathUrl = '/',
+  iconUrl,
+  children = [],
+}) => {
   return {
     url: pathUrl,
     id: id,
     name: name,
     icon: iconUrl,
+    children: children?.length ? children.map(createMenuItem) : null,
   }
 }