diff --git a/miniprogram/app.scss b/miniprogram/app.scss
index c31657e..5901d33 100644
--- a/miniprogram/app.scss
+++ b/miniprogram/app.scss
@@ -32,6 +32,10 @@ view.card {
0 0.3px 0.9px 0 rgba(0, 0, 0, .05);
}
+image {
+ filter: $black-filter;
+}
+
// 顶部导航栏阴影
view.top-shadow {
position: fixed;
@@ -77,6 +81,10 @@ view.h3 {
background-color: $theme-color-dark-layout;
}
+ image {
+ filter: $white-filter;
+ }
+
view.h1 {
color: $theme-color-dark-title;
font-size: 1.2em;
diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss
index 77e61f0..d1963de 100644
--- a/miniprogram/pages/Account/Account.scss
+++ b/miniprogram/pages/Account/Account.scss
@@ -2,7 +2,13 @@
@import "./MainFunction.scss";
@import "./FunctionList.scss";
+<<<<<<< HEAD
view.container{
padding-top:20px ;
}
+=======
+view.container {
+ padding-top: 20px;
+}
+>>>>>>> 4d3c44be6ef3624277a81f1692c1f6ef4b3a480c
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index 9b7024f..4c0a98a 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -11,6 +11,12 @@
+
+
+
+
+
+
diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss
index d2b4736..5626684 100644
--- a/miniprogram/pages/Account/UserCard.scss
+++ b/miniprogram/pages/Account/UserCard.scss
@@ -2,9 +2,8 @@
// 用户卡片
view.user-card {
- margin-top: 20px;
- height: 100px;
display: flex;
+ align-items: center;
padding-top: 20px;
padding-bottom: 20px;
@@ -16,8 +15,19 @@ view.user-card {
}
view.info {
- width: calc(100% - 80px - 20px);
+ flex-grow: 1;
padding-left: 20px;
+
+ view.theme {
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+
+ image {
+ width: 25px;
+ height: 25px;
+ }
+ }
view.nick {
margin: 4px 0;