From d9fa2d3a8fb6382d3197bc3cc952e8f046f24c8e Mon Sep 17 00:00:00 2001
From: Huang <596417202@qq.com>
Date: Thu, 18 Aug 2022 09:08:18 +0800
Subject: [PATCH] style
---
.eslintignore | 1 +
src/assets/style/auxiliary.scss | 6 +++---
src/assets/style/flex.scss | 20 ++++++++++----------
src/assets/style/main.scss | 6 +++---
src/assets/style/mixin.scss | 4 ----
src/pages/demo/index.vue | 2 +-
tsconfig.json | 4 ++--
7 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/.eslintignore b/.eslintignore
index 43ca088..07d8227 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,6 +6,7 @@ dist
.hbuilderx
src/manifest.json
src/pages.json
+src/tmui/
*.sh
node_modules
*.md
diff --git a/src/assets/style/auxiliary.scss b/src/assets/style/auxiliary.scss
index ff93181..38a6b9d 100644
--- a/src/assets/style/auxiliary.scss
+++ b/src/assets/style/auxiliary.scss
@@ -55,12 +55,12 @@ web-view,
white-space: nowrap;
text-overflow: ellipsis;
} @else {
- display: -webkit-box!important;
+ display: -webkit-box !important;
overflow: hidden;
text-overflow: ellipsis;
word-break: break-all;
-webkit-line-clamp: $i;
- -webkit-box-orient: vertical!important;
+ -webkit-box-orient: vertical !important;
}
}
}
@@ -72,4 +72,4 @@ web-view,
padding-#{$d}: constant(safe-area-inset-#{$d});
padding-#{$d}: env(safe-area-inset-#{$d});
}
-}
\ No newline at end of file
+}
diff --git a/src/assets/style/flex.scss b/src/assets/style/flex.scss
index 065abda..b2a348a 100644
--- a/src/assets/style/flex.scss
+++ b/src/assets/style/flex.scss
@@ -1,34 +1,34 @@
// flex布局
-$flex-directions: row,row-reverse,column,column-reverse;
+$flex-directions: row, row-reverse, column, column-reverse;
@each $v in $flex-directions {
.flex-#{$v} {
@include flex($v);
}
}
-$justify-content: start,end,center,between,around,evenly;
+$justify-content: start, end, center, between, around, evenly;
@each $v in $justify-content {
.justify-#{$v} {
- @if($v == 'start') {
+ @if ($v == 'start') {
justify-content: flex- + $v;
- }@else if($v == 'start') {
+ } @else if($v == 'start') {
justify-content: flex- + $v;
- }@else {
+ } @else {
justify-content: $v;
}
}
}
-$align-items: start,end,center,baseline,stretch;
+$align-items: start, end, center, baseline, stretch;
@each $v in $align-items {
.items-#{$v} {
- @if($v == 'start') {
+ @if ($v == 'start') {
align-items: flex- + $v;
- }@else if($v == 'start') {
+ } @else if($v == 'start') {
align-items: flex- + $v;
- }@else {
+ } @else {
align-items: $v;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/assets/style/main.scss b/src/assets/style/main.scss
index aa9e434..a2dcaf2 100644
--- a/src/assets/style/main.scss
+++ b/src/assets/style/main.scss
@@ -1,3 +1,3 @@
-@import "auxiliary";
-@import "mixin";
-@import "flex";
\ No newline at end of file
+@import 'auxiliary';
+@import 'mixin';
+@import 'flex';
diff --git a/src/assets/style/mixin.scss b/src/assets/style/mixin.scss
index c0bad64..dbca254 100644
--- a/src/assets/style/mixin.scss
+++ b/src/assets/style/mixin.scss
@@ -1,8 +1,4 @@
-
@mixin flex($direction: row) {
display: flex;
flex-direction: $direction;
}
-
-
-
diff --git a/src/pages/demo/index.vue b/src/pages/demo/index.vue
index 18e59e2..90a927d 100644
--- a/src/pages/demo/index.vue
+++ b/src/pages/demo/index.vue
@@ -1,7 +1,7 @@
- 页面构建中...
+ 页面构建中...54264536
item1
item2
diff --git a/tsconfig.json b/tsconfig.json
index 3af8e71..0d68eb2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -10,7 +10,7 @@
"resolveJsonModule": true,
"esModuleInterop": true,
"lib": ["esnext", "dom"],
- "types": ["@dcloudio/types"],
+ "types": ["@dcloudio/types","src/tmui/interface.ts"],
"paths": {
"@/*":["./src/*"]
}
@@ -20,6 +20,6 @@
"src/**/*.d.ts",
"src/**/*.tsx",
"src/**/*.vue",
- "node_modules/@dcloudio/types/uni-app/uni.d.ts"
+ "node_modules/@dcloudio/types/uni-app/uni.d.ts",
]
}