From 4d3c44be6ef3624277a81f1692c1f6ef4b3a480c Mon Sep 17 00:00:00 2001
From: mrkbear <mrkbear@qq.com>
Date: Mon, 17 Jan 2022 22:35:38 +0800
Subject: [PATCH] (#37)Mod global image style

---
 miniprogram/app.scss                    |  8 ++++++++
 miniprogram/pages/Account/Account.scss  |  6 +++++-
 miniprogram/pages/Account/Account.wxml  |  6 ++++++
 miniprogram/pages/Account/UserCard.scss | 20 +++++++++++++++-----
 4 files changed, 34 insertions(+), 6 deletions(-)

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 685a369..dd74b03 100644
--- a/miniprogram/pages/Account/Account.scss
+++ b/miniprogram/pages/Account/Account.scss
@@ -1,3 +1,7 @@
 @import "./UserCard.scss";
 @import "./MainFunction.scss";
-@import "./FunctionList.scss";
\ No newline at end of file
+@import "./FunctionList.scss";
+
+view.container {
+    padding-top: 20px;
+}
\ No newline at end of file
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index 9b41eea..a55abc5 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -11,6 +11,12 @@
             <open-data type="userAvatarUrl" />
         </view>
         <view class="info">
+
+            <!-- 主题变换按钮 -->
+            <view class="theme">
+                <image src="../../image/account/Account_Theme.svg" />
+            </view>
+            
             <view class="nick h1">
                 <open-data type="userNickName" />
             </view>
diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss
index 81bff8e..5626684 100644
--- a/miniprogram/pages/Account/UserCard.scss
+++ b/miniprogram/pages/Account/UserCard.scss
@@ -2,22 +2,32 @@
 
 // 用户卡片
 view.user-card {
-    margin-top: 20px;
-    height: 100px;
     display: flex;
+    align-items: center;
     padding-top: 20px;
     padding-bottom: 20px;
 
     view.avatar {
-        width: 80px;
-        height: 80px;
+        width: 70px;
+        height: 70px;
         border-radius: 1000px;
         overflow: hidden;
     }
     
     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;