zhangqi
/
kuailelunwen_new_houtai
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Labels Milestones
New Pull Request

1205-rankList-fix #132

Merged
zhangqi merged 2 commits from 1205-rankList-fix into master 6 days ago
Conversation 0 Commits 2 Files Changed 19
19 changed files with 17 additions and 66 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/App.vue
  2. 1
      src/components/CustomDropdown.vue
  3. 1
      src/components/HoverButton.vue
  4. 2
      src/components/PageTitle.vue
  5. 2
      src/components/SliderScondThree.vue
  6. 1
      src/components/preview/logoBack_color.vue
  7. 1
      src/components/site/addSiteStep/step2.vue
  8. 4
      src/components/super/DateSelect.vue
  9. 24
      src/style/theme/common.scss
  10. 3
      src/views/ConfigureServicePrices.vue
  11. 6
      src/views/agent/checkOrderList.vue
  12. 9
      src/views/agent/domainList.vue
  13. 1
      src/views/agent/home.vue
  14. 18
      src/views/agent/supplyList.vue
  15. 1
      src/views/super/Ranking/Purchase.vue
  16. 2
      src/views/super/Ranking/RankBatchList.vue
  17. 1
      src/views/super/Ranking/RankDetail.vue
  18. 2
      src/views/super/Ranking/RankList.vue
  19. 1
      src/views/super/Ranking/Ranking.vue

3
src/App.vue
View File

@ -81,8 +81,7 @@ export default {
flex-direction: column; flex-direction: column;
} }
#app { #app {
font-family: Avenir, Helvetica, Arial, sans-serif; font-family: var(--font-chinese);
font-family: Microsoft YaHei UI;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
text-align: center; text-align: center;

1
src/components/CustomDropdown.vue
View File

@ -156,7 +156,6 @@ export default {
.custom-select { .custom-select {
height: 38px; height: 38px;
position: relative; position: relative;
font-family: Arial, sans-serif;
} }
.select-trigger { .select-trigger {

1
src/components/HoverButton.vue
View File

@ -132,7 +132,6 @@ export default {
<style scoped> <style scoped>
.hover-button { .hover-button {
font-family: Microsoft YaHei UI;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;

2
src/components/PageTitle.vue
View File

@ -37,8 +37,6 @@ export default {
box-sizing: border-box; box-sizing: border-box;
b { b {
/* headline/haeadline_3_bold */
font-family: Microsoft YaHei UI;
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
line-height: 24px; line-height: 24px;

2
src/components/SliderScondThree.vue
View File

@ -345,7 +345,6 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-family: Microsoft YaHei UI;
gap: 8px; gap: 8px;
min-width: 0; /* 重要：防止flex容器溢出 */ min-width: 0; /* 重要：防止flex容器溢出 */
} }
@ -378,7 +377,6 @@ export default {
background: #BFDAFF; background: #BFDAFF;
opacity: 1; opacity: 1;
white-space: nowrap; white-space: nowrap;
font-family: Microsoft YaHei;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 13px; line-height: 13px;

1
src/components/preview/logoBack_color.vue
View File

@ -129,7 +129,6 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
button{ button{
font-family: Microsoft YaHei UI;
border-radius: 4px; border-radius: 4px;
border: none; border: none;
padding: 7px 10px; padding: 7px 10px;

1
src/components/site/addSiteStep/step2.vue
View File

@ -656,7 +656,6 @@ export default {
} }
} }
.trigger_placeholder{ .trigger_placeholder{
font-family: Microsoft YaHei UI;
color: #8A9099; color: #8A9099;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;

4
src/components/super/DateSelect.vue
View File

@ -182,7 +182,7 @@
<style scoped> <style scoped>
.date-picker { .date-picker {
font-family: Microsoft YaHei UI;
/* width: 300px; */ /* width: 300px; */
/* border: 1px solid #ddd; */ /* border: 1px solid #ddd; */
border-radius: 4px; border-radius: 4px;
@ -262,7 +262,7 @@
} }
.month-grid button, .year-grid button { .month-grid button, .year-grid button {
font-family: Microsoft YaHei UI;
padding: 8px; padding: 8px;
border: none; border: none;
display: flex; display: flex;

24
src/style/theme/common.scss
View File

@ -2,9 +2,13 @@ html {
scroll-behavior: smooth; scroll-behavior: smooth;
/* 使整个页面的滚动平滑 */ /* 使整个页面的滚动平滑 */
} }
:root {
--font-chinese: "Microsoft YaHei", "Microsoft YaHei UI", -apple-system,
BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB",
"Helvetica Neue", Helvetica, Arial, sans-serif;
}
body { body {
font-family: Microsoft YaHei UI; font-family: var(--font-chinese) !important;
font-size: 14px; font-size: 14px;
margin: 0; margin: 0;
width: 100vw; width: 100vw;
@ -30,7 +34,6 @@ body {
} }
.pageTitle { .pageTitle {
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
@ -41,7 +44,6 @@ body {
} }
.littleTitle { .littleTitle {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
@ -354,7 +356,7 @@ body {
.flex-left-desc { .flex-left-desc {
/* body/body 2_regular */ /* body/body 2_regular */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -395,7 +397,7 @@ body {
border-radius: 2px; border-radius: 2px;
width: 96px; width: 96px;
height: 38px; height: 38px;
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
letter-spacing: 0.08em; letter-spacing: 0.08em;
display: flex; display: flex;
@ -601,7 +603,7 @@ body {
.el-input { .el-input {
border-radius: 2px; border-radius: 2px;
border: 1px solid transparent; border: 1px solid transparent;
font-family: Microsoft YaHei UI;
} }
.el-input:focus-within { .el-input:focus-within {
@ -650,7 +652,7 @@ body {
.el-input__inner::placeholder { .el-input__inner::placeholder {
color: #BABDC2; color: #BABDC2;
letter-spacing: 0.08em; letter-spacing: 0.08em;
font-family: Microsoft YaHei UI;
} }
.el-input--prefix .el-input__inner { .el-input--prefix .el-input__inner {
@ -685,7 +687,7 @@ body {
// 应用在表格表头上的下拉开框 统一类名修改 字体效果 // 应用在表格表头上的下拉开框 统一类名修改 字体效果
.tableHeaderSelect ::v-deep .el-input__inner { .tableHeaderSelect ::v-deep .el-input__inner {
font-weight: normal; font-weight: normal;
font-family: Microsoft YaHei UI;
} }
.el-select:hover .el-input__inner { .el-select:hover .el-input__inner {
@ -713,7 +715,7 @@ body {
padding: 10px 12px; padding: 10px 12px;
border-radius: 2px; border-radius: 2px;
height: 100% !important; height: 100% !important;
font-family: Microsoft YaHei UI;
} }
.el-textarea__inner:hover { .el-textarea__inner:hover {
@ -1194,7 +1196,7 @@ body {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
font-family: Microsoft YaHei UI;
.left b { .left b {
display: block; display: block;

3
src/views/ConfigureServicePrices.vue
View File

@ -322,14 +322,11 @@ export default {
b { b {
display: inline-block; display: inline-block;
margin-right: 32px; margin-right: 32px;
/* body/body 1_bold */
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
font-variation-settings: "opsz" auto; font-variation-settings: "opsz" auto;
/* text/text_1 */
color: #1E2226; color: #1E2226;
} }
} }

6
src/views/agent/checkOrderList.vue
View File

@ -887,7 +887,6 @@ a:hover {
} }
.fontgreen { .fontgreen {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -903,7 +902,6 @@ a:hover {
} }
.fontblue { .fontblue {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -919,7 +917,6 @@ a:hover {
} }
.fontred { .fontred {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -959,13 +956,10 @@ a:hover {
} }
.checktitle { .checktitle {
/* body/body 2_bold */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
/* text/text_1 */
color: #1E2226; color: #1E2226;
} }

9
src/views/agent/domainList.vue
View File

@ -370,9 +370,7 @@ export default {
.page-container { .page-container {
padding: 32px 32px; padding: 32px 32px;
} }
.tip-title { .tip-title {
/* body/body 2_bold */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
@ -420,7 +418,6 @@ export default {
} }
.desc-text { .desc-text {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -430,7 +427,6 @@ export default {
} }
.expiretime { .expiretime {
font-family: Microsoft YaHei UI;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 13px; line-height: 13px;
@ -529,13 +525,10 @@ a {
margin-bottom: 32px; margin-bottom: 32px;
h3{ h3{
margin: 0; margin: 0;
/* body/body 2_bold */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
/* text/text_1 */
color: #1E2226; color: #1E2226;
} }

1
src/views/agent/home.vue
View File

@ -425,7 +425,6 @@ a {
} }
.specMoney { .specMoney {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: 22px; line-height: 22px;

18
src/views/agent/supplyList.vue
View File

@ -145,7 +145,6 @@ export default {
} }
.classify-title { .classify-title {
font-family: Microsoft YaHei UI;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;
@ -179,14 +178,11 @@ export default {
z-index: 0; z-index: 0;
} }
.ver-title { .ver-title {
/* body/body 1_bold */
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
text-align: justify; /* 浏览器可能不支持 */ text-align: justify; /* 浏览器可能不支持 */
letter-spacing: 0.08em; letter-spacing: 0.08em;
/* text/text_1 */
color: #1E2226; color: #1E2226;
} }
@ -215,8 +211,6 @@ export default {
} }
.anchor { .anchor {
text-decoration: none; text-decoration: none;
/* body/body 2_regular */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -227,8 +221,6 @@ export default {
} }
.ver-desc { .ver-desc {
/* body/body 2_regular */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -240,7 +232,6 @@ export default {
} }
.ver-single { .ver-single {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -251,7 +242,6 @@ export default {
} }
.ver-single-desc { .ver-single-desc {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -290,8 +280,6 @@ export default {
} }
.service-title { .service-title {
/* body/body 2_regular */
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -303,7 +291,6 @@ export default {
} }
.service-desc { .service-desc {
font-family: Microsoft YaHei UI;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 17px; line-height: 17px;
@ -334,7 +321,6 @@ export default {
z-index: 1; z-index: 1;
} }
.price { .price {
font-family: Microsoft YaHei UI;
font-size: 20px; font-size: 20px;
font-weight: normal; font-weight: normal;
line-height: 20px; line-height: 20px;
@ -345,7 +331,6 @@ export default {
} }
.unit { .unit {
font-family: Microsoft YaHei UI;
font-size: 12px; font-size: 12px;
font-weight: normal; font-weight: normal;
line-height: 16px; line-height: 16px;
@ -374,7 +359,6 @@ export default {
} }
.fontgreen { .fontgreen {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -390,7 +374,6 @@ export default {
} }
.fontblue { .fontblue {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;
@ -406,7 +389,6 @@ export default {
} }
.fontred { .fontred {
font-family: Microsoft YaHei UI;
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
line-height: normal; line-height: normal;

1
src/views/super/Ranking/Purchase.vue
View File

@ -399,7 +399,6 @@ export default {
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
font-family: Microsoft YaHei UI;
color: #1E2226; color: #1E2226;
} }

2
src/views/super/Ranking/RankBatchList.vue
View File

@ -637,7 +637,6 @@ export default {
.pop-top { .pop-top {
h3 { h3 {
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;
@ -698,7 +697,6 @@ export default {
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
font-family: Microsoft YaHei UI;
color: #1E2226; color: #1E2226;
height: 100%; height: 100%;
} }

1
src/views/super/Ranking/RankDetail.vue
View File

@ -536,7 +536,6 @@ export default {
.pop-top { .pop-top {
h3 { h3 {
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;

2
src/views/super/Ranking/RankList.vue
View File

@ -705,7 +705,6 @@ export default {
.pop-top { .pop-top {
h3 { h3 {
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;
@ -755,7 +754,6 @@ export default {
font-size: 14px; font-size: 14px;
font-weight: normal; font-weight: normal;
letter-spacing: 0.08em; letter-spacing: 0.08em;
font-family: Microsoft YaHei UI;
color: #1E2226; color: #1E2226;
height: 100%; height: 100%;
} }

1
src/views/super/Ranking/Ranking.vue
View File

@ -87,7 +87,6 @@ export default {
.pop-top { .pop-top {
h3 { h3 {
font-family: Microsoft YaHei UI;
font-size: 16px; font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: 18px; line-height: 18px;

Write Preview
Loading…
Cancel
Save