(#37)

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

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>

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;