Skip to content

T
tea_resources_pc
Commit ce879df8 authored by 高宇's avatar 高宇
Browse files
Options

修改bug 71350

parent cae55679
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 36 deletions
src/components/screen/index.vue
View file @ ce879df8
...@@ -58,6 +58,10 @@ export default { ...@@ -58,6 +58,10 @@ export default {
} }
.screen-title { .screen-title {
/*
* 设置字体为思源黑体
*/
font-family: Source Han Sans CN, Source Han Sans CN-700;
font-size: 16px; font-size: 16px;
font-weight: 500; font-weight: 500;
color: #292929; color: #292929;
...@@ -77,6 +81,7 @@ export default { ...@@ -77,6 +81,7 @@ export default {
float: left; float: left;
cursor: pointer; cursor: pointer;
font-size: 16px; font-size: 16px;
font-family: Source Han Sans CN, Source Han Sans CN-700;
color: #292929; color: #292929;
line-height: 21px; line-height: 21px;
padding: 2px 16px; padding: 2px 16px;
......
src/views/courseResources/courseMall/index.vue
View file @ ce879df8
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
> >
<el-tab-pane label="行业前沿适配" name="0"> <el-tab-pane label="行业前沿适配" name="0">
<screen <screen
class="tabScreen"
v-model="queryParams.tecClassify" v-model="queryParams.tecClassify"
title="技术分类" title="技术分类"
:items="tecClassifyOptions" :items="tecClassifyOptions"
...@@ -28,6 +29,7 @@ ...@@ -28,6 +29,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="mallIdentityType === 'firm'" label="岗位能力准入" name="1"> <el-tab-pane v-if="mallIdentityType === 'firm'" label="岗位能力准入" name="1">
<screen <screen
class="tabScreen"
v-model="queryParams.jobClassify" v-model="queryParams.jobClassify"
title="岗位分类" title="岗位分类"
:items="jobClassifyOptions" :items="jobClassifyOptions"
...@@ -36,6 +38,7 @@ ...@@ -36,6 +38,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="mallIdentityType === 'firm'" label="通用能力培养" name="2"> <el-tab-pane v-if="mallIdentityType === 'firm'" label="通用能力培养" name="2">
<screen <screen
class="tabScreen"
v-model="queryParams.tecClassify" v-model="queryParams.tecClassify"
title="技术分类" title="技术分类"
:items="tecClassifyOptions" :items="tecClassifyOptions"
...@@ -44,6 +47,7 @@ ...@@ -44,6 +47,7 @@
</el-tab-pane> </el-tab-pane>
<el-tab-pane v-if="mallIdentityType === 'college'" label="基础能力培养" name="3"> <el-tab-pane v-if="mallIdentityType === 'college'" label="基础能力培养" name="3">
<screen <screen
class="tabScreen"
v-model="queryParams.tecClassify" v-model="queryParams.tecClassify"
title="技术分类" title="技术分类"
:items="tecClassifyOptions" :items="tecClassifyOptions"
...@@ -53,6 +57,7 @@ ...@@ -53,6 +57,7 @@
</el-tabs> </el-tabs>
<el-divider /> <el-divider />
<screen <screen
class="tabOutsideScreen"
v-model="queryParams.difficultyClassify" v-model="queryParams.difficultyClassify"
title="难度等级" title="难度等级"
:value="queryParams.difficultyClassify" :value="queryParams.difficultyClassify"
...@@ -86,7 +91,7 @@ ...@@ -86,7 +91,7 @@
<template #suffix> <template #suffix>
<el-image <el-image
class="img" class="img"
:src="require('@/assets/image/search.png')" :src="require('@/assets/image/kezi_icon_sousuo@2x.png')"
fit="cover" fit="cover"
@click="getCourseByPagination" @click="getCourseByPagination"
/> />
...@@ -143,14 +148,12 @@ ...@@ -143,14 +148,12 @@
</div> </div>
</div> </div>
<div class="paging-box"> <div class="paging-box">
<el-pagination <pagination
background v-show="queryParams.total>0"
layout="prev, pager, next"
:current-page="queryParams.page"
:page-size="queryParams.rows"
:total="queryParams.total" :total="queryParams.total"
@size-change="handleSizeChange" :page.sync="queryParams.page"
@current-change="handleCurrentChange" :limit.sync="queryParams.rows"
@pagination="getCourseByPagination"
/> />
</div> </div>
</div> </div>
...@@ -362,7 +365,6 @@ export default { ...@@ -362,7 +365,6 @@ export default {
width: 1920px; width: 1920px;
margin: auto; margin: auto;
background: #f5f8fd; background: #f5f8fd;
padding-top: 72px;
.codeImg { .codeImg {
position: fixed; position: fixed;
...@@ -402,14 +404,14 @@ export default { ...@@ -402,14 +404,14 @@ export default {
.queryTabs { .queryTabs {
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
width: 240px; width: 240px;
height: 100px; height: 108px;
font-size: 20px; font-size: 20px;
font-weight: 700; font-weight: 700;
color: #6f6f6f; color: #6f6f6f;
text-align: center; text-align: center;
font-family: Source Han Sans CN, Source Han Sans CN-700;;
padding-top: 54px; padding-top: 54px;
} }
::v-deep .is-active { ::v-deep .is-active {
color: #3788fc; color: #3788fc;
} }
...@@ -418,28 +420,29 @@ export default { ...@@ -418,28 +420,29 @@ export default {
::v-deep .el-tabs__item:focus { ::v-deep .el-tabs__item:focus {
color: #3788fc; color: #3788fc;
} }
::v-deep .el-tabs__nav-wrap::after{
height: 1px;
background-color: #e1edff;
}
.screen-box{
margin: unset;
}
.tabScreen{
margin-top: 30px;
padding-bottom: 14px;
}
} }
::v-deep .el-tabs__content .screen-box { .tabOutsideScreen{
margin: 0; margin-top: 24px;
padding-top: 56px; padding-bottom: 56px;
padding-bottom: 24px;
} }
.el-divider { .el-divider {
margin: 0; margin: 0;
} margin-left: 7.5%;
width: 93%;
.screen-box:first-child { height: 1px;
margin: 0; background-color: #e1edff;
padding-top: 56px;
padding-bottom: 24px;
}
.screen-box:last-child {
margin: 0;
padding-top: 26px;
padding-bottom: 56px;
} }
} }
...@@ -451,15 +454,19 @@ export default { ...@@ -451,15 +454,19 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
padding-top: 48px; padding-top: 40px;
padding-bottom: 32px; padding-bottom: 32px;
.title { .title {
height: 27px; height: 48px;
font-size: 18px; font-size: 18px;
font-weight: 700; font-weight: 700;
font-family: Source Han Sans CN, Source Han Sans CN-700;
color: #3788fc; color: #3788fc;
line-height: 27px; display: flex;
justify-content: center;
align-items: center;
//line-height: 27px;
} }
.search-box { .search-box {
...@@ -470,6 +477,11 @@ export default { ...@@ -470,6 +477,11 @@ export default {
.checkbox:focus { .checkbox:focus {
color: #3682FC; color: #3682FC;
} }
// 设置多选框label的样式
::v-deep .checkbox .el-checkbox__label{
font-family: Source Han Sans CN, Source Han Sans CN-700;
font-size: 16px;
}
.search { .search {
width: 410px; width: 410px;
...@@ -482,6 +494,9 @@ export default { ...@@ -482,6 +494,9 @@ export default {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
border-radius: 30px; border-radius: 30px;
padding-left: 20px; padding-left: 20px;
font-family: Source Han Sans CN, Source Han Sans CN-700;
font-size: 16px;
color: #d1d1d1 !important;
} }
::v-deep .el-input__suffix { ::v-deep .el-input__suffix {
...@@ -560,7 +575,7 @@ export default { ...@@ -560,7 +575,7 @@ export default {
height: 29px; height: 29px;
border-radius: 4px; border-radius: 4px;
font-size: 14px; font-size: 14px;
font-family: Microsoft YaHei, Microsoft YaHei-700, serif; font-family: Source Han Sans CN, Source Han Sans CN-700;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
line-height: 16px; line-height: 16px;
...@@ -568,10 +583,12 @@ export default { ...@@ -568,10 +583,12 @@ export default {
.status-unPurchased { .status-unPurchased {
background-color: #fdac34; background-color: #fdac34;
font-family: Source Han Sans CN, Source Han Sans CN-700;
} }
.status-purchased { .status-purchased {
background-color: #13be24; background-color: #13be24;
font-family: Source Han Sans CN, Source Han Sans CN-700;
} }
} }
...@@ -581,7 +598,7 @@ export default { ...@@ -581,7 +598,7 @@ export default {
.title { .title {
height: 23px; height: 23px;
font-size: 20px; font-size: 20px;
font-family: Microsoft YaHei, Microsoft YaHei-700, serif; font-family: Source Han Sans CN, Source Han Sans CN-700;
font-weight: 700; font-weight: 700;
color: #000000; color: #000000;
line-height: 23px; line-height: 23px;
...@@ -606,7 +623,7 @@ export default { ...@@ -606,7 +623,7 @@ export default {
.price { .price {
font-size: 20px; font-size: 20px;
font-family: Microsoft YaHei, Microsoft YaHei-700, serif; font-family: Source Han Sans CN, Source Han Sans CN-700;
font-weight: 700; font-weight: 700;
line-height: 23px; line-height: 23px;
} }
...@@ -621,7 +638,7 @@ export default { ...@@ -621,7 +638,7 @@ export default {
.follow { .follow {
font-size: 16px; font-size: 16px;
font-family: Microsoft YaHei, Microsoft YaHei-700, serif; font-family: Source Han Sans CN, Source Han Sans CN-700;
font-weight: 400; font-weight: 400;
color: #606060; color: #606060;
display: flex; display: flex;
...@@ -647,7 +664,7 @@ export default { ...@@ -647,7 +664,7 @@ export default {
.paging-box { .paging-box {
display: flex; display: flex;
justify-content: center; justify-content: center;
padding-top: 17px; padding-top: 15px;
padding-bottom: 85px; padding-bottom: 85px;
} }
} }
......
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