Skip to content

M
ministers
Commit 452f4068 authored by 罗超's avatar 罗超
Browse files
Options

1

parent 66f4bbb5
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 34 deletions
src/components/teacherTeam/teacherTeam.vue
View file @ 452f4068
...@@ -149,7 +149,6 @@ export default { ...@@ -149,7 +149,6 @@ export default {
box-sizing: border-box; box-sizing: border-box;
width: 13.541vw !important; width: 13.541vw !important;
height: 18.333vw; height: 18.333vw;
// border: 1px solid #eee;
box-shadow: 0px 6px 10px 0px rgba(116, 116, 116, 0.1) inset; box-shadow: 0px 6px 10px 0px rgba(116, 116, 116, 0.1) inset;
background-color: #ffffff; background-color: #ffffff;
padding: 2.86vw 1.458vw; padding: 2.86vw 1.458vw;
...@@ -181,9 +180,8 @@ export default { ...@@ -181,9 +180,8 @@ export default {
width: 100%; width: 100%;
text-align: center; text-align: center;
font-size: 1.145vw; font-size: 1.145vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: bold; font-weight: bold;
font-family: "pingfang-b" !important;
color: #000000; color: #000000;
} }
.tea_desc { .tea_desc {
...@@ -193,7 +191,7 @@ export default { ...@@ -193,7 +191,7 @@ export default {
text-align: justify; text-align: justify;
text-align-last: left; text-align-last: left;
overflow: hidden; overflow: hidden;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
color: #999999; color: #999999;
line-height: 1.3vw; line-height: 1.3vw;
overflow: hidden; overflow: hidden;
...@@ -207,8 +205,7 @@ export default { ...@@ -207,8 +205,7 @@ export default {
.tea_desc2 { .tea_desc2 {
width: 100%; width: 100%;
font-size: 0.729vw; font-size: 0.729vw;
font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
font-weight: 400;
color: #ffffff; color: #ffffff;
text-align: justify; text-align: justify;
text-align-last: left; text-align-last: left;
...@@ -225,9 +222,8 @@ export default { ...@@ -225,9 +222,8 @@ export default {
box-shadow: 0px 6px 10px 0px rgba(116, 116, 116, 0.1); box-shadow: 0px 6px 10px 0px rgba(116, 116, 116, 0.1);
.tea_name { .tea_name {
font-size: 1.145vw; font-size: 1.145vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: bold; font-weight: bold;
font-family: "pingfang-b" !important;
color: #ffffff; color: #ffffff;
line-height: 1.5625vw; line-height: 1.5625vw;
margin-bottom: 1.145vw; margin-bottom: 1.145vw;
......
src/pages/JapaneseTrain/JapaneseTrain.vue
View file @ 452f4068
...@@ -553,14 +553,11 @@ export default { ...@@ -553,14 +553,11 @@ export default {
.itemImg { .itemImg {
width: 20vw; width: 20vw;
height: 13.229vw; height: 13.229vw;
// background-color: rgb(99, 150, 104);
} }
.infoBox { .infoBox {
padding: 1.406vw 0.937vw 0; padding: 1.406vw 0.937vw 0;
.courseName { .courseName {
font-size: 0.833vw; font-size: 0.833vw;
// font-family: Microsoft YaHei;
// font-weight: bold;
font-family: "pingfang-b" !important; font-family: "pingfang-b" !important;
color: #000000; color: #000000;
margin-bottom: 0.989vw; margin-bottom: 0.989vw;
...@@ -570,8 +567,7 @@ export default { ...@@ -570,8 +567,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 0.625vw; font-size: 0.625vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: 400;
color: #888888; color: #888888;
} }
} }
...@@ -665,6 +661,7 @@ export default { ...@@ -665,6 +661,7 @@ export default {
height: 1.562vw; height: 1.562vw;
background-color: #45766d; background-color: #45766d;
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei !important;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
justify-content: center; justify-content: center;
......
src/pages/JapaneseTrain/classPlanList.vue
View file @ 452f4068
...@@ -466,6 +466,7 @@ export default { ...@@ -466,6 +466,7 @@ export default {
height: 1.562vw; height: 1.562vw;
background-color: #45766d; background-color: #45766d;
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei !important;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
justify-content: center; justify-content: center;
......
src/pages/JapaneseTrain/eduProductDetail.vue
View file @ 452f4068
...@@ -297,8 +297,6 @@ export default { ...@@ -297,8 +297,6 @@ export default {
padding: 1.406vw 0.937vw 0; padding: 1.406vw 0.937vw 0;
.courseName { .courseName {
font-size: 0.833vw; font-size: 0.833vw;
// font-family: Microsoft YaHei;
// font-weight: bold;
font-family: "pingfang-b" !important; font-family: "pingfang-b" !important;
color: #000000; color: #000000;
margin-bottom: 0.989vw; margin-bottom: 0.989vw;
...@@ -308,8 +306,7 @@ export default { ...@@ -308,8 +306,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 0.625vw; font-size: 0.625vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: 400;
color: #888888; color: #888888;
} }
} }
......
src/pages/JapaneseTrain/eduProductList.vue
View file @ 452f4068
...@@ -197,8 +197,6 @@ export default { ...@@ -197,8 +197,6 @@ export default {
padding: 1.406vw 0.937vw 0; padding: 1.406vw 0.937vw 0;
.courseName { .courseName {
font-size: 0.833vw; font-size: 0.833vw;
// font-family: Microsoft YaHei;
// font-weight: bold;
font-family: "pingfang-b" !important; font-family: "pingfang-b" !important;
color: #000000; color: #000000;
margin-bottom: 0.989vw; margin-bottom: 0.989vw;
...@@ -208,8 +206,7 @@ export default { ...@@ -208,8 +206,7 @@ export default {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
font-size: 0.625vw; font-size: 0.625vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: 400;
color: #888888; color: #888888;
} }
} }
......
src/pages/aboutUs/aboutUs.vue
View file @ 452f4068
...@@ -176,7 +176,7 @@ export default { ...@@ -176,7 +176,7 @@ export default {
} }
.dsz_con1 { .dsz_con1 {
font-size: 0.625vw; font-size: 0.625vw;
font-family: PingFang SC; font-family: Microsoft YaHei !important;
font-weight: bold; font-weight: bold;
color: #111111; color: #111111;
line-height: 1.77vw; line-height: 1.77vw;
...@@ -189,7 +189,7 @@ export default { ...@@ -189,7 +189,7 @@ export default {
width: 25.208vw; width: 25.208vw;
// overflow-y: auto; // overflow-y: auto;
font-size: 0.625vw; font-size: 0.625vw;
font-family: PingFang SC; font-family: Microsoft YaHei !important;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
line-height: 1.875vw; line-height: 1.875vw;
...@@ -220,13 +220,13 @@ export default { ...@@ -220,13 +220,13 @@ export default {
} }
.contactUs_name { .contactUs_name {
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
color: #111111; color: #111111;
margin-bottom: 0.2vw; margin-bottom: 0.2vw;
} }
.contactUs_con { .contactUs_con {
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
color: #666666; color: #666666;
margin-bottom: 1vw; margin-bottom: 1vw;
} }
......
src/pages/joinUs/jobDetail.vue
View file @ 452f4068
...@@ -216,7 +216,7 @@ export default { ...@@ -216,7 +216,7 @@ export default {
height: 30px; height: 30px;
background-color: #45766d; background-color: #45766d;
font-size: 0.625vw; font-size: 0.625vw;
font-family: PingFang SC; font-family: Microsoft YaHei !important;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
......
src/pages/joinUs/joinUs.vue
View file @ 452f4068
...@@ -366,7 +366,7 @@ export default { ...@@ -366,7 +366,7 @@ export default {
height: 30px; height: 30px;
background-color: #45766d; background-color: #45766d;
font-size: 0.625vw; font-size: 0.625vw;
font-family: PingFang SC; font-family: Microsoft YaHei !important;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
display: flex; display: flex;
......
src/pages/mediaCenter/mediaCenter.vue
View file @ 452f4068
...@@ -458,8 +458,7 @@ export default { ...@@ -458,8 +458,7 @@ export default {
} }
.desc { .desc {
font-size: 0.625vw; font-size: 0.625vw;
// font-family: Microsoft YaHei; font-family: Microsoft YaHei !important;
// font-weight: 400;
color: #444444; color: #444444;
} }
.time { .time {
......
src/pages/mediaCenter/mediaCenterDetail.vue
View file @ 452f4068
...@@ -85,14 +85,15 @@ export default { ...@@ -85,14 +85,15 @@ export default {
color: #111111; color: #111111;
} }
.date { .date {
font-size: 0.833; font-size: 0.833vw;
font-family: Microsoft YaHei; font-family: Microsoft YaHei;
color: #888888; color: #888888;
margin-bottom: 2.6vw; margin-bottom: 2.6vw;
} }
.con { .con {
font-size: 0.625vwpx; font-size: 0.625vw;
font-family: "pingfang-b" !important; font-family: Microsoft YaHei !important;
font-weight: bold;
color: #555555; color: #555555;
} }
} }
......
src/pages/studyServe/studyServe.vue
View file @ 452f4068
...@@ -242,6 +242,7 @@ export default { ...@@ -242,6 +242,7 @@ export default {
max-height: 20.104vw; max-height: 20.104vw;
overflow-y: auto; overflow-y: auto;
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei !important;
color: #111111; color: #111111;
line-height: 1.875vw; line-height: 1.875vw;
} }
......
src/pages/workServe/workServe.vue
View file @ 452f4068
...@@ -154,6 +154,7 @@ export default { ...@@ -154,6 +154,7 @@ export default {
max-height: 20.104vw; max-height: 20.104vw;
overflow-y: auto; overflow-y: auto;
font-size: 0.625vw; font-size: 0.625vw;
font-family: Microsoft YaHei !important;
color: #111111; color: #111111;
line-height: 1.875vw; line-height: 1.875vw;
white-space: pre-wrap; white-space: pre-wrap;
......
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