From 6bd759edac66eea78c78176df2e0769a361f6f51 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 18 Nov 2021 17:18:32 +0800
Subject: [PATCH] 公共组件，调大字体大小
---
forms/datePicker/cDatePicker.scss | 1 +
forms/input/cInputExpressCode.scss | 7 ++++++-
forms/textarea/cTextArea.scss | 2 +-
forms/select/cSelect.scss | 1 +
forms/form/cForm.scss | 8 ++++----
forms/input/CInputExpressCode.vue | 7 ++++++-
common/custom.scss | 8 ++++++--
7 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/common/custom.scss b/common/custom.scss
index 3efd1cd..5f5e01d 100644
--- a/common/custom.scss
+++ b/common/custom.scss
@@ -37,6 +37,7 @@
font-size: 36px;
}
.at-input__input {
+ font-size: 36px;
.weui-input {
font-size: 36px;
}
@@ -85,15 +86,18 @@
.at-tabs.at-tabs--horizontal {
height: 100%;
.at-tabs__header {
- height: 90px;
+ height: 96px;
line-height: 52px;
+ .at-tabs__item {
+ font-size: 36px;
+ }
}
.at-tabs__body {
height: calc(100% - 90px);
font-size: 0;
.at-tabs-pane {
height: 100%;
- font-size: 30px;
+ font-size: 36px;
}
}
}
diff --git a/forms/datePicker/cDatePicker.scss b/forms/datePicker/cDatePicker.scss
index c3c6d4d..35c4895 100644
--- a/forms/datePicker/cDatePicker.scss
+++ b/forms/datePicker/cDatePicker.scss
@@ -17,6 +17,7 @@
display: none;
}
.at-icon-chevron-right {
+ padding: 0;
font-size: 48px;
color: #ccc;
}
diff --git a/forms/form/cForm.scss b/forms/form/cForm.scss
index 06a838e..1df4dfb 100644
--- a/forms/form/cForm.scss
+++ b/forms/form/cForm.scss
@@ -69,9 +69,9 @@
margin-top: 37px;
padding: 0 20px 30px;
[type=primary] {
- height: 80px;
+ height: 90px;
font-size: 36px;
- line-height: 78px;
+ line-height: 88px;
border: 1PX solid #2093df;
background: #2093df;
&:not([disabled]):active {
@@ -84,8 +84,8 @@
}
}
&.c-form-submit-fixed {
- margin-bottom: 130px;
- padding: 0;
+ margin: -3px 0 140px;
+ padding: 1px 0 0;
.c-form-submit-inner {
@include position(fixed, n 0 0 n, 0);
width: 100%;
diff --git a/forms/input/CInputExpressCode.vue b/forms/input/CInputExpressCode.vue
index d88e866..ceeda71 100644
--- a/forms/input/CInputExpressCode.vue
+++ b/forms/input/CInputExpressCode.vue
@@ -19,7 +19,10 @@
class="c-input-express-btn"
@tap="evt => handleScan()"
></view>
- <view class="c-input-express-scan">
+ <view
+ class="c-input-express-scan"
+ v-if="scanable"
+ >
<view
v-show="!scaning"
class="gg-scan"
@@ -53,6 +56,8 @@
},
data() {
return {
+ // 小程序中才开启扫描功能
+ scanable: process.env.TARO_ENV === 'weapp',
scaning: false,
};
},
diff --git a/forms/input/cInputExpressCode.scss b/forms/input/cInputExpressCode.scss
index 0351661..032a3f4 100644
--- a/forms/input/cInputExpressCode.scss
+++ b/forms/input/cInputExpressCode.scss
@@ -13,7 +13,7 @@
.c-input-express-scan {
@include position(absolute, 50% n n 0);
width: 100px;
- padding-left: 24px;
+ padding-left: 35px;
color: #ccc;
box-sizing: border-box;
transform: translateY(-50%);
@@ -59,4 +59,9 @@
.at-input__icon {
display: none;
}
+ .at-input__children {
+ &::after {
+ display: none;
+ }
+ }
}
\ No newline at end of file
diff --git a/forms/select/cSelect.scss b/forms/select/cSelect.scss
index 47c92ea..dd64f44 100644
--- a/forms/select/cSelect.scss
+++ b/forms/select/cSelect.scss
@@ -17,6 +17,7 @@
display: none;
}
.at-icon-chevron-right {
+ padding: 0;
font-size: 48px;
color: #ccc;
}
diff --git a/forms/textarea/cTextArea.scss b/forms/textarea/cTextArea.scss
index 5d565e0..a1457d9 100644
--- a/forms/textarea/cTextArea.scss
+++ b/forms/textarea/cTextArea.scss
@@ -16,7 +16,7 @@
width: 100%;
min-height: 94px;
padding-right: 18px;
- font-size: 32px;
+ font-size: 36px;
textarea {
resize: none;
@include flexbox(flex, center center);
--
Gitblit v1.9.1