Skip to content

A
admin-yweb
Commit d7ed5cba by gyy
Options

Merge branch 'trunk' into Gyy 

# Conflicts:
#	layouts/default.vue
parents dc23d074 6603aed1
Showing with 511 additions and 113 deletions
layouts/default.vue
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
<div class="y_default_start"> <div class="y_default_start">
<keep-alive> <keep-alive>
<div class="main_left" :style="{height: clientHeight + 'px'}"> <div class="main_left" :style="{height: clientHeight + 'px'}">
<el-menu router <el-menu
:default-active="item.name" :default-active="$route.path" :router="isRoute"
class="el-menu-vertical-demo" class="el-menu-vertical-demo"
@open="handleOpen" @open="handleOpen"
@close="handleClose" v-for="(item, index) in leftMenuList"> @close="handleClose" v-for="(item, index) in leftMenuList">
<el-submenu :index="item.name" :default-openeds="[]"> <el-submenu :index="item.name">
<template slot="title"> <template slot="title">
<i class="el-icon-location"></i> <i class="el-icon-location"></i>
<span>{{item.name}}</span> <span>{{item.name}}</span>
...@@ -71,7 +71,8 @@ export default { ...@@ -71,7 +71,8 @@ export default {
visible: false, visible: false,
left: 0, left: 0,
selectedTag: {}, selectedTag: {},
leftMenuList: [] leftMenuList: [],
isRoute: true
} }
}, },
computed: { computed: {
......
package.json
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
"koa-send": "^5.0.0", "koa-send": "^5.0.0",
"nuxt": "latest", "nuxt": "latest",
"source-map-support": "^0.4.15", "source-map-support": "^0.4.15",
"vue-i18n": "^7.3.2",
"webpack-merge": "^4.1.4" "webpack-merge": "^4.1.4"
}, },
"devDependencies": { "devDependencies": {
......
pages/account/message.vue deleted 100644 → 0
<template>
<div>
message
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/account/security.vue deleted 100644 → 0
<template>
<div>
security
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/finance/finance-detail.vue deleted 100644 → 0
<template>
<div>
finance-detail
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/finance/finance-ope/aftersale.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/finance-ope/cashback.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/finance-ope/complete-aftersale.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/finance-ope/customs-aftersale.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/finance-ope/withdraw.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/income-detail/distribution-income.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/income-detail/laps-income.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/platform.vue deleted 100644 → 0
<template>
<div>
platform
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/finance/purchase.vue deleted 100644 → 0
<template>
<div>
purchase
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/finance/sale-report/daily-report.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/sale-report/finance-constact.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/sale-report/finance-detail.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/sale-report/simplify-report.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/finance/supply.vue deleted 100644 → 0
<template>
<div>
supply
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/goods/bonded/b-check.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/bonded/b-onshelf.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/bonded/depot-goods.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/joint/goods-edit.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/joint/sku-edit.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/laps/goods-search.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/setting/price-set.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/wd/copy-edit.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/wd/wd-check.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/goods/wd/wd-onshelf.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/index.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<section class="container"> <section class="container">
<img src="../assets/img/logo.png" alt="Nuxt.js Logo" class="logo" /> <img src="../assets/img/logo.png" alt="Nuxt.js Logo" class="logo" />
<h1 class="title"> <h1 class="title">
Universal Vue.js Application Framework {{$route.name}}
</h1> </h1>
</section> </section>
</template> </template>
......
pages/order/package/goods-return-record.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/order/package/package-search.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/order/package/refund-record.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/customs/customs-hs.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/customs/customs-list.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/customs/deposit.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/database/depots.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/database/goods-cat.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/database/origin-manage.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/homepage/ads.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/homepage/adsenses.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/homepage/home-flags.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/usr/front-users.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/usr/managers.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/sys/usr/suppliers.vue 0 → 100644
<template>
<section class="container">
<h1 class="title">
{{$route.name}}
</h1>
</section>
</template>
<style scoped>
.title
{
margin: 50px 0;
}
</style>
pages/y-order/order-import.vue deleted 100644 → 0
<template>
<div>
order-important
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/y-order/order-unpaid.vue deleted 100644 → 0
<template>
<div>
order-unpaid
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
pages/y-order/order.vue deleted 100644 → 0
<template>
<div>
order
</div>
</template>
<script>
export default {
}
</script>
<style scoped>
</style>
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