Skip to content

Commit

Permalink
update views
Browse files Browse the repository at this point in the history
  • Loading branch information
qyuanq committed Jun 18, 2021
1 parent 08cec42 commit 5c1f0ff
Show file tree
Hide file tree
Showing 11 changed files with 491 additions and 67 deletions.
3 changes: 2 additions & 1 deletion src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets

import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
import locale from 'element-ui/lib/locale/lang/en' // lang i18n
// import locale from 'element-ui/lib/locale/lang/en' // lang i18n
import locale from 'element-ui/lib/locale/lang/zh-CN'

import '@/styles/index.scss' // global css

Expand Down
46 changes: 17 additions & 29 deletions src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ export const constantRoutes = [
meta: { title: '商品管理', icon: 'form' }
},
{
path: 'trade-statistics',
name: 'TradeStatistics',
component: () => import('@/views/shop/trade-statistics.vue'),
path: 'trade-stat',
name: 'TradeStat',
component: () => import('@/views/shop/trade-stat.vue'),
meta: { title: '交易统计', icon: 'form' }
}
]
Expand Down Expand Up @@ -170,7 +170,7 @@ export const constantRoutes = [
component: () => import('@/views/nested/menu2/index'),
name: 'Menu2',
meta: { title: '招生CRM' },
children:[
children: [
{
path: 'menu2-1',
component: () => import('@/views/nested/menu2/index'),
Expand All @@ -189,12 +189,6 @@ export const constantRoutes = [
name: 'menu2-3',
meta: { title: '企业管理' }
},
{
path: 'menu2-3',
component: () => import('@/views/nested/menu2/index'),
name: 'menu2-3',
meta: { title: '企业联系人管理' }
},
{
path: 'menu2-4',
component: () => import('@/views/nested/menu2/index'),
Expand All @@ -207,15 +201,9 @@ export const constantRoutes = [
name: 'menu2-5',
meta: { title: '访客计划' }
},
{
path: 'menu2-5',
component: () => import('@/views/nested/menu2/index'),
name: 'menu2-5',
meta: { title: '访客计划' }
},
{
path: 'menu2-6',
component: () => import('@/views/nested/menu2/index'),
component: () => import('@/views/nested/menu2/menu2-6/highSeas'),
name: 'menu2-6',
meta: { title: '意向学员公海池' }
},
Expand All @@ -239,25 +227,25 @@ export const constantRoutes = [
{
path: '/educational-center',
component: Layout,
meta:{ title: '教务中心', icon: 'link'},
children:[
meta: { title: '教务中心', icon: 'link' },
children: [
{
path: 'student-status-manage',
name: 'StudentStatus',
component: () => import("@/views/educational/student-status"),
meta:{ title: '学籍管理', icon: 'link'}
component: () => import('@/views/educational/student-status'),
meta: { title: '学籍管理', icon: 'link' }
},
{
path: 'teaching-manage',
name: 'Teaching',
component: () => import("@/views/educational/teaching"),
meta:{ title: '教学管理', icon: 'link'}
component: () => import('@/views/educational/teaching'),
meta: { title: '教学管理', icon: 'link' }
},
{
path: 'examination-manage',
name: 'Examination',
component: () => import("@/views/educational/examination"),
meta:{ title: '考务管理', icon: 'link'}
component: () => import('@/views/educational/examination'),
meta: { title: '考务管理', icon: 'link' }
}
]
},
Expand All @@ -266,25 +254,25 @@ export const constantRoutes = [
path: '/financial-center',
name: 'Financial',
component: Layout,
meta:{ title: '财务中心', icon: 'link'},
meta: { title: '财务中心', icon: 'link' },
children: [
{
path: 'paycost-manage',
name: 'Paycost',
component: () => import('@/views/financial/paycost'),
meta:{ title: '缴费管理', icon: 'link'}
meta: { title: '缴费管理', icon: 'link' }
},
{
path: 'lackof-manage',
name: 'Lackof',
component: () => import('@/views/financial/lackof'),
meta:{ title: '欠费管理', icon: 'link'}
meta: { title: '欠费管理', icon: 'link' }
},
{
path: 'they-deal',
name: 'TheyDeal',
component: () => import('@/views/financial/they-deal'),
meta:{ title: '网校交易', icon: 'link'}
meta: { title: '网校交易', icon: 'link' }
}
]
},
Expand Down
6 changes: 5 additions & 1 deletion src/styles/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';

*{
padding:0;
margin:0;
list-style: none;
}
body {
height: 100%;
-moz-osx-font-smoothing: grayscale;
Expand Down
12 changes: 11 additions & 1 deletion src/views/home/components/activity.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</template>
</home-title>
<div class="activity-body">
<img src="../assets/hd.jpg" style="width:530px;" />
<img src="../assets/hd.jpg" class="picture" />
<div class="">【进行中】618年中限时优惠</div>
<div class="">
<i class="el-icon-platform-eleme" />
Expand All @@ -21,6 +21,7 @@ import homeTitle from './home-title'
export default {
data () {
return {
};
},
Expand All @@ -36,6 +37,15 @@ export default {
</script>
<style lang='scss' scoped>
.activity{
width:100%;
background: #fff;
.activity-body{
width: 100%;
padding: 10px;
.picture{
width: 100%;
border-radius: 25px;
}
}
}
</style>
10 changes: 6 additions & 4 deletions src/views/home/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,16 @@ export default {
.home-container{
padding: 30px 20px;
display: flex;
min-width: 1200px;
// min-width: 990px;
background: #f6f6f6;
.left{
flex-basis: 1150px;
margin-right: 10px;
// flex-basis: 620px;
flex:2;
margin-right: 20px;
}
.right{
flex-grow:1;
// flex-grow:1;
flex:1;
}
}
</style>
1 change: 1 addition & 0 deletions src/views/nested/menu2/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<template>
<div style="padding:30px;">
<el-alert :closable="false" title="menu 2" />
<router-view />
</div>
</template>
Empty file.
122 changes: 122 additions & 0 deletions src/views/shop/components/GoodItem.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<template>
<div class="good-container">
<el-row>
<el-col :span="3">
<div class="item-img">
<img src="http://ppt.beegoedu.com/Upload/temp/20210531104322V07.png">
</div>
</el-col>
<el-col :span="18">
<div class="content">
<h2 class="cource-title">二级造价师-建设工程计量与计价实务(土木建筑工程)<span class="cource-type" /><span class="cource-city" /></h2>
<div class="cource-specali">专业:二级造价工程师</div>
<div class="content-center">
<div class="content-item">
<p class="create-time">创建时间:<span /></p>
<p class="cooper-price">合作价:<span /></p>
</div>
<div class="content-item">
<p class="end-item">结课时间:<span /></p>
<p class="min-start-day">最小学习天数:<span /></p>
</div>
<div class="content-item-right">
<div class="input-item">排序<el-input v-model="sorting" :min="0" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" /></div>
<div class="input-item">折扣价<el-input v-model="discount" :min="0" /></div>
<div class="input-item">零售价<el-input v-model="retailPrice" :min="0" /></div>
</div>
</div>
</div>
</el-col>
<el-col :span="3">
<div class="operation">
<div>
<el-switch v-model="isOpen" active-text="上架" inactive-text="下架" />
</div>
<div class="btn">
<el-button type="danger" size="mini">编辑</el-button>
</div>
<div class="btn">
<el-button type="primary">包含班型</el-button>
</div>
</div>
</el-col>
</el-row>
</div>
</template>

<script>
export default {
components: {},
data() {
return {
isOpen: true,
sorting: 99,
discount: 699,
retailPrice: 1299
}
},
computed: {},
methods: {}
}
</script>
<style lang='scss' scoped>
p{
margin: 5px 0;
}
.good-container{
width: 100%;
padding: 20px 0;
// height: 155px;
.item-img{
width: 100%;
height: 100%;
img{
max-width:100%;
}
}
.content{
width: 100%;
padding: 0 20px;
.cource-title{
font-size: 16px;
font-weight: bold;
}
.cource-specali{
margin-top: 8px;
}
.content-item{
float:left;
margin-top: 10px;
}
.content-item-right{
float: right;
.input-item{
text-align: right;
margin: 3px 0;
}
::v-deep{
.el-input{
width: 70px;
height: 20px;
}
.el-input__inner{
height: 20px;
line-height: 20px;
}
}
}
}
.operation{
padding: 10px 0;
text-align: center;
border-left: 1px dashed #ccc;
.btn{
margin-top: 10px;
}
}
}
</style>
Loading

0 comments on commit 5c1f0ff

Please sign in to comment.