Commit 403f7b36 authored by lanbaoming's avatar lanbaoming

2024-06-26提交

parent 7f82bd13
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
VUE_APP_BASE_API = 'http://127.0.0.1:48080'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://www.groupage.cn'
\ No newline at end of file
...@@ -3,6 +3,7 @@ ENV = 'development' ...@@ -3,6 +3,7 @@ ENV = 'development'
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com'
VUE_APP_BASE_API = 'http://127.0.0.1:48080'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://www.groupage.cn'
<template> <template>
<div ref="rightPanel" :class="{show:show}" class="rightPanel-container"> <div ref="rightPanel" :class="{ show: show }" class="rightPanel-container">
<div class="rightPanel-background" /> <div class="rightPanel-background" />
<div class="rightPanel"> <div class="rightPanel">
<div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show"> <div
<i :class="show?'el-icon-close':'el-icon-setting'" /> class="handle-button"
:style="{ top: buttonTop + 'px', 'background-color': theme }"
@click="show = !show"
>
<i :class="show ? 'el-icon-close' : 'el-icon-setting'" />
</div> </div>
<div class="rightPanel-items"> <div class="rightPanel-items">
<slot /> <slot />
...@@ -90,8 +94,8 @@ export default { ...@@ -90,8 +94,8 @@ export default {
top: 0; top: 0;
left: 0; left: 0;
opacity: 0; opacity: 0;
transition: opacity .3s cubic-bezier(.7, .3, .1, 1); transition: opacity 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
background: rgba(0, 0, 0, .2); background: rgba(0, 0, 0, 0.2);
z-index: -1; z-index: -1;
} }
...@@ -102,15 +106,15 @@ export default { ...@@ -102,15 +106,15 @@ export default {
position: fixed; position: fixed;
top: 0; top: 0;
right: 0; right: 0;
box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, .05); box-shadow: 0px 0px 15px 0px rgba(0, 0, 0, 0.05);
transition: all .25s cubic-bezier(.7, .3, .1, 1); transition: all 0.25s cubic-bezier(0.7, 0.3, 0.1, 1);
transform: translate(100%); transform: translate(100%);
background: #fff; background: #fff;
z-index: 40000; z-index: 40000;
} }
.show { .show {
transition: all .3s cubic-bezier(.7, .3, .1, 1); transition: all 0.3s cubic-bezier(0.7, 0.3, 0.1, 1);
.rightPanel-background { .rightPanel-background {
z-index: 20000; z-index: 20000;
......
<template> <template>
<div class="navbar"> <div class="navbar">
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> <hamburger
id="hamburger-container"
:is-active="sidebar.opened"
class="hamburger-container"
@toggleClick="toggleSideBar"
/>
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> <breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
<div class="right-menu"> <div class="right-menu">
<template v-if="device!=='mobile'"> <template v-if="device !== 'mobile'">
<search id="header-search" class="right-menu-item" /> <search id="header-search" class="right-menu-item" />
<error-log class="errLog-container right-menu-item hover-effect" /> <error-log class="errLog-container right-menu-item hover-effect" />
<screenfull id="screenfull" class="right-menu-item hover-effect" /> <screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip :content="$t('navbar.size')" effect="dark" placement="bottom"> <el-tooltip
:content="$t('navbar.size')"
effect="dark"
placement="bottom"
>
<size-select id="size-select" class="right-menu-item hover-effect" /> <size-select id="size-select" class="right-menu-item hover-effect" />
</el-tooltip> </el-tooltip>
<lang-select class="right-menu-item hover-effect" /> <lang-select class="right-menu-item hover-effect" />
</template> </template>
<el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <el-dropdown
class="avatar-container right-menu-item hover-effect"
trigger="click"
>
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar"> <img :src="avatar + '?imageView2/1/w/80/h/80'" class="user-avatar">
<i class="el-icon-caret-bottom" /> <i class="el-icon-caret-bottom" />
</div> </div>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<router-link to="/profile/index"> <router-link to="/profile/index">
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.profile') }} {{ $t("navbar.profile") }}
</el-dropdown-item> </el-dropdown-item>
</router-link> </router-link>
<router-link to="/"> <router-link to="/">
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.dashboard') }} {{ $t("navbar.dashboard") }}
</el-dropdown-item> </el-dropdown-item>
</router-link> </router-link>
<a target="_blank" href="https://github.com/PanJiaChen/vue-element-admin/"> <a
target="_blank"
href="https://github.com/PanJiaChen/vue-element-admin/"
>
<el-dropdown-item> <el-dropdown-item>
{{ $t('navbar.github') }} {{ $t("navbar.github") }}
</el-dropdown-item> </el-dropdown-item>
</a> </a>
<a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/"> <a
target="_blank"
href="https://panjiachen.github.io/vue-element-admin-site/#/"
>
<el-dropdown-item>Docs</el-dropdown-item> <el-dropdown-item>Docs</el-dropdown-item>
</a> </a>
<el-dropdown-item divided @click.native="logout"> <el-dropdown-item divided @click.native="logout">
<span style="display:block;">{{ $t('navbar.logOut') }}</span> <span style="display: block">{{ $t("navbar.logOut") }}</span>
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
...@@ -74,11 +91,7 @@ export default { ...@@ -74,11 +91,7 @@ export default {
Search Search
}, },
computed: { computed: {
...mapGetters([ ...mapGetters(['sidebar', 'avatar', 'device'])
'sidebar',
'avatar',
'device'
])
}, },
methods: { methods: {
toggleSideBar() { toggleSideBar() {
...@@ -98,18 +111,18 @@ export default { ...@@ -98,18 +111,18 @@ export default {
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background: #fff; background: #fff;
box-shadow: 0 1px 4px rgba(0,21,41,.08); box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
.hamburger-container { .hamburger-container {
line-height: 46px; line-height: 46px;
height: 100%; height: 100%;
float: left; float: left;
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
-webkit-tap-highlight-color:transparent; -webkit-tap-highlight-color: transparent;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
...@@ -141,10 +154,10 @@ export default { ...@@ -141,10 +154,10 @@ export default {
&.hover-effect { &.hover-effect {
cursor: pointer; cursor: pointer;
transition: background .3s; transition: background 0.3s;
&:hover { &:hover {
background: rgba(0, 0, 0, .025) background: rgba(0, 0, 0, 0.025);
} }
} }
} }
......
<template> <template>
<div :class="{'has-logo':showLogo}"> <div :class="{ 'has-logo': showLogo }">
<logo v-if="showLogo" :collapse="isCollapse" /> <logo v-if="showLogo" :collapse="isCollapse" />
<el-scrollbar wrap-class="scrollbar-wrapper"> <el-scrollbar wrap-class="scrollbar-wrapper">
<el-menu <el-menu
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
:collapse-transition="false" :collapse-transition="false"
mode="vertical" mode="vertical"
> >
<sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" /> <sidebar-item
v-for="route in permission_routes"
:key="route.path"
:item="route"
:base-path="route.path"
/>
</el-menu> </el-menu>
</el-scrollbar> </el-scrollbar>
</div> </div>
...@@ -20,6 +25,7 @@ ...@@ -20,6 +25,7 @@
<script> <script>
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import Logo from './Logo' import Logo from './Logo'
import SidebarItem from './SidebarItem' import SidebarItem from './SidebarItem'
import variables from '@/styles/variables.scss' import variables from '@/styles/variables.scss'
...@@ -27,10 +33,7 @@ import variables from '@/styles/variables.scss' ...@@ -27,10 +33,7 @@ import variables from '@/styles/variables.scss'
export default { export default {
components: { SidebarItem, Logo }, components: { SidebarItem, Logo },
computed: { computed: {
...mapGetters([ ...mapGetters(['permission_routes', 'sidebar']),
'permission_routes',
'sidebar'
]),
activeMenu() { activeMenu() {
const route = this.$route const route = this.$route
const { meta, path } = route const { meta, path } = route
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment