update routes

This commit is contained in:
LittleBoy 2019-06-17 17:42:10 +08:00
parent b85362eca4
commit 089727b7e9
6 changed files with 98 additions and 126 deletions

56
package-lock.json generated
View File

@ -2933,8 +2933,7 @@
"version": "4.6.0",
"resolved": "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz",
"integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
"dev": true,
"optional": true
"dev": true
},
"coa": {
"version": "2.0.2",
@ -3916,7 +3915,8 @@
"decode-uri-component": {
"version": "0.2.0",
"resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
"dev": true
},
"deep-equal": {
"version": "1.0.1",
@ -7780,6 +7780,14 @@
}
}
},
"mobx-vue": {
"version": "2.0.9",
"resolved": "https://registry.npmjs.org/mobx-vue/-/mobx-vue-2.0.9.tgz",
"integrity": "sha512-7LUusULoEt4+A9/qBaTH/Y/SSYcKFw92lxQk+8mloSi/M/xNhR/Q2fnTEMWzyD/uY4B6VpVfJTejRmDAhcCbHg==",
"requires": {
"tslib": "^1.9.0"
}
},
"moment": {
"version": "2.24.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
@ -9810,8 +9818,7 @@
"version": "4.0.8",
"resolved": "http://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz",
"integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
"dev": true,
"optional": true
"dev": true
},
"rx-lite-aggregates": {
"version": "4.0.8",
@ -10441,11 +10448,6 @@
}
}
},
"split-on-first": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
"integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
},
"split-string": {
"version": "3.1.0",
"resolved": "http://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz",
@ -11041,8 +11043,7 @@
"tslib": {
"version": "1.9.3",
"resolved": "http://registry.npm.taobao.org/tslib/download/tslib-1.9.3.tgz",
"integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY=",
"dev": true
"integrity": "sha1-1+TdeSRdhUKMTX5IIqeZF5VMooY="
},
"tty-browserify": {
"version": "0.0.0",
@ -11120,32 +11121,6 @@
"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
"optional": true
},
"umi-request": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/umi-request/-/umi-request-1.0.7.tgz",
"integrity": "sha512-jnQ/G+3UF0cT4PBuMqlvejQLQCS8Fapf3/5GiR9k51sNfNH95lLWJYLqUd2PBtcTlxBRPKsSy/nRgFLdp0IdVQ==",
"requires": {
"query-string": "^6.0.0",
"whatwg-fetch": "^2.0.0"
},
"dependencies": {
"query-string": {
"version": "6.4.2",
"resolved": "https://registry.npmjs.org/query-string/-/query-string-6.4.2.tgz",
"integrity": "sha512-DfJqAen17LfLA3rQ+H5S4uXphrF+ANU1lT2ijds4V/Tj4gZxA3gx5/tg1bz7kYCmwna7LyJNCYqO7jNRzo3aLw==",
"requires": {
"decode-uri-component": "^0.2.0",
"split-on-first": "^1.0.0",
"strict-uri-encode": "^2.0.0"
}
},
"strict-uri-encode": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
"integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
}
}
},
"unicode-canonical-property-names-ecmascript": {
"version": "1.0.4",
"resolved": "http://registry.npm.taobao.org/unicode-canonical-property-names-ecmascript/download/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@ -11848,11 +11823,6 @@
"integrity": "sha1-XS/yKXcAPsaHpLhwc9+7rBRszyk=",
"dev": true
},
"whatwg-fetch": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz",
"integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng=="
},
"which": {
"version": "1.3.1",
"resolved": "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz",

View File

@ -6,7 +6,9 @@
<div class="site-logo" :style="{'line-height':headerHeight}">
<img src="./../assets/imgs/logo_white.png" :style="{height:logoSize,'margin-top':logoMarginTop}" alt="site-logo"
class="header-logo">
<span class="site-text">Niger Electronic Platform</span>
<span class="site-text">急性高原反应自评</span>
<span class="line"></span>
<span class="small-text">管理平台</span>
</div>
<ul class="header-operations">
<li @click="showHelpDialog" class="pointer">{{langData.help.title}}</li>
@ -33,7 +35,7 @@
</ul>
</el-header>
<el-container>
<el-aside class="menu menu-aside" style="width:256px;">
<el-aside class="menu menu-aside" style="width:200px;">
<el-menu default-active="1" :data-current-menu="activeMenu" :unique-opened="true">
<template v-for="router in adminMenus">
<template v-if="router.children">
@ -99,13 +101,13 @@
lang: currentLang,
langData: langConfig[currentLang],
colors: {
primary: "#4072ED",
primary: "#2EC7A5",
contentBg: '#F5F6FA'
},
originalStylesheetCount: -1,
originalStyle: "",
headerHeight: "100px",
logoSize: "70px",
headerHeight: "55px",
logoSize: "30px",
logoMarginTop: "15px",
themeDialogVisible: false,
helpDialogVisible: false,
@ -170,7 +172,11 @@
};
</script>
<style lang="less">
@color-main: #4072ED;
@color-main: #2EC7A5;
@color-hover:#cbfbf0;
@size-logo-font:20px;
@head-height: 55px;
.el-submenu__title, .el-menu-item {
height: auto;
}
@ -185,19 +191,27 @@
}
.site-logo {
line-height: 64px;
display: inline-block;
color:#fff;
img {
margin-right: 5px;
float: left;
}
}
.site-text {
color: #fff;
font-size: 36px;
letter-spacing: 2px;
font-family: "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
.site-text {
font-size: @size-logo-font;
font-family: "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
}
.line{
display: inline-block;
border-left: solid 1px #eee;
height: 20px;
vertical-align: text-bottom;
margin: 0 10px;
}
.small-text{
font-size:@size-logo-font - 10px;
}
}
.el-header {
@ -213,6 +227,11 @@
height: 100%;
box-sizing: border-box;
}
.el-menu-item,.el-submenu__title{
&:hover,&:focus{
background: @color-hover;
}
}
.nav-item-icon-style {
font-size: 22px;
@ -252,6 +271,7 @@
padding-right: 0;
li {
cursor: default;
line-height: @head-height;
}
.hover {
cursor: pointer;

View File

@ -0,0 +1,15 @@
<template>
<h1>
hello
</h1>
</template>
<script>
export default {
name: "history"
}
</script>
<style scoped>
</style>

13
src/pages/user/Index.vue Normal file
View File

@ -0,0 +1,13 @@
<template>
<h2>userIndex</h2>
</template>
<script>
export default {
name: "Index"
}
</script>
<style scoped>
</style>

View File

@ -13,60 +13,16 @@ export const adminRoutes = [
icon: 'home'
},
{
path: '/process',
name: 'process',
icon: 'icons-process',
children:[
{
path: '/process/transfer',
name: 'process_transfer',
component: ()=>import( /* view_admin_news_comments */ './../pages/process/Transfer.vue')
},
{
path: '/process/deposit',
name: 'process_deposit',
component: ()=>import( /* view_admin_news_comments */ './../pages/process/Deposit.vue')
},
{
path: '/process/take',
name: 'process_take',
component: ()=>import( /* view_admin_news_comments */ './../pages/process/Take.vue')
}
]
path: '/users',
name: 'user_index',
component: ()=>import('./../pages/user/Index'),
icon: 'user'
},
{
path: '/shop',
name: 'merchant_info',
icon: 'shop',
children:[
{
path: '/shop/store',
name: 'shop_store',
component: ()=>import( /* view_admin_news_comments */ './../pages/shop/Store.vue')
},
{
path: '/shop/franchisee',
name: 'shop_franchisee',
component: ()=>import( /* view_admin_news_comments */ './../pages/shop/Franchisee.vue')
}
]
},
{
path: '/reconciliation',
name: 'reconciliation',
icon: 'pie-chart',
children:[
{
path: '/reconciliation/settlement',
name: 'reconciliation_settlement',
component: ()=>import( /* view_admin_news_comments */ './../pages/shop/Store.vue')
},
{
path: '/reconciliation/account',
name: 'reconciliation_account',
component: ()=>import( /* view_admin_news_comments */ './../pages/shop/Franchisee.vue')
}
]
path: '/history',
name: 'test_history',
component: ()=>import('../pages/test/History'),
icon: 'file'
},
];

View File

@ -13,25 +13,11 @@ export default {
ok: '确定'
},
navs: {
dashboard: '首页',
news: '新闻管理',
comments: '评论管理',
dashboard: '概览',
user_index: '用户信息',
test_history: '评估记录',
category: '分类管理',
student: '学生信息',
score: '成绩信息',
subject: '科目信息',
process: '业务办理',
process_transfer: '汇款',
process_deposit: '存款',
process_take: '取款',
//商家信息
merchant_info:'商家信息',
shop_store:'门店信息',
shop_franchisee:'加盟商信息',
//统计与对账
reconciliation:'统计与对账',
reconciliation_settlement:'酬金结算',
reconciliation_account:'账户汇总',
}
},
'en-us': {
@ -54,7 +40,19 @@ export default {
category: 'Category',
student: 'Student',
score: 'Score',
subject: 'Subject'
subject: 'Subject',
process: '业务办理',
process_transfer: '汇款',
process_deposit: '存款',
process_take: '取款',
//商家信息
merchant_info:'商家信息',
shop_store:'门店信息',
shop_franchisee:'加盟商信息',
//统计与对账
reconciliation:'统计与对账',
reconciliation_settlement:'酬金结算',
reconciliation_account:'账户汇总',
}
}
}