Skip to content

Commit 2b2922d

Browse files
committed
无关更新
1 parent f6b4fa8 commit 2b2922d

File tree

22 files changed

+499
-111
lines changed

22 files changed

+499
-111
lines changed

package-lock.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
"wangeditor": "^3.1.1"
3838
},
3939
"dependencies": {
40+
"js-cookie": "^2.2.1",
4041
"mavon-editor": "^2.9.0",
4142
"vue-progressbar": "^0.7.5",
4243
"vue-router": "^3.0.7"

public/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/app.js.LICENSE.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
/*!
2+
* JavaScript Cookie v2.2.1
3+
* https://github.com/js-cookie/js-cookie
4+
*
5+
* Copyright 2006, 2015 Klaus Hartl & Fagner Brack
6+
* Released under the MIT license
7+
*/
8+
19
/*!
210
* vue-bus v1.2.1
311
* https://github.com/yangmingshan/vue-bus

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=855bcf2b62c68b563abe",
2+
"/app.js": "/app.js?id=c11b0acb44ccf99d2da4",
33
"/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
44
"/vendor.js": "/vendor.js?id=df0be4950fcb717193ba"
55
}

resources/js/Admin.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default class VueAdmin {
5454
let _this = this;
5555
this.boot();
5656
this.app = new Vue({
57-
el: '#vue-admin',
57+
el: '#app',
5858
store,
5959
router
6060
});

resources/js/components.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import Vue from "vue";
22

3+
34
Vue.component("login", require("@/components/Login").default);
45
Vue.component("Root", require("@/components/Root").default);
56
Vue.component("Content", require("@/components/layout/Content").default);

resources/js/components/Root.vue

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88
:width="isCollapsed ? '64px' : '200px'"
99
>
1010
<div class="content-side-logo">
11-
<template v-if="page_data.logoShow">
11+
<template v-if="pageData.logoShow">
1212
<template v-if="isDark">
13-
<template v-if="page_data.logoLight">
14-
<img v-if="isCollapsed" :src="page_data.logoMiniLight" />
15-
<img :src="page_data.logoLight" />
13+
<template v-if="pageData.logoLight">
14+
<img v-if="isCollapsed" :src="pageData.logoMiniLight" />
15+
<img :src="pageData.logoLight" />
1616
</template>
1717
<template v-else>
1818
<img v-if="isCollapsed" src="../assets/logo-mini-light.svg" />
1919
<img v-else src="../assets/logo-light.svg" />
2020
</template>
2121
</template>
2222
<template v-else>
23-
<template v-if="page_data.logo">
24-
<img v-if="isCollapsed" :src="page_data.logoMini" />
25-
<img :src="page_data.logo" />
23+
<template v-if="pageData.logo">
24+
<img v-if="isCollapsed" :src="pageData.logoMini" />
25+
<img :src="pageData.logo" />
2626
</template>
2727
<template v-else>
2828
<img v-if="isCollapsed" src="../assets/logo-mini.svg" />
2929
<img v-else src="../assets/logo.svg" />
3030
</template>
3131
</template>
3232
</template>
33-
<h1 v-if="!isCollapsed && page_data.name">{{ page_data.name }}</h1>
33+
<h1 v-if="!isCollapsed && pageData.name">{{ pageData.name }}</h1>
3434
</div>
3535
<el-scrollbar wrap-class="scrollbar-wrapper">
3636
<el-menu
@@ -39,10 +39,10 @@
3939
:background-color="isDark ? '#1d1e23' : ''"
4040
:text-color="isDark ? '#ffffff' : ''"
4141
:collapse-transition="false"
42-
:unique-opened="page_data.uniqueOpened"
42+
:unique-opened="pageData.uniqueOpened"
4343
:router="true"
4444
>
45-
<template v-for="menu in page_data.menu">
45+
<template v-for="menu in pageData.menu">
4646
<el-submenu
4747
:index="menu.route"
4848
:key="menu.id"
@@ -101,7 +101,7 @@
101101
<el-breadcrumb-item :to="{ path: '/' }"
102102
>首页</el-breadcrumb-item
103103
>
104-
<template v-for="menu in page_data.menuList">
104+
<template v-for="menu in pageData.menuList">
105105
<el-breadcrumb-item
106106
v-if="menu.route == route"
107107
:key="menu.route"
@@ -124,9 +124,9 @@
124124
<div class="layout-header-trigger layout-header-trigger-min hover">
125125
<el-dropdown>
126126
<div class="layout-header-user">
127-
<el-avatar :src="page_data.user.avatar" :size="25" />
127+
<el-avatar :src="pageData.user.avatar" :size="25" />
128128
<span class="layout-header-user-name">{{
129-
page_data.user.name
129+
pageData.user.name
130130
}}</span>
131131
</div>
132132
<el-dropdown-menu slot="dropdown">
@@ -157,7 +157,7 @@
157157
<div class="footer-links">
158158
<el-link
159159

160-
v-for="(item, index) in page_data.footerLinks"
160+
v-for="(item, index) in pageData.footerLinks"
161161
:key="index"
162162
type="text"
163163
:href="item.href"
@@ -166,7 +166,7 @@
166166
>{{ item.title }}</el-link
167167
>
168168
</div>
169-
<div v-html="page_data.copyright"></div>
169+
<div v-html="pageData.copyright"></div>
170170
</div>
171171
</el-footer>
172172
</el-container>
@@ -240,7 +240,7 @@ import { flattenDeepChild } from "../utils";
240240
241241
export default {
242242
props: {
243-
page_data: Object,
243+
pageData: Object,
244244
},
245245
data() {
246246
return {
@@ -303,7 +303,7 @@ export default {
303303
return ["menu-item", this.isCollapsed ? "collapsed-menu" : ""];
304304
},
305305
menuRoutes() {
306-
return flattenDeepChild(this.page_data.menu, "children", "route");
306+
return flattenDeepChild(this.pageData.menu, "children", "route");
307307
},
308308
},
309309
methods: {
@@ -315,7 +315,7 @@ export default {
315315
},
316316
onLogout() {
317317
this.$confirm("您确定退出登录当前账户吗?", "退出登陆确认").then(() => {
318-
window.location.href = this.page_data.url.logout;
318+
window.location.href = this.pageData.url.logout;
319319
});
320320
},
321321
},

resources/js/settings.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
module.exports = {
2+
3+
title: 'Laravel Vue Admin',
4+
5+
/**
6+
* @type {boolean} true | false
7+
* @description Whether fix the header
8+
*/
9+
fixedHeader: false,
10+
11+
/**
12+
* @type {boolean} true | false
13+
* @description Whether show the logo in sidebar
14+
*/
15+
sidebarLogo: false
16+
}

resources/js/store/getters.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const getters = {
2+
sidebar: state => state.app.sidebar,
3+
device: state => state.app.device,
4+
}
5+
export default getters

0 commit comments

Comments
 (0)