Commit 9ada8203 by wsm

测导航栏+头部

parent 21e97916
......@@ -2209,7 +2209,7 @@ const data = [
'volume-up-line',
'volume-vibrate-fill',
'volume-vibrate-line',
'vuejs-fill',
'lqr_logo',
'vuejs-line',
'walk-fill',
'walk-line',
......
<!DOCTYPE html>
<html lang="zh-cmn-Hans" style="filter: grayscale(100%)">
<html lang="zh-cmn-Hans">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
......
......@@ -13,7 +13,7 @@ const setting = {
// 进行编译的依赖
transpileDependencies: [],
//标题 (包括初次加载雪花屏的标题 页面的标题 浏览器的标题)
title: 'vue-admin-better',
title: 'VIP供应商信息平台',
//简写
abbreviation: 'vab',
//开发环境端口号
......
<template>
<div class="vab-ad">
<el-carousel
v-if="adList"
height="30px"
direction="vertical"
:autoplay="true"
:interval="3000"
indicator-position="none"
>
<el-carousel-item v-for="(item, index) in adList" :key="index">
<el-tag type="warning">Ad</el-tag>
<a target="_blank" :href="item.url">{{ item.title }}</a>
</el-carousel-item>
</el-carousel>
</div>
</template>
<script>
import { getList } from '@/api/ad'
export default {
name: 'VabAd',
data() {
return {
nodeEnv: process.env.NODE_ENV,
adList: [],
}
},
created() {
this.fetchData()
},
methods: {
async fetchData() {
const { data } = await getList()
this.adList = data
},
},
}
</script>
<style lang="scss" scoped>
.vab-ad {
height: 30px;
padding-right: $base-padding;
padding-left: $base-padding;
margin-bottom: -20px;
line-height: 30px;
cursor: pointer;
a {
color: #999;
}
}
</style>
<template>
<div v-if="routerView" class="app-main-container">
<vab-github-corner />
<!-- <vab-github-corner />
<transition mode="out-in" name="fade-transform">
<keep-alive :include="cachedRoutes" :max="keepAliveMaxNum">
<router-view :key="key" class="app-main-height" />
......@@ -10,7 +10,7 @@
Copyright
<vab-icon :icon="['fas', 'copyright']"></vab-icon>
vue-admin-better 开源免费版 {{ fullYear }}
</footer>
</footer> -->
</div>
</template>
......
......@@ -10,10 +10,10 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="github">github地址</el-dropdown-item>
<!-- <el-dropdown-item command="github">github地址</el-dropdown-item>
<el-dropdown-item command="gitee" divided>码云地址</el-dropdown-item>
<el-dropdown-item command="pro" divided>pro付费版地址</el-dropdown-item>
<el-dropdown-item command="plus" divided>plus付费版地址</el-dropdown-item>
<el-dropdown-item command="plus" divided>plus付费版地址</el-dropdown-item> -->
<el-dropdown-item command="logout" divided>退出登录</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -96,7 +96,8 @@
}
.user-name {
position: relative;
// position: relative;
display: flex;
margin-left: 5px;
margin-left: 5px;
cursor: pointer;
......
......@@ -2,7 +2,8 @@
<div :class="'logo-container-' + layout">
<router-link to="/">
<!-- 这里是logo变更的位置 -->
<vab-remix-icon v-if="logo" class="logo" :icon-class="logo" />
<!-- <vab-remix-icon v-if="logo" class="logo" :icon-class="logo" /> -->
<img class="logo" src="../../../assets/qr_logo/logo.png" />
<span
class="title"
:class="{ 'hidden-xs-only': layout === 'horizontal' }"
......@@ -52,7 +53,7 @@
@mixin title {
display: inline-block;
overflow: hidden;
font-size: 24px;
font-size: 20px;
line-height: 55px;
color: $base-title-color;
text-overflow: ellipsis;
......@@ -74,13 +75,13 @@
.logo-container-vertical {
@include container;
height: $base-logo-height;
line-height: $base-logo-height;
text-align: center;
.logo {
@include logo;
// color: skyblue !important;
}
.title {
......
......@@ -14,15 +14,18 @@
</el-col>
<el-col :xs="20" :sm="12" :md="12" :lg="12" :xl="12">
<div class="right-panel">
<vab-error-log />
<vab-full-screen-bar @refresh="refreshRoute" />
<vab-theme-bar class="hidden-xs-only" />
<vab-icon
title="重载所有路由"
:pulse="pulse"
:icon="['fas', 'redo']"
@click="refreshRoute"
<span>系统问题咨询电话:021-23513964,业务问题请联系采购或财务</span>
<span>(咨询时间:周一至周五晚上9:00-18:00)</span>
<span>本页操作说明书:</span>
<img
style="margin-right: 0.8vw"
src="@/assets/qr_logo/book.png"
alt=""
/>
<vab-error-log />
<!-- <vab-full-screen-bar @refresh="refreshRoute" /> -->
<!-- <vab-theme-bar class="hidden-xs-only" /> -->
<!-- <vab-icon title="重载所有路由" :pulse="pulse" :icon="['fas', 'redo']" @click="refreshRoute" /> -->
<vab-avatar />
<!-- <vab-icon
title="退出系统"
......@@ -107,6 +110,23 @@
justify-content: flex-end;
height: $base-nav-bar-height;
span {
white-space: nowrap;
&:first-child {
color: #ff0000;
}
&:nth-child(2) {
color: #0000ff;
}
&:nth-child(3) {
font-size: calc(100vw * 15 / 1920);
font-weight: bold;
}
}
::v-deep {
svg {
width: 1em;
......
......@@ -20,7 +20,7 @@
</div>
</div>
<div class="vab-main main-padding">
<vab-ad />
<!-- <vab-ad /> -->
<vab-app-main />
</div>
</div>
......
......@@ -54,22 +54,22 @@ export const asyncRoutes = [
],
},
/* {
path: "/test",
component: Layout,
redirect: "noRedirect",
children: [
{
path: "test",
name: "Test",
component: () => import("@/views/test/index"),
meta: {
title: "test",
icon: "marker",
permissions: ["admin"],
},
},
],
}, */
path: "/test",
component: Layout,
redirect: "noRedirect",
children: [
{
path: "test",
name: "Test",
component: () => import("@/views/test/index"),
meta: {
title: "test",
icon: "marker",
permissions: ["admin"],
},
},
],
}, */
{
path: '/vab',
......@@ -77,290 +77,427 @@ export const asyncRoutes = [
redirect: 'noRedirect',
name: 'Vab',
alwaysShow: true,
meta: { title: '组件', icon: 'box-open' },
meta: {
title: '用户中心',
icon: 'star',
},
children: [
{
path: 'permissions',
name: 'Permission',
component: () => import('@/views/vab/permissions/index'),
path: 'accountProtection',
name: 'accountProtection',
component: () => import('@/views/vab/accountProtection/index'),
meta: {
title: '角色权限',
permissions: ['admin', 'editor'],
title: '供应商子账号维护',
icon: 'user',
},
},
{
path: 'icon',
component: EmptyLayout,
redirect: 'noRedirect',
name: 'Icon',
path: 'payRecord',
name: 'payRecord',
component: () => import('@/views/vab/payRecord/index'),
meta: {
title: '图标',
permissions: ['admin'],
title: '支付记录',
icon: 'yen-sign',
},
children: [
{
path: 'awesomeIcon',
name: 'AwesomeIcon',
component: () => import('@/views/vab/icon/index'),
meta: { title: '常规图标' },
},
{
path: 'colorfulIcon',
name: 'ColorfulIcon',
component: () => import('@/views/vab/icon/colorfulIcon'),
meta: { title: '多彩图标' },
},
],
},
// {
// path: 'icon',
// component: EmptyLayout,
// redirect: 'noRedirect',
// name: 'Icon',
// meta: {
// title: '图标',
// permissions: ['admin'],
// },
// children: [
// {
// path: 'awesomeIcon',
// name: 'AwesomeIcon',
// component: () => import('@/views/vab/icon/index'),
// meta: { title: '常规图标' },
// },
// {
// path: 'colorfulIcon',
// name: 'ColorfulIcon',
// component: () => import('@/views/vab/icon/colorfulIcon'),
// meta: { title: '多彩图标' },
// },
// ],
// },
// {
// path: 'table',
// component: () => import('@/views/vab/table/index'),
// name: 'Table',
// meta: {
// title: '表格',
// permissions: ['admin'],
// },
// },
// {
// path: 'map',
// component: () => import('@/views/vab/map/index'),
// name: 'Map',
// meta: {
// title: '地图',
// permissions: ['admin'],
// },
// },
// {
// path: 'webSocket',
// name: 'WebSocket',
// component: () => import('@/views/vab/webSocket/index'),
// meta: { title: 'webSocket', permissions: ['admin'] },
// },
// {
// path: 'form',
// name: 'Form',
// component: () => import('@/views/vab/form/index'),
// meta: { title: '表单', permissions: ['admin'] },
// },
// {
// path: 'element',
// name: 'Element',
// component: () => import('@/views/vab/element/index'),
// meta: { title: '常用组件', permissions: ['admin'] },
// },
// {
// path: 'tree',
// name: 'Tree',
// component: () => import('@/views/vab/tree/index'),
// meta: { title: '树', permissions: ['admin'] },
// },
// {
// path: 'verify',
// name: 'Verify',
// component: () => import('@/views/vab/verify/index'),
// meta: { title: '验证码', permissions: ['admin'] },
// },
// {
// path: 'menu1',
// component: () => import('@/views/vab/nested/menu1/index'),
// name: 'Menu1',
// alwaysShow: true,
// meta: {
// title: '嵌套路由 1',
// permissions: ['admin'],
// },
// children: [
// {
// path: 'menu1-1',
// name: 'Menu1-1',
// alwaysShow: true,
// meta: { title: '嵌套路由 1-1' },
// component: () => import('@/views/vab/nested/menu1/menu1-1/index'),
// children: [
// {
// path: 'menu1-1-1',
// name: 'Menu1-1-1',
// meta: { title: '嵌套路由 1-1-1' },
// component: () =>
// import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'),
// },
// ],
// },
// ],
// },
// {
// path: 'magnifier',
// name: 'Magnifier',
// component: () => import('@/views/vab/magnifier/index'),
// meta: { title: '放大镜', permissions: ['admin'] },
// },
// {
// path: 'loading',
// name: 'Loading',
// component: () => import('@/views/vab/loading/index'),
// meta: { title: 'loading', permissions: ['admin'] },
// },
// {
// path: 'player',
// name: 'Player',
// component: () => import('@/views/vab/player/index'),
// meta: { title: '视频播放器', permissions: ['admin'] },
// },
// {
// path: 'markdownEditor',
// name: 'MarkdownEditor',
// component: () => import('@/views/vab/markdownEditor/index'),
// meta: { title: 'markdown编辑器', permissions: ['admin'] },
// },
// {
// path: 'editor',
// name: 'Editor',
// component: () => import('@/views/vab/editor/index'),
// meta: {
// title: '富文本编辑器',
// permissions: ['admin'],
// badge: 'New',
// },
// },
// {
// path: 'backToTop',
// name: 'BackToTop',
// component: () => import('@/views/vab/backToTop/index'),
// meta: { title: '返回顶部', permissions: ['admin'] },
// },
// {
// path: 'lodash',
// name: 'Lodash',
// component: () => import('@/views/vab/lodash/index'),
// meta: { title: 'lodash', permissions: ['admin'] },
// },
// {
// path: 'smallComponents',
// name: 'SmallComponents',
// component: () => import('@/views/vab/smallComponents/index'),
// meta: { title: '小组件', permissions: ['admin'] },
// },
// {
// path: 'upload',
// name: 'Upload',
// component: () => import('@/views/vab/upload/index'),
// meta: { title: '上传', permissions: ['admin'] },
// },
// {
// path: 'log',
// name: 'Log',
// component: () => import('@/views/vab/errorLog/index'),
// meta: { title: '错误日志模拟', permissions: ['admin'] },
// },
// {
// path: 'https://github.com/chuzhixin/vue-admin-beautiful?utm_source=gold_browser_extension',
// name: 'ExternalLink',
// meta: {
// title: '外链',
// target: '_blank',
// permissions: ['admin', 'editor'],
// badge: 'New',
// },
// },
// {
// path: 'more',
// name: 'More',
// component: () => import('@/views/vab/more/index'),
// meta: { title: '关于', permissions: ['admin'] },
// },
],
},
{
path: '/layout',
component: Layout,
redirect: 'noRedirect',
name: 'layout',
alwaysShow: true,
meta: {
title: '采购订单获取',
icon: 'box-open',
},
children: [
{
path: 'table',
component: () => import('@/views/vab/table/index'),
name: 'Table',
path: 'directOrder',
name: 'directOrder',
component: () => import('@/views/vab/directOrder/index'),
meta: {
title: '表格',
permissions: ['admin'],
title: '直送订单',
icon: 'book-open',
},
},
{
path: 'map',
component: () => import('@/views/vab/map/index'),
name: 'Map',
path: 'payRecord',
name: 'payRecord',
component: () => import('@/views/vab/getOrder/index'),
meta: {
title: '地图',
permissions: ['admin'],
title: '订单获取',
icon: 'dot-circle',
},
},
{
path: 'webSocket',
name: 'WebSocket',
component: () => import('@/views/vab/webSocket/index'),
meta: { title: 'webSocket', permissions: ['admin'] },
},
{
path: 'form',
name: 'Form',
component: () => import('@/views/vab/form/index'),
meta: { title: '表单', permissions: ['admin'] },
},
{
path: 'element',
name: 'Element',
component: () => import('@/views/vab/element/index'),
meta: { title: '常用组件', permissions: ['admin'] },
},
{
path: 'tree',
name: 'Tree',
component: () => import('@/views/vab/tree/index'),
meta: { title: '树', permissions: ['admin'] },
},
{
path: 'verify',
name: 'Verify',
component: () => import('@/views/vab/verify/index'),
meta: { title: '验证码', permissions: ['admin'] },
},
{
path: 'menu1',
component: () => import('@/views/vab/nested/menu1/index'),
name: 'Menu1',
alwaysShow: true,
path: 'orderProgress',
name: 'orderProgress',
component: () => import('@/views/vab/orderProgress/index'),
meta: {
title: '嵌套路由 1',
permissions: ['admin'],
title: '订单进度跟踪',
icon: 'file-signature',
},
children: [
{
path: 'menu1-1',
name: 'Menu1-1',
alwaysShow: true,
meta: { title: '嵌套路由 1-1' },
component: () => import('@/views/vab/nested/menu1/menu1-1/index'),
children: [
{
path: 'menu1-1-1',
name: 'Menu1-1-1',
meta: { title: '嵌套路由 1-1-1' },
component: () =>
import('@/views/vab/nested/menu1/menu1-1/menu1-1-1/index'),
},
],
},
],
},
{
path: 'magnifier',
name: 'Magnifier',
component: () => import('@/views/vab/magnifier/index'),
meta: { title: '放大镜', permissions: ['admin'] },
},
{
path: 'loading',
name: 'Loading',
component: () => import('@/views/vab/loading/index'),
meta: { title: 'loading', permissions: ['admin'] },
},
{
path: 'player',
name: 'Player',
component: () => import('@/views/vab/player/index'),
meta: { title: '视频播放器', permissions: ['admin'] },
},
{
path: 'markdownEditor',
name: 'MarkdownEditor',
component: () => import('@/views/vab/markdownEditor/index'),
meta: { title: 'markdown编辑器', permissions: ['admin'] },
},
{
path: 'editor',
name: 'Editor',
component: () => import('@/views/vab/editor/index'),
path: 'orderDownload',
name: 'orderDownload',
component: () => import('@/views/vab/orderDownload/index'),
meta: {
title: '富文本编辑器',
permissions: ['admin'],
badge: 'New',
title: '订单批量下载',
icon: 'file-download',
},
},
{
path: 'backToTop',
name: 'BackToTop',
component: () => import('@/views/vab/backToTop/index'),
meta: { title: '返回顶部', permissions: ['admin'] },
},
{
path: 'lodash',
name: 'Lodash',
component: () => import('@/views/vab/lodash/index'),
meta: { title: 'lodash', permissions: ['admin'] },
},
{
path: 'smallComponents',
name: 'SmallComponents',
component: () => import('@/views/vab/smallComponents/index'),
meta: { title: '小组件', permissions: ['admin'] },
},
{
path: 'upload',
name: 'Upload',
component: () => import('@/views/vab/upload/index'),
meta: { title: '上传', permissions: ['admin'] },
},
{
path: 'log',
name: 'Log',
component: () => import('@/views/vab/errorLog/index'),
meta: { title: '错误日志模拟', permissions: ['admin'] },
},
{
path: 'https://github.com/chuzhixin/vue-admin-beautiful?utm_source=gold_browser_extension',
name: 'ExternalLink',
meta: {
title: '外链',
target: '_blank',
permissions: ['admin', 'editor'],
badge: 'New',
},
},
{
path: 'more',
name: 'More',
component: () => import('@/views/vab/more/index'),
meta: { title: '关于', permissions: ['admin'] },
},
],
},
{
path: '/personnelManagement',
component: Layout,
redirect: 'noRedirect',
name: 'PersonnelManagement',
meta: { title: '配置', icon: 'users-cog', permissions: ['admin'] },
name: 'personnelManagement',
alwaysShow: true,
meta: {
title: '供应商对账',
icon: 'box-open',
},
children: [
{
path: 'userManagement',
name: 'UserManagement',
component: () =>
import('@/views/personnelManagement/userManagement/index'),
meta: { title: '用户管理' },
path: 'profitQuery',
name: 'profitQuery',
component: () => import('@/views/vab/profitQuery/index'),
meta: {
title: '返利汇总查询',
icon: 'search',
},
},
{
path: 'roleManagement',
name: 'RoleManagement',
component: () =>
import('@/views/personnelManagement/roleManagement/index'),
meta: { title: '角色管理' },
path: 'profitDetailsQuery',
name: 'profitDetailsQuery',
component: () => import('@/views/vab/profitDetailsQuery/index'),
meta: {
title: '返利明细直询',
icon: 'search',
},
},
{
path: 'menuManagement',
name: 'MenuManagement',
component: () =>
import('@/views/personnelManagement/menuManagement/index'),
meta: { title: '菜单管理', badge: 'New' },
path: 'billQuery',
name: 'billQuery',
component: () => import('@/views/vab/billQuery/index'),
meta: {
title: '对账单直询',
icon: 'search',
},
},
],
},
{
path: '/mall',
component: Layout,
redirect: 'noRedirect',
name: 'Mall',
meta: {
title: '商城',
icon: 'shopping-cart',
permissions: ['admin'],
},
children: [
{
path: 'pay',
name: 'Pay',
component: () => import('@/views/mall/pay/index'),
path: 'billDetailsQuery',
name: 'billDetailsQuery',
component: () => import('@/views/vab/billDetailsQuery/index'),
meta: {
title: '支付',
noKeepAlive: true,
title: '对账单明细查询',
icon: 'search',
},
children: null,
},
{
path: 'goodsList',
name: 'GoodsList',
component: () => import('@/views/mall/goodsList/index'),
path: 'supplierInvoicing',
name: 'supplierInvoicing',
component: () => import('@/views/vab/supplierInvoicing/index'),
meta: {
title: '商品列表',
title: '供应商开票申请',
icon: 'paper-plane',
},
},
],
},
{
path: '/error',
component: EmptyLayout,
redirect: 'noRedirect',
name: 'Error',
meta: { title: '错误页', icon: 'bug' },
children: [
{
path: '401',
name: 'Error401',
component: () => import('@/views/401'),
meta: { title: '401' },
path: 'supplierInvoicingQuery',
name: 'supplierInvoicingQuery',
component: () => import('@/views/vab/supplierInvoicingQuery/index'),
meta: {
title: '供应商发票查询',
icon: 'search',
},
},
{
path: '404',
name: 'Error404',
component: () => import('@/views/404'),
meta: { title: '404' },
path: 'accountInfoConfirm',
name: 'accountInfoConfirm',
component: () => import('@/views/vab/accountInfoConfirm/index'),
meta: {
title: '供应商账务信息确认',
icon: 'search',
},
},
],
},
{
path: '*',
redirect: '/404',
hidden: true,
},
// {
// path: '/personnelManagement',
// component: Layout,
// redirect: 'noRedirect',
// name: 'PersonnelManagement',
// meta: { title: '配置', icon: 'users-cog', permissions: ['admin'] },
// children: [
// {
// path: 'userManagement',
// name: 'UserManagement',
// component: () =>
// import('@/views/personnelManagement/userManagement/index'),
// meta: { title: '用户管理' },
// },
// {
// path: 'roleManagement',
// name: 'RoleManagement',
// component: () =>
// import('@/views/personnelManagement/roleManagement/index'),
// meta: { title: '角色管理' },
// },
// {
// path: 'menuManagement',
// name: 'MenuManagement',
// component: () =>
// import('@/views/personnelManagement/menuManagement/index'),
// meta: { title: '菜单管理', badge: 'New' },
// },
// ],
// },
// {
// path: '/mall',
// component: Layout,
// redirect: 'noRedirect',
// name: 'Mall',
// meta: {
// title: '商城',
// icon: 'shopping-cart',
// permissions: ['admin'],
// },
// children: [
// {
// path: 'pay',
// name: 'Pay',
// component: () => import('@/views/mall/pay/index'),
// meta: {
// title: '支付',
// noKeepAlive: true,
// },
// children: null,
// },
// {
// path: 'goodsList',
// name: 'GoodsList',
// component: () => import('@/views/mall/goodsList/index'),
// meta: {
// title: '商品列表',
// },
// },
// ],
// },
// {
// path: '/error',
// component: EmptyLayout,
// redirect: 'noRedirect',
// name: 'Error',
// meta: { title: '错误页', icon: 'bug' },
// children: [
// {
// path: '401',
// name: 'Error401',
// component: () => import('@/views/401'),
// meta: { title: '401' },
// },
// {
// path: '404',
// name: 'Error404',
// component: () => import('@/views/404'),
// meta: { title: '404' },
// },
// ],
// },
// {
// path: '*',
// redirect: '/404',
// hidden: true,
// },
]
const router = new VueRouter({
......
<template>
<div></div>
</template>
<script>
export default {
name: 'AccountInfoConfirm',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'AccountProtection',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'BillDetailsQuery',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'BillQuery',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'DirectOrder',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'GetOrder',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'OrderDownload',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'OrderProgress',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'PayRecord',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'ProfitDetailsQuery',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'ProfitQuery',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'SupplierInvoicing',
}
</script>
<style></style>
<template>
<div></div>
</template>
<script>
export default {
name: 'SupplierInvoicingQuery',
}
</script>
<style></style>
......@@ -42,7 +42,7 @@ module.exports = {
publicPath,
assetsDir,
outputDir,
lintOnSave,
lintOnSave: false,
transpileDependencies,
devServer: {
......
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