From 82e1c0941e0511393cac556a0f6262c3e5b9c5c0 Mon Sep 17 00:00:00 2001
From: MrKBear <mrkbear@qq.com>
Date: Wed, 19 Jan 2022 17:36:47 +0800
Subject: [PATCH 1/2] (#37) Fix checkmark display

---
 miniprogram/pages/Account/Account.wxml  | 2 +-
 miniprogram/pages/Account/UserCard.scss | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index 5970839..8164243 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -27,7 +27,7 @@
                 <view class="name">秦浩轩</view>
                 <view class="certified">
                     <view class="certifi-info">已认证</view>
-                    <view class="text-icon">√</view>
+                    <image class="text-icon" src="../../image/account/Account_OK.svg"></image>
                 </view>
             </view>
 
diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss
index 3ad14e8..dbb4749 100644
--- a/miniprogram/pages/Account/UserCard.scss
+++ b/miniprogram/pages/Account/UserCard.scss
@@ -41,6 +41,7 @@ view.user-card {
             text-overflow: ellipsis;
         }
 
+        // 学生信息
         view.student {
             display: flex;
             align-items: center;
@@ -57,8 +58,10 @@ view.user-card {
                 justify-content: center;
                 align-items: center;
 
-                view.text-icon {
-                    margin-left: .3em;
+                image.text-icon {
+                    margin-left: .25em;
+                    width: 10px;
+                    height: 10px;
                 }
             }
         }

From 874c64829a846f4004be1bf5fa38379bbb3a9acd Mon Sep 17 00:00:00 2001
From: mrkbear <mrkbear@qq.com>
Date: Wed, 19 Jan 2022 21:21:21 +0800
Subject: [PATCH 2/2] (#37) Add mask modular

---
 miniprogram/modular/Mask/Mask.scss      |  8 +++++
 miniprogram/modular/Mask/Mask.ts        | 45 +++++++++++++++++++++++++
 miniprogram/pages/Account/Account.scss  |  2 +-
 miniprogram/pages/Account/Account.ts    |  4 ++-
 miniprogram/pages/Account/Account.wxml  |  6 +++-
 miniprogram/pages/Account/UserCard.scss | 10 +++++-
 miniprogram/pages/Account/UserCard.ts   | 18 ++++++++--
 7 files changed, 86 insertions(+), 7 deletions(-)
 create mode 100644 miniprogram/modular/Mask/Mask.scss
 create mode 100644 miniprogram/modular/Mask/Mask.ts

diff --git a/miniprogram/modular/Mask/Mask.scss b/miniprogram/modular/Mask/Mask.scss
new file mode 100644
index 0000000..b1c0b50
--- /dev/null
+++ b/miniprogram/modular/Mask/Mask.scss
@@ -0,0 +1,8 @@
+
+view.mask {
+	position: fixed;
+	width: 100%;
+	height: 100%;
+	background-color: rgba($color: #000000, $alpha: .2);
+	z-index: 1;
+}
\ No newline at end of file
diff --git a/miniprogram/modular/Mask/Mask.ts b/miniprogram/modular/Mask/Mask.ts
new file mode 100644
index 0000000..eeaaa33
--- /dev/null
+++ b/miniprogram/modular/Mask/Mask.ts
@@ -0,0 +1,45 @@
+import { Modular, Manager } from "../../core/Module";
+
+class Mask<M extends Manager> extends Modular<M> {
+
+	public data? = {
+
+		/**
+		 * 蒙版的层级
+		 */
+		zIndex: 1,
+
+		/**
+		 * 蒙版是否显示
+		 */
+		isShow: false
+	};
+
+	private disappearTimer?: number;
+	
+	/**
+	 * 显示蒙版
+	 */
+	public showMask() {
+		this.setData({ isShow: true });
+	}
+
+	/**
+	 * 隐藏蒙版
+	 */
+	public hideMask() {
+		this.setData({ isShow: false });
+	}
+	
+	public override onLoad() {
+		this.setFunc(this.handleClickMask, "handleClickMask");
+        // Do something
+    }
+
+	private handleClickMask() {
+		this.hideMask();
+	}
+}
+
+export { Mask };
+export default Mask;
\ No newline at end of file
diff --git a/miniprogram/pages/Account/Account.scss b/miniprogram/pages/Account/Account.scss
index f75c075..32a102d 100644
--- a/miniprogram/pages/Account/Account.scss
+++ b/miniprogram/pages/Account/Account.scss
@@ -1,7 +1,7 @@
 @import "./UserCard.scss";
 @import "./MainFunction.scss";
 @import "./FunctionList.scss";
-
+@import "../../modular/Mask/Mask.scss";
 
 view.container{
     padding-top: 50rpx;
diff --git a/miniprogram/pages/Account/Account.ts b/miniprogram/pages/Account/Account.ts
index 2cf08a9..8c36bd4 100644
--- a/miniprogram/pages/Account/Account.ts
+++ b/miniprogram/pages/Account/Account.ts
@@ -2,9 +2,11 @@ import { Manager } from "../../core/Module";
 import { UserCard } from "./UserCard";
 import { MainFunction } from "./MainFunction";
 import { FunctionList } from "./FunctionList";
+import { Mask } from "../../modular/Mask/Mask";
 
 Manager.Page((manager) => {
-    manager.addModule(UserCard, "userCard");
+    const mask = manager.addModule(Mask, "mask");
+    manager.addModule(UserCard, "userCard", { mask });
     manager.addModule(MainFunction, "mainFunction");
     manager.addModule(FunctionList, "functionList");
 });
\ No newline at end of file
diff --git a/miniprogram/pages/Account/Account.wxml b/miniprogram/pages/Account/Account.wxml
index 5970839..b4ed47b 100644
--- a/miniprogram/pages/Account/Account.wxml
+++ b/miniprogram/pages/Account/Account.wxml
@@ -1,3 +1,5 @@
+<!-- 蒙版 -->
+<view class="mask" bindtap="mask$handleClickMask" style="display:{{mask$isShow ? 'block' : 'none'}}"></view>
 
 <!-- 顶部的阴影 -->
 <view class="top-shadow"></view>
@@ -14,7 +16,9 @@
 
             <!-- 主题变换按钮 -->
             <view class="theme">
-                <image class="icon-sub" src="../../image/account/Account_Theme.svg" />
+                <view bindtap="userCard$changeTheme">
+                    <image class="icon-sub" src="../../image/account/Account_Theme.svg" />
+                </view>
             </view>
             
             <!-- 用户昵称 -->
diff --git a/miniprogram/pages/Account/UserCard.scss b/miniprogram/pages/Account/UserCard.scss
index 3ad14e8..37ddd5e 100644
--- a/miniprogram/pages/Account/UserCard.scss
+++ b/miniprogram/pages/Account/UserCard.scss
@@ -27,9 +27,17 @@ view.user-card {
             display: flex;
             justify-content: flex-end;
 
-            image {
+            view {
                 width: 23px;
                 height: 23px;
+                padding: 20px;
+                margin: -20px;
+                border-radius: 20px;
+                
+                image {
+                    width: 100%;
+                    height: 100%;
+                }
             }
         }
         
diff --git a/miniprogram/pages/Account/UserCard.ts b/miniprogram/pages/Account/UserCard.ts
index 7fe07b0..70aa8d1 100644
--- a/miniprogram/pages/Account/UserCard.ts
+++ b/miniprogram/pages/Account/UserCard.ts
@@ -1,9 +1,21 @@
 import { Modular, Manager } from "../../core/Module";
+import { Mask } from "../../modular/Mask/Mask";
+
+type IUserCardDependent<M extends Manager> = {
+    mask: Mask<M>
+}
+
+class UserCard<M extends Manager> extends Modular<M, IUserCardDependent<M>> {
 
-class UserCard<M extends Manager> extends Modular<M> {
-    
     public override onLoad() {
-        // Do something
+        this.setFunc(this.handleChangeTheme, "changeTheme")
+    }
+    
+    /**
+     * 处理主题更换
+     */
+    private handleChangeTheme() {
+        this.depends?.mask.showMask();
     }
 }